diff --git a/GUI/Model/Sample/LayerRoughnessItems.cpp b/GUI/Model/Sample/LayerRoughnessItems.cpp index 8741a1024892b8e7201c7bee251080640c83c87a..2444cc231c1c62bf1ed1c35a80aec2328b967f38 100644 --- a/GUI/Model/Sample/LayerRoughnessItems.cpp +++ b/GUI/Model/Sample/LayerRoughnessItems.cpp @@ -13,6 +13,8 @@ // ************************************************************************************************ #include "GUI/Model/Sample/LayerRoughnessItems.h" + +#include "GUI/Model/Session/Serializer.h" #include "GUI/Model/Session/SessionXML.h" #include "GUI/Model/Types/DoubleDescriptor.h" @@ -52,14 +54,10 @@ DoubleDescriptor LayerBasicRoughnessItem::lateralCorrelationLength() const return m_lateralCorrelationLength; } -void LayerBasicRoughnessItem::writeContentTo(QXmlStreamWriter* writer) const -{ - writeProperty(writer, m_sigma); - writeProperty(writer, m_hurst); - writeProperty(writer, m_lateralCorrelationLength); -} - -void LayerBasicRoughnessItem::readContentFrom(QXmlStreamReader* reader) +void LayerBasicRoughnessItem::serialize(Serializer& s) { - // #baMigration ++ implement XML + s.assertVersion(0); + s.rw(m_sigma); + s.rw(m_hurst); + s.rw(m_lateralCorrelationLength); } diff --git a/GUI/Model/Sample/LayerRoughnessItems.h b/GUI/Model/Sample/LayerRoughnessItems.h index 6e2022998f8e067fd5caefbec9cacd52d6140203..27ae8b80c4fbac313f727dbaa02a635278f37f19 100644 --- a/GUI/Model/Sample/LayerRoughnessItems.h +++ b/GUI/Model/Sample/LayerRoughnessItems.h @@ -16,10 +16,10 @@ #define BORNAGAIN_GUI_MODEL_SAMPLE_LAYERROUGHNESSITEMS_H #include "GUI/Model/Types/DoubleProperty.h" -#include <QUuid> class QXmlStreamReader; class QXmlStreamWriter; +class Serializer; class LayerBasicRoughnessItem { public: @@ -28,8 +28,7 @@ public: DoubleDescriptor hurst() const; DoubleDescriptor lateralCorrelationLength() const; - void writeContentTo(QXmlStreamWriter* writer) const; - void readContentFrom(QXmlStreamReader* reader); + void serialize(Serializer& s); private: DoubleProperty m_sigma;