From 3e09a9ee0ecf2d6263c598576b53615bb996a9b3 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Fri, 1 Dec 2023 14:44:59 +0100
Subject: [PATCH] repair 'RealModel' tag
---
GUI/Model/Model/DatafilesModel.cpp | 1 +
GUI/Model/Project/ProjectDocument.cpp | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/GUI/Model/Model/DatafilesModel.cpp b/GUI/Model/Model/DatafilesModel.cpp
index e0fd2959e48..30578fb2480 100644
--- a/GUI/Model/Model/DatafilesModel.cpp
+++ b/GUI/Model/Model/DatafilesModel.cpp
@@ -98,6 +98,7 @@ void DatafilesModel::readFrom(QXmlStreamReader* r)
XML::readAttribute(r, XML::Attrib::value, &m_selectedRank);
XML::gotoEndElementOfTag(r, tag);
+
} else
r->skipCurrentElement();
}
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 075324daa12..f115cd6dc75 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -42,7 +42,7 @@ const QString SimulationOptions("SimulationOptions");
const QString InstrumentModel("InstrumentModel");
const QString SampleModel("SampleModel");
const QString JobModel("JobModel");
-const QString DatafilesModel("DatafilesModel");
+const QString RealModel("RealModel");
const QString ActiveView("ActiveView");
} // namespace Tag
@@ -247,7 +247,7 @@ void ProjectDocument::writeProject(QIODevice* device)
w.writeEndElement();
// real model
- w.writeStartElement(Tag::DatafilesModel);
+ w.writeStartElement(Tag::RealModel);
m_realModel.writeTo(&w);
w.writeEndElement();
@@ -309,7 +309,7 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
XML::gotoEndElementOfTag(&r, tag);
// real model
- } else if (tag == Tag::DatafilesModel) {
+ } else if (tag == Tag::RealModel) {
// 'm_instrumentModel' should be read before
m_realModel.readFrom(&r);
XML::gotoEndElementOfTag(&r, tag);
--
GitLab