ApplicationModels: upd r/w

GUI/Model/Model/ApplicationModels.cpp

@@ -14,6 +14,7 @@
 
 #include "GUI/Model/Model/ApplicationModels.h"
 #include "GUI/Support/Data/SimulationOptionsItem.h"
+#include "GUI/Support/XML/UtilXML.h"
 #include "GUI/Util/DeserializationException.h"
 #include <QXmlStreamWriter>
 
@@ -30,7 +31,7 @@ const QString RealModel("RealModel");
 
 ApplicationModels::ApplicationModels()
 {
-    //! creates and initializes models, order is important
+    // creates and initializes models, order is important
     m_realDataModel = std::make_unique<RealModel>(this);
     m_jobModel = std::make_unique<JobModel>(this);
 
@@ -48,30 +49,40 @@ JobModel* ApplicationModels::jobModel() const
     return m_jobModel.get();
 }
 
-//! Writes all model in file one by one
-
-void ApplicationModels::writeTo(QXmlStreamWriter* writer)
+void ApplicationModels::writeTo(QXmlStreamWriter* w)
 {
-    writer->writeStartElement(Tag::RealModel);
-    m_realDataModel->writeTo(writer);
-    writer->writeEndElement();
-
-    writer->writeStartElement(Tag::JobModel);
-    m_jobModel->writeTo(writer);
-    writer->writeEndElement();
+    // real model
+    w->writeStartElement(Tag::RealModel);
+    m_realDataModel->writeTo(w);
+    w->writeEndElement();
+
+    // job model
+    w->writeStartElement(Tag::JobModel);
+    m_jobModel->writeTo(w);
+    w->writeEndElement();
 }
 
-void ApplicationModels::readFrom(QXmlStreamReader* reader, MessageService* messageService)
+void ApplicationModels::readFrom(QXmlStreamReader* r, MessageService* messageService)
 {
     try {
-        if (reader->name() == Tag::RealModel)
-            m_realDataModel->readFrom(reader, messageService);
-        else if (reader->name() == Tag::JobModel)
-            m_jobModel->readFrom(reader, messageService);
+        QString tag = r->name().toString();
+
+        // real model
+        if (tag == Tag::RealModel) {
+            m_realDataModel->readFrom(r, messageService);
+            XML::gotoEndElementOfTag(r, tag);
+
+            // job model
+        } else if (tag == Tag::JobModel) {
+            m_jobModel->readFrom(r, messageService);
+            XML::gotoEndElementOfTag(r, tag);
+
+        } else
+            r->skipCurrentElement();
     } catch (DeserializationException& ex) {
         m_realDataModel->clear();
         m_jobModel->clear();
-        reader->raiseError(ex.text());
+        r->raiseError(ex.text());
     }
 }
 

GUI/Model/Model/ApplicationModels.h

@@ -33,8 +33,8 @@ public:
     RealModel* realModel() const;
     JobModel* jobModel() const;
 
-    void writeTo(class QXmlStreamWriter* writer);
-    void readFrom(class QXmlStreamReader* reader, MessageService* messageService);
+    void writeTo(QXmlStreamWriter* w);
+    void readFrom(QXmlStreamReader* r, MessageService* messageService);
 
     //! Returns all data items
     QVector<DataItem*> dataItems() const;