GUI: simulation options and samples serialization

SimulationOptionsItem and MultiLayerItems serialization is refactored.

GUI/Model/Data/DataItem.cpp

@@ -259,60 +259,60 @@ void DataItem::setAxesRangeToData()
     setUpperY(yMax());
 }
 
-void DataItem::writeBaseData(QXmlStreamWriter* writer) const
+void DataItem::writeTo(QXmlStreamWriter* w) const
 {
-    XML::writeAttribute(writer, XML::Attrib::version, uint(1));
+    XML::writeAttribute(w, XML::Attrib::version, uint(1));
 
     // file name
-    writer->writeStartElement(Tag::FileName);
-    XML::writeAttribute(writer, XML::Attrib::value, m_fileName);
-    writer->writeEndElement();
+    w->writeStartElement(Tag::FileName);
+    XML::writeAttribute(w, XML::Attrib::value, m_fileName);
+    w->writeEndElement();
 
     // axes units
-    writer->writeStartElement(Tag::AxesUnits);
-    m_axesUnits.writeTo(writer);
-    writer->writeEndElement();
+    w->writeStartElement(Tag::AxesUnits);
+    m_axesUnits.writeTo(w);
+    w->writeEndElement();
 
     // x axis
-    writer->writeStartElement(Tag::XAxis);
-    m_xAxis->writeTo(writer);
-    writer->writeEndElement();
+    w->writeStartElement(Tag::XAxis);
+    m_xAxis->writeTo(w);
+    w->writeEndElement();
 
     // y axis
-    writer->writeStartElement(Tag::YAxis);
-    m_yAxis->writeTo(writer);
-    writer->writeEndElement();
+    w->writeStartElement(Tag::YAxis);
+    m_yAxis->writeTo(w);
+    w->writeEndElement();
 }
 
-void DataItem::readBaseData(QXmlStreamReader* reader)
+void DataItem::readFrom(QXmlStreamReader* r)
 {
-    uint version = XML::readUIntAttribute(reader, XML::Attrib::version);
+    const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
     Q_UNUSED(version)
 
-    while (reader->readNextStartElement()) {
-        QString name = reader->name().toString();
+    while (r->readNextStartElement()) {
+        QString name = r->name().toString();
 
         // file name
         if (name == Tag::FileName) {
-            XML::readAttribute(reader, XML::Attrib::value, &m_fileName);
-            XML::gotoEndElementOfTag(reader, name);
+            XML::readAttribute(r, XML::Attrib::value, &m_fileName);
+            XML::gotoEndElementOfTag(r, name);
 
             // axes units
         } else if (name == Tag::AxesUnits) {
-            m_axesUnits.readFrom(reader);
-            XML::gotoEndElementOfTag(reader, name);
+            m_axesUnits.readFrom(r);
+            XML::gotoEndElementOfTag(r, name);
 
             // x axis
         } else if (name == Tag::XAxis) {
-            m_xAxis->readFrom(reader);
-            XML::gotoEndElementOfTag(reader, name);
+            m_xAxis->readFrom(r);
+            XML::gotoEndElementOfTag(r, name);
 
             // y axis
         } else if (name == Tag::YAxis) {
-            m_yAxis->readFrom(reader);
-            XML::gotoEndElementOfTag(reader, name);
+            m_yAxis->readFrom(r);
+            XML::gotoEndElementOfTag(r, name);
 
         } else
-            reader->skipCurrentElement();
+            r->skipCurrentElement();
     }
 }