SpecularBeamInclinationItem: upd r/w

GUI/Model/Device/SpecularBeamInclinationItem.cpp

@@ -27,6 +27,7 @@ namespace Tag {
 const QString UniformAxis("UniformAxis");
 const QString PointwiseAxis("PointwiseAxis");
 const QString BeamInclinationDistribution("BeamInclinationDistribution");
+const QString IsUniformAxis("IsUniformAxis");
 
 } // namespace Tag
 
@@ -79,7 +80,6 @@ void SpecularBeamInclinationItem::serialize(Streamer& s)
 {
     s.assertVersion(0);
     m_distribution.rwSelected(s, Tag::BeamInclinationDistribution);
-    Serialize::rwValue(s, "currentAxisIsUniformAxis", m_currentAxisIsUniformAxis);
 
     // r/w axes
     if (auto* w = s.xmlWriter())
@@ -94,43 +94,59 @@ void SpecularBeamInclinationItem::serialize(Streamer& s)
     }
 }
 
-void SpecularBeamInclinationItem::writeTo(QXmlStreamWriter* writer) const
+void SpecularBeamInclinationItem::writeTo(QXmlStreamWriter* w) const
 {
+    XML::writeAttribute(w, XML::Attrib::version, uint(1));
+
+    // is uniform axis?
+    w->writeStartElement(Tag::IsUniformAxis);
+    XML::writeAttribute(w, XML::Attrib::value, m_currentAxisIsUniformAxis);
+    w->writeEndElement();
+
     // uniform axis
     if (m_uniformAlphaAxis) {
-        writer->writeStartElement(Tag::UniformAxis);
-        m_uniformAlphaAxis->writeTo(writer);
-        writer->writeEndElement();
+        w->writeStartElement(Tag::UniformAxis);
+        m_uniformAlphaAxis->writeTo(w);
+        w->writeEndElement();
     }
 
     // pointwise axis
     if (m_pointwiseAlphaAxis) {
-        writer->writeStartElement(Tag::PointwiseAxis);
-        m_pointwiseAlphaAxis->writeTo(writer);
-        writer->writeEndElement();
+        w->writeStartElement(Tag::PointwiseAxis);
+        m_pointwiseAlphaAxis->writeTo(w);
+        w->writeEndElement();
     }
 }
 
-void SpecularBeamInclinationItem::readFrom(QXmlStreamReader* reader)
+void SpecularBeamInclinationItem::readFrom(QXmlStreamReader* r)
 {
-    while (reader->readNextStartElement()) {
+    const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
+    Q_UNUSED(version)
+
+    while (r->readNextStartElement()) {
+        QString tag = r->name().toString();
+
+        // is uniform axis?
+        if (tag == Tag::IsUniformAxis) {
+            XML::readAttribute(r, XML::Attrib::value, &m_currentAxisIsUniformAxis);
+            XML::gotoEndElementOfTag(r, tag);
 
         // uniform axis
-        if (reader->name() == Tag::UniformAxis) {
+        } else if (tag == Tag::UniformAxis) {
             m_uniformAlphaAxis = std::make_unique<BasicAxisItem>();
             setAxisPresentationDefaults(m_uniformAlphaAxis.get());
-            m_uniformAlphaAxis->readFrom(reader);
-            XML::gotoEndElementOfTag(reader, Tag::UniformAxis);
+            m_uniformAlphaAxis->readFrom(r);
+            XML::gotoEndElementOfTag(r, tag);
 
             // pointwise axis
-        } else if (reader->name() == Tag::PointwiseAxis) {
+        } else if (tag == Tag::PointwiseAxis) {
             m_pointwiseAlphaAxis = std::make_unique<PointwiseAxisItem>();
             setAxisPresentationDefaults(m_pointwiseAlphaAxis.get());
-            m_pointwiseAlphaAxis->readFrom(reader);
-            XML::gotoEndElementOfTag(reader, Tag::PointwiseAxis);
+            m_pointwiseAlphaAxis->readFrom(r);
+            XML::gotoEndElementOfTag(r, tag);
 
         } else
-            reader->skipCurrentElement();
+            r->skipCurrentElement();
     }
 }
 

GUI/Model/Device/SpecularBeamInclinationItem.h

@@ -28,8 +28,8 @@ public:
     explicit SpecularBeamInclinationItem(const InstrumentItem* owningInstrument);
 
     void serialize(Streamer& s) override;
-    void writeTo(QXmlStreamWriter* writer) const;
-    void readFrom(QXmlStreamReader* reader);
+    void writeTo(QXmlStreamWriter* w) const;
+    void readFrom(QXmlStreamReader* r);
 
     double scaleFactor() const override;