From 8ef02acc799c595945a3e25f6585f4cba59a13c1 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <svechnikovmv@gmail.com>
Date: Tue, 11 Oct 2022 23:17:23 +0200
Subject: [PATCH] Tags --> tag, Atts --> Attrib
---
GUI/Model/Data/RealItem.cpp | 60 ++++-----
GUI/Model/Device/AxesItems.cpp | 76 +++++------
GUI/Model/Device/PointwiseAxisItem.cpp | 26 ++--
.../Device/SpecularBeamInclinationItem.cpp | 16 +--
GUI/Model/Job/JobItem.cpp | 125 +++++++++---------
GUI/Model/Job/ParameterTreeItems.cpp | 20 +--
GUI/Model/Model/ApplicationModels.cpp | 16 +--
GUI/Model/Model/JobModel.cpp | 14 +-
GUI/Model/Model/RealModel.cpp | 14 +-
GUI/Model/Project/ProjectDocument.cpp | 59 ++++-----
GUI/Model/Sample/LayerRoughnessItems.cpp | 4 +-
GUI/Model/Sample/MaterialItem.cpp | 34 ++---
GUI/Support/Data/SimulationOptionsItem.cpp | 28 ++--
13 files changed, 246 insertions(+), 246 deletions(-)
diff --git a/GUI/Model/Data/RealItem.cpp b/GUI/Model/Data/RealItem.cpp
index a6f5de4b65d..8b7582444ee 100644
--- a/GUI/Model/Data/RealItem.cpp
+++ b/GUI/Model/Data/RealItem.cpp
@@ -30,7 +30,7 @@
#include "GUI/Util/Error.h"
namespace {
-namespace Tags {
+namespace Tag {
const QString InstrumentId("InstrumentId");
const QString Data("Data");
@@ -39,14 +39,14 @@ const QString NativeData("NativeData");
const QString BinaryData("BinaryData");
const QString NativeDataUnits("NativeDataUnits");
-} // namespace Tags
+} // namespace Tag
-namespace Atts {
+namespace Attrib {
const QString version("version");
const QString value("value");
-} // namespace Atts
+} // namespace Attrib
} // namespace
@@ -349,37 +349,37 @@ void RealItem::writeTo(QXmlStreamWriter* writer) const
// binary data
QByteArray a = serializeBinaryData();
if (!a.isEmpty()) {
- writer->writeStartElement(Tags::BinaryData);
- writer->writeAttribute(Atts::version, "1");
+ writer->writeStartElement(Tag::BinaryData);
+ writer->writeAttribute(Attrib::version, "1");
writer->writeCharacters(a.toBase64());
writer->writeEndElement(); // BinaryData
}
// instrument id
- writer->writeStartElement(Tags::InstrumentId);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_instrumentId);
+ writer->writeStartElement(Tag::InstrumentId);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_instrumentId);
writer->writeEndElement();
// name
- writer->writeStartElement(Tags::Name);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_name);
+ writer->writeStartElement(Tag::Name);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_name);
writer->writeEndElement();
// native data units
- writer->writeStartElement(Tags::NativeDataUnits);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_nativeDataUnits);
+ writer->writeStartElement(Tag::NativeDataUnits);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_nativeDataUnits);
writer->writeEndElement();
// data
if (m_dataItem) {
- writer->writeStartElement(Tags::Data);
+ writer->writeStartElement(Tag::Data);
GUI::Session::XML::writeItemAndChildItems(writer, m_dataItem.get());
writer->writeEndElement();
}
// native data
if (m_nativeDataItem) {
- writer->writeStartElement(Tags::NativeData);
+ writer->writeStartElement(Tag::NativeData);
GUI::Session::XML::writeItemAndChildItems(writer, m_nativeDataItem.get());
writer->writeEndElement();
}
@@ -398,38 +398,38 @@ void RealItem::readFrom(QXmlStreamReader* reader)
while (reader->readNextStartElement()) {
// binary data
- if (reader->name() == Tags::BinaryData) {
- if (reader->attributes().value(Atts::version).toInt() == 1) {
+ if (reader->name() == Tag::BinaryData) {
+ if (reader->attributes().value(Attrib::version).toInt() == 1) {
QString valueAsBase64 =
reader->readElementText(QXmlStreamReader::SkipChildElements);
const auto data = QByteArray::fromBase64(
valueAsBase64.toLatin1()); // #baimport add a unit test for this!
deserializeBinaryData(data);
}
- GUI::Session::XML::gotoEndElementOfTag(reader, GUI::Session::XML::Tags::BinaryData);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::BinaryData);
// instrument id
- } else if (reader->name() == Tags::InstrumentId) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_instrumentId);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::InstrumentId);
+ } else if (reader->name() == Tag::InstrumentId) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_instrumentId);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::InstrumentId);
// name
- } else if (reader->name() == Tags::Name) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_name);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Name);
+ } else if (reader->name() == Tag::Name) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_name);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Name);
// data
- } else if (reader->name() == Tags::Data) {
- m_dataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::Data));
+ } else if (reader->name() == Tag::Data) {
+ m_dataItem.reset(readItemToEnd<DataItem>(reader, this, Tag::Data));
// native data
- } else if (reader->name() == Tags::NativeData) {
- m_nativeDataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::NativeData));
+ } else if (reader->name() == Tag::NativeData) {
+ m_nativeDataItem.reset(readItemToEnd<DataItem>(reader, this, Tag::NativeData));
// native data
- } else if (reader->name() == Tags::NativeDataUnits) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_nativeDataUnits);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::NativeDataUnits);
+ } else if (reader->name() == Tag::NativeDataUnits) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_nativeDataUnits);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::NativeDataUnits);
} else {
reader->skipCurrentElement();
diff --git a/GUI/Model/Device/AxesItems.cpp b/GUI/Model/Device/AxesItems.cpp
index 4c3b8795858..ce7a5d5d957 100644
--- a/GUI/Model/Device/AxesItems.cpp
+++ b/GUI/Model/Device/AxesItems.cpp
@@ -18,7 +18,7 @@
namespace {
-namespace Tags {
+namespace Tag {
const QString IsVisible("IsVisible");
const QString Nbins("Nbins");
@@ -29,9 +29,9 @@ const QString Title("Title");
const QString LockMinMax("LockMinMax");
const QString LogScale("LogScale");
-} // namespace Tags
+} // namespace Tag
-namespace Atts {
+namespace Attrib {
const QString value("value");
@@ -121,28 +121,28 @@ void BasicAxisItem::setVisible(bool b)
void BasicAxisItem::writeTo(QXmlStreamWriter* writer) const
{
// visibility
- writer->writeStartElement(Tags::IsVisible);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_visible);
+ writer->writeStartElement(Tag::IsVisible);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_visible);
writer->writeEndElement();
// nbins
- writer->writeStartElement(Tags::Nbins);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_nbins);
+ writer->writeStartElement(Tag::Nbins);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_nbins);
writer->writeEndElement();
// min
- writer->writeStartElement(Tags::MinDeg);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_minDeg);
+ writer->writeStartElement(Tag::MinDeg);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_minDeg);
writer->writeEndElement();
// max
- writer->writeStartElement(Tags::MaxDeg);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_maxDeg);
+ writer->writeStartElement(Tag::MaxDeg);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_maxDeg);
writer->writeEndElement();
// title
- writer->writeStartElement(Tags::Title);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_title);
+ writer->writeStartElement(Tag::Title);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_title);
writer->writeEndElement();
}
@@ -165,29 +165,29 @@ void BasicAxisItem::readNonSessionItems(QXmlStreamReader* reader)
void BasicAxisItem::readBasicTags(QXmlStreamReader* reader)
{
// visibility
- if (reader->name() == Tags::IsVisible) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_visible);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::IsVisible);
+ if (reader->name() == Tag::IsVisible) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_visible);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::IsVisible);
// nbins
- } else if (reader->name() == Tags::Nbins) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_nbins);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Nbins);
+ } else if (reader->name() == Tag::Nbins) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_nbins);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Nbins);
// min
- } else if (reader->name() == Tags::MinDeg) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_minDeg);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::MinDeg);
+ } else if (reader->name() == Tag::MinDeg) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_minDeg);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::MinDeg);
// max
- } else if (reader->name() == Tags::MaxDeg) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_maxDeg);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::MaxDeg);
+ } else if (reader->name() == Tag::MaxDeg) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_maxDeg);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::MaxDeg);
// title
- } else if (reader->name() == Tags::Title) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_title);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Title);
+ } else if (reader->name() == Tag::Title) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_title);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Title);
} else {
reader->skipCurrentElement();
@@ -208,13 +208,13 @@ void AmplitudeAxisItem::writeTo(QXmlStreamWriter* writer) const
BasicAxisItem::writeTo(writer);
// lock min max
- writer->writeStartElement(Tags::LockMinMax);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_lockMinMax);
+ writer->writeStartElement(Tag::LockMinMax);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_lockMinMax);
writer->writeEndElement();
// log scale
- writer->writeStartElement(Tags::LogScale);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_logScale);
+ writer->writeStartElement(Tag::LogScale);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_logScale);
writer->writeEndElement();
}
@@ -223,14 +223,14 @@ void AmplitudeAxisItem::readFrom(QXmlStreamReader* reader)
while (reader->readNextStartElement()) {
// visibility
- if (reader->name() == Tags::LockMinMax) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_lockMinMax);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::LockMinMax);
+ if (reader->name() == Tag::LockMinMax) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_lockMinMax);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::LockMinMax);
// title
- } else if (reader->name() == Tags::LogScale) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_logScale);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::LogScale);
+ } else if (reader->name() == Tag::LogScale) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_logScale);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::LogScale);
// members from base class
} else {
diff --git a/GUI/Model/Device/PointwiseAxisItem.cpp b/GUI/Model/Device/PointwiseAxisItem.cpp
index ec88ea3f915..3bdabb9ad7d 100644
--- a/GUI/Model/Device/PointwiseAxisItem.cpp
+++ b/GUI/Model/Device/PointwiseAxisItem.cpp
@@ -23,14 +23,14 @@
namespace {
-namespace Tags {
+namespace Tag {
-const QString NativeAxisUnits("NativeAxisUnits");
-const QString AxisBinaryData("AxisBinaryData");
+const QString NativeUnits("NativeUnits");
+const QString BinaryData("BinaryData");
-} // namespace Tags
+} // namespace Tag
-namespace Atts {
+namespace Attrib {
const QString value("value");
@@ -113,14 +113,14 @@ void PointwiseAxisItem::writeTo(QXmlStreamWriter* writer) const
// axis binary data
QByteArray a = serializeBinaryData();
if (!a.isEmpty()) {
- writer->writeStartElement(Tags::AxisBinaryData);
+ writer->writeStartElement(Tag::BinaryData);
writer->writeCharacters(a.toBase64());
writer->writeEndElement();
}
// native units
- writer->writeStartElement(Tags::NativeAxisUnits);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_nativeAxisUnits);
+ writer->writeStartElement(Tag::NativeUnits);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_nativeAxisUnits);
writer->writeEndElement();
}
@@ -129,16 +129,16 @@ void PointwiseAxisItem::readFrom(QXmlStreamReader* reader)
while (reader->readNextStartElement()) {
// axis binary data
- if (reader->name() == Tags::AxisBinaryData) {
+ if (reader->name() == Tag::BinaryData) {
QString valueAsBase64 = reader->readElementText(QXmlStreamReader::SkipChildElements);
const auto data = QByteArray::fromBase64(valueAsBase64.toLatin1());
deserializeBinaryData(data);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::AxisBinaryData);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::BinaryData);
// native units
- } else if (reader->name() == Tags::NativeAxisUnits) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_nativeAxisUnits);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::NativeAxisUnits);
+ } else if (reader->name() == Tag::NativeUnits) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_nativeAxisUnits);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::NativeUnits);
// members from base class
} else {
diff --git a/GUI/Model/Device/SpecularBeamInclinationItem.cpp b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
index f10f9aa6f20..45ce8cd90ec 100644
--- a/GUI/Model/Device/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
@@ -21,12 +21,12 @@
namespace {
-namespace Tags {
+namespace Tag {
const QString UniformAxis("UniformAxis");
const QString PointwiseAxis("PointwiseAxis");
-} // namespace Tags
+} // namespace Tag
void setAxisPresentationDefaults(BasicAxisItem* axisItem)
@@ -97,14 +97,14 @@ void SpecularBeamInclinationItem::writeTo(QXmlStreamWriter* writer) const
{
// uniform axis
if (m_uniformAlphaAxis) {
- writer->writeStartElement(Tags::UniformAxis);
+ writer->writeStartElement(Tag::UniformAxis);
m_uniformAlphaAxis->writeTo(writer);
writer->writeEndElement();
}
// pointwise axis
if (m_pointwiseAlphaAxis) {
- writer->writeStartElement(Tags::PointwiseAxis);
+ writer->writeStartElement(Tag::PointwiseAxis);
m_pointwiseAlphaAxis->writeTo(writer);
writer->writeEndElement();
}
@@ -115,18 +115,18 @@ void SpecularBeamInclinationItem::readFrom(QXmlStreamReader* reader)
while (reader->readNextStartElement()) {
// uniform axis
- if (reader->name() == Tags::UniformAxis) {
+ if (reader->name() == Tag::UniformAxis) {
m_uniformAlphaAxis = std::make_unique<BasicAxisItem>();
setAxisPresentationDefaults(m_uniformAlphaAxis.get());
m_uniformAlphaAxis->readFrom(reader);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::UniformAxis);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::UniformAxis);
// pointwise axis
- } else if (reader->name() == Tags::PointwiseAxis) {
+ } else if (reader->name() == Tag::PointwiseAxis) {
m_pointwiseAlphaAxis = std::make_unique<PointwiseAxisItem>();
setAxisPresentationDefaults(m_pointwiseAlphaAxis.get());
m_pointwiseAlphaAxis->readFrom(reader);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::PointwiseAxis);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::PointwiseAxis);
} else {
reader->skipCurrentElement();
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 72ca9ccd1c8..076ea188431 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -38,7 +38,7 @@
#include <stdexcept> // domain_error
namespace {
-namespace Tags {
+namespace Tag {
const QString SimulationOptions("SimulationOptions");
const QString ParameterContainer("ParameterContainer");
@@ -59,9 +59,9 @@ const QString SimulatedData("SimulatedData");
const QString DiffData("DiffData"); // diff. between simulation result and real data
const QString FitSuite("FitSuite");
-} // namespace Tags
+} // namespace Tag
-namespace Atts {
+namespace Attrib {
const QString value("value");
@@ -452,7 +452,7 @@ void JobItem::writeTo(QXmlStreamWriter* writer) const
writer->writeEndElement();
// instrument
- Streamer(writer).write<InstrumentItemCatalog>(Tags::Instrument, m_instrument.get());
+ Streamer(writer).write<InstrumentItemCatalog>(Tag::Instrument, m_instrument.get());
// sample
writer->writeStartElement(Tags::Sample);
@@ -465,74 +465,75 @@ void JobItem::writeTo(QXmlStreamWriter* writer) const
writer->writeEndElement();
// data members
- writer->writeStartElement(Tags::Name);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_name);
+ writer->writeStartElement(Tag::Name);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_name);
writer->writeEndElement();
// identifier
- writer->writeStartElement(Tags::Identifier);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_identifier);
+ writer->writeStartElement(Tag::Identifier);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_identifier);
writer->writeEndElement();
// activity
- writer->writeStartElement(Tags::Activity);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_activity);
+ writer->writeStartElement(Tag::Activity);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_activity);
writer->writeEndElement();
// presentation type
- writer->writeStartElement(Tags::PresentationType);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_presentationType);
+ writer->writeStartElement(Tag::PresentationType);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_presentationType);
writer->writeEndElement();
// begin time
- writer->writeStartElement(Tags::BeginTime);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_beginTime.toString(Qt::ISODateWithMs));
+ writer->writeStartElement(Tag::BeginTime);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value,
+ m_beginTime.toString(Qt::ISODateWithMs));
writer->writeEndElement();
// end time
- writer->writeStartElement(Tags::EndTime);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_endTime.toString(Qt::ISODateWithMs));
+ writer->writeStartElement(Tag::EndTime);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_endTime.toString(Qt::ISODateWithMs));
writer->writeEndElement();
// status
- writer->writeStartElement(Tags::Status);
- GUI::Session::XML::writeAttribute(writer, Atts::value, jobStatusToString(m_status));
+ writer->writeStartElement(Tag::Status);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, jobStatusToString(m_status));
writer->writeEndElement();
// progress
- writer->writeStartElement(Tags::Progress);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_progress);
+ writer->writeStartElement(Tag::Progress);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_progress);
writer->writeEndElement();
// comments
- writer->writeStartElement(Tags::Comments);
- GUI::Session::XML::writeAttribute(writer, Atts::value, m_comments);
+ writer->writeStartElement(Tag::Comments);
+ GUI::Session::XML::writeAttribute(writer, Attrib::value, m_comments);
writer->writeEndElement();
// real item
if (m_realItem) {
- writer->writeStartElement(Tags::RealItem);
+ writer->writeStartElement(Tag::RealItem);
m_realItem->writeTo(writer);
writer->writeEndElement();
}
// output data
if (m_simulatedDataItem) {
- writer->writeStartElement(Tags::SimulatedData);
+ writer->writeStartElement(Tag::SimulatedData);
GUI::Session::XML::writeItemAndChildItems(writer, m_simulatedDataItem.get());
writer->writeEndElement();
}
// diff data
if (m_diffDataItem) {
- writer->writeStartElement(Tags::DiffData);
+ writer->writeStartElement(Tag::DiffData);
GUI::Session::XML::writeItemAndChildItems(writer, m_diffDataItem.get());
writer->writeEndElement();
}
// fit suite
if (m_fitSuiteItem) {
- writer->writeStartElement(Tags::FitSuite);
+ writer->writeStartElement(Tag::FitSuite);
GUI::Session::XML::writeItemAndChildItems(writer, m_fitSuiteItem.get());
writer->writeEndElement();
}
@@ -556,9 +557,9 @@ void JobItem::readFrom(QXmlStreamReader* reader)
GUI::Session::XML::gotoEndElementOfTag(reader, Tags::SimulationOptions);
// instrument
- } else if (reader->name() == Tags::Instrument) {
+ } else if (reader->name() == Tag::Instrument) {
InstrumentItem* p = nullptr;
- Streamer(reader).read<InstrumentItemCatalog>(Tags::Instrument, p);
+ Streamer(reader).read<InstrumentItemCatalog>(Tag::Instrument, p);
m_instrument.reset(p);
// parameters
@@ -572,73 +573,73 @@ void JobItem::readFrom(QXmlStreamReader* reader)
GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Sample);
// activity
- } else if (reader->name() == Tags::Activity) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_activity);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Activity);
+ } else if (reader->name() == Tag::Activity) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_activity);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Activity);
// presentation type
- } else if (reader->name() == Tags::PresentationType) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_presentationType);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::PresentationType);
+ } else if (reader->name() == Tag::PresentationType) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_presentationType);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::PresentationType);
// comments
- } else if (reader->name() == Tags::Comments) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_comments);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Comments);
+ } else if (reader->name() == Tag::Comments) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_comments);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Comments);
// status
- } else if (reader->name() == Tags::Status) {
+ } else if (reader->name() == Tag::Status) {
QString status_str;
- GUI::Session::XML::readAttribute(reader, Atts::value, &status_str);
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &status_str);
m_status = jobStatusFromString(status_str);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Status);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Status);
// progress
- } else if (reader->name() == Tags::Progress) {
+ } else if (reader->name() == Tag::Progress) {
QString progress_str;
- GUI::Session::XML::readAttribute(reader, Atts::value, &progress_str);
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &progress_str);
m_progress = progress_str.toInt();
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Progress);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Progress);
// begin time
- } else if (reader->name() == Tags::BeginTime) {
+ } else if (reader->name() == Tag::BeginTime) {
QString begin_t_str;
- GUI::Session::XML::readAttribute(reader, Atts::value, &begin_t_str);
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &begin_t_str);
m_beginTime = QDateTime::fromString(begin_t_str, Qt::ISODateWithMs);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::BeginTime);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::BeginTime);
// end time
- } else if (reader->name() == Tags::EndTime) {
+ } else if (reader->name() == Tag::EndTime) {
QString end_t_str;
- GUI::Session::XML::readAttribute(reader, Atts::value, &end_t_str);
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &end_t_str);
m_endTime = QDateTime::fromString(end_t_str, Qt::ISODateWithMs);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::EndTime);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::EndTime);
// identifier
- } else if (reader->name() == Tags::Identifier) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_identifier);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Identifier);
+ } else if (reader->name() == Tag::Identifier) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_identifier);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Identifier);
// name
- } else if (reader->name() == Tags::Name) {
- GUI::Session::XML::readAttribute(reader, Atts::value, &m_name);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Name);
+ } else if (reader->name() == Tag::Name) {
+ GUI::Session::XML::readAttribute(reader, Attrib::value, &m_name);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Name);
// real item
- } else if (reader->name() == Tags::RealItem) {
+ } else if (reader->name() == Tag::RealItem) {
createRealItem()->readFrom(reader);
// simulated data
- } else if (reader->name() == Tags::SimulatedData) {
- m_simulatedDataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::SimulatedData));
+ } else if (reader->name() == Tag::SimulatedData) {
+ m_simulatedDataItem.reset(readItemToEnd<DataItem>(reader, this, Tag::SimulatedData));
// diff data
- } else if (reader->name() == Tags::DiffData) {
- m_diffDataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::DiffData));
+ } else if (reader->name() == Tag::DiffData) {
+ m_diffDataItem.reset(readItemToEnd<DataItem>(reader, this, Tag::DiffData));
// fit suite
- } else if (reader->name() == Tags::FitSuite) {
- m_fitSuiteItem.reset(readItemToEnd<FitSuiteItem>(reader, this, Tags::FitSuite));
+ } else if (reader->name() == Tag::FitSuite) {
+ m_fitSuiteItem.reset(readItemToEnd<FitSuiteItem>(reader, this, Tag::FitSuite));
} else {
reader->skipCurrentElement();
diff --git a/GUI/Model/Job/ParameterTreeItems.cpp b/GUI/Model/Job/ParameterTreeItems.cpp
index 47fb58bd6ef..8c47e2d9959 100644
--- a/GUI/Model/Job/ParameterTreeItems.cpp
+++ b/GUI/Model/Job/ParameterTreeItems.cpp
@@ -25,14 +25,14 @@
namespace {
-namespace Tags {
+namespace Tag {
const QString BackupValues("BackupValues");
const QString BackupValue("BackupValue");
const QString Link("Link");
const QString Value("Value");
-} // namespace Tags
+} // namespace Tag
ParameterItem* findParameterItem(QObject* item, const QString& link)
{
@@ -154,12 +154,12 @@ void ParameterContainerItem::writeContentTo(QXmlStreamWriter* writer) const
{
GUI::Session::XML::writeAttribute(writer, GUI::Session::XML::Version, int(1));
- writer->writeStartElement(Tags::BackupValues);
+ writer->writeStartElement(Tag::BackupValues);
for (auto v = m_backupValues.cbegin(); v != m_backupValues.cend(); v++) {
- writer->writeEmptyElement(Tags::BackupValue);
- GUI::Session::XML::writeAttribute(writer, Tags::Link, v.key());
- GUI::Session::XML::writeAttribute(writer, Tags::Value, v.value());
+ writer->writeEmptyElement(Tag::BackupValue);
+ GUI::Session::XML::writeAttribute(writer, Tag::Link, v.key());
+ GUI::Session::XML::writeAttribute(writer, Tag::Value, v.value());
}
writer->writeEndElement();
}
@@ -176,13 +176,13 @@ void ParameterContainerItem::readContentFrom(QXmlStreamReader* reader)
throw DeserializationException::tooNew();
while (reader->readNextStartElement()) {
- if (reader->name().toString() == Tags::BackupValues) {
+ if (reader->name().toString() == Tag::BackupValues) {
while (reader->readNextStartElement()) {
- ASSERT(reader->name().toString() == Tags::BackupValue);
+ ASSERT(reader->name().toString() == Tag::BackupValue);
QString link;
double d;
- GUI::Session::XML::readAttribute(reader, Tags::Link, &link);
- GUI::Session::XML::readAttribute(reader, Tags::Value, &d);
+ GUI::Session::XML::readAttribute(reader, Tag::Link, &link);
+ GUI::Session::XML::readAttribute(reader, Tag::Value, &d);
m_backupValues[link] = d;
reader->skipCurrentElement();
}
diff --git a/GUI/Model/Model/ApplicationModels.cpp b/GUI/Model/Model/ApplicationModels.cpp
index 2118af4b9de..94d574a9454 100644
--- a/GUI/Model/Model/ApplicationModels.cpp
+++ b/GUI/Model/Model/ApplicationModels.cpp
@@ -19,12 +19,12 @@
namespace {
-namespace Tags {
+namespace Tag {
-const QString JobModelTag("JobModel");
-const QString RealModelTag("RealModel");
+const QString JobModel("JobModel");
+const QString RealModel("RealModel");
-} // namespace Tags
+} // namespace Tag
} // namespace
@@ -52,11 +52,11 @@ JobModel* ApplicationModels::jobModel() const
void ApplicationModels::writeTo(QXmlStreamWriter* writer)
{
- writer->writeStartElement(Tags::RealModelTag);
+ writer->writeStartElement(Tag::RealModel);
m_realDataModel->writeTo(writer);
writer->writeEndElement();
- writer->writeStartElement(Tags::JobModelTag);
+ writer->writeStartElement(Tag::JobModel);
m_jobModel->writeTo(writer);
writer->writeEndElement();
}
@@ -64,9 +64,9 @@ void ApplicationModels::writeTo(QXmlStreamWriter* writer)
void ApplicationModels::readFrom(QXmlStreamReader* reader, MessageService* messageService)
{
try {
- if (reader->name() == Tags::RealModelTag)
+ if (reader->name() == Tag::RealModel)
m_realDataModel->readFrom(reader, messageService);
- else if (reader->name() == Tags::JobModelTag)
+ else if (reader->name() == Tag::JobModel)
m_jobModel->readFrom(reader, messageService);
} catch (DeserializationException& ex) {
m_realDataModel->clear();
diff --git a/GUI/Model/Model/JobModel.cpp b/GUI/Model/Model/JobModel.cpp
index 433a9b71cd4..bfd326c6eb1 100644
--- a/GUI/Model/Model/JobModel.cpp
+++ b/GUI/Model/Model/JobModel.cpp
@@ -25,13 +25,13 @@
#include "GUI/Util/Error.h"
namespace {
-namespace Tags {
+namespace Tag {
-const QString JobItemTag("JobItem");
+const QString Job("Job");
}
-namespace Atts {
+namespace Attrib {
const QString name("name");
@@ -148,8 +148,8 @@ void JobModel::writeTo(QXmlStreamWriter* writer)
{
ASSERT(writer);
for (auto* job : jobItems()) {
- writer->writeStartElement(Tags::JobItemTag);
- writer->writeAttribute(Atts::name, job->jobName());
+ writer->writeStartElement(Tag::Job);
+ writer->writeAttribute(Attrib::name, job->jobName());
job->writeTo(writer);
writer->writeEndElement();
}
@@ -161,9 +161,9 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService
ASSERT(reader);
clear();
while (reader->readNextStartElement()) {
- if (reader->name() == Tags::JobItemTag) {
+ if (reader->name() == Tag::Job) {
createJobItem()->readFrom(reader);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::JobItemTag);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Job);
}
}
if (reader->hasError())
diff --git a/GUI/Model/Model/RealModel.cpp b/GUI/Model/Model/RealModel.cpp
index baa3f75f412..56720032c3e 100644
--- a/GUI/Model/Model/RealModel.cpp
+++ b/GUI/Model/Model/RealModel.cpp
@@ -19,13 +19,13 @@
#include "GUI/Util/Error.h"
namespace {
-namespace Tags {
+namespace Tag {
-const QString RealItemTag("RealItem");
+const QString RealData("RealData");
}
-namespace Atts {
+namespace Attrib {
const QString name("name");
@@ -62,8 +62,8 @@ void RealModel::writeTo(QXmlStreamWriter* writer)
{
ASSERT(writer);
for (auto* realItem : realItems()) {
- writer->writeStartElement(Tags::RealItemTag);
- writer->writeAttribute(Atts::name, realItem->realItemName());
+ writer->writeStartElement(Tag::RealData);
+ writer->writeAttribute(Attrib::name, realItem->realItemName());
realItem->writeTo(writer);
writer->writeEndElement();
}
@@ -75,9 +75,9 @@ void RealModel::readFrom(QXmlStreamReader* reader, MessageService* messageServic
ASSERT(reader);
clear();
while (reader->readNextStartElement()) {
- if (reader->name() == Tags::RealItemTag) {
+ if (reader->name() == Tag::RealData) {
createRealItem()->readFrom(reader);
- GUI::Session::XML::gotoEndElementOfTag(reader, Tags::RealItemTag);
+ GUI::Session::XML::gotoEndElementOfTag(reader, Tag::RealData);
}
}
if (reader->hasError())
diff --git a/GUI/Model/Project/ProjectDocument.cpp b/GUI/Model/Project/ProjectDocument.cpp
index 79cba6b9d4a..622eef83cc7 100644
--- a/GUI/Model/Project/ProjectDocument.cpp
+++ b/GUI/Model/Project/ProjectDocument.cpp
@@ -37,22 +37,22 @@
namespace {
const QString minimal_supported_version = "1.6.0";
-namespace Tags {
+namespace Tag {
-const QString BornAgainTag("BornAgain");
-const QString InfoTag("DocumentInfo");
-const QString SimulationOptionsTag("SimulationOptions");
-const QString SamplesTag("Samples");
-const QString InstrumentsTag("Instruments");
+const QString BornAgain("BornAgain");
+const QString DocumentInfo("DocumentInfo");
+const QString SimulationOptions("SimulationOptions");
+const QString Samples("Samples");
+const QString Instruments("Instruments");
-} // namespace Tags
+} // namespace Tag
-namespace Atts {
+namespace Attrib {
const QString BornAgainVersionAttribute("Version");
const QString ProjectName("ProjectName");
-} // namespace Atts
+} // namespace Attrib
} // namespace
@@ -315,10 +315,10 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
while (!reader.atEnd()) {
reader.readNext();
if (reader.isStartElement()) {
- if (reader.name() == Tags::BornAgainTag) {
+ if (reader.name() == Tag::BornAgain) {
Streamer(&reader).assertVersion(2);
m_currentVersion =
- reader.attributes().value(Atts::BornAgainVersionAttribute).toString();
+ reader.attributes().value(Attrib::BornAgainVersionAttribute).toString();
if (!GUI::Util::Path::isVersionMatchMinimal(m_currentVersion,
minimal_supported_version)) {
@@ -331,39 +331,38 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
}
while (reader.readNextStartElement())
- if (reader.name() == Tags::InfoTag)
+ if (reader.name() == Tag::DocumentInfo)
reader.skipCurrentElement();
- else if (reader.name() == Tags::SimulationOptionsTag) {
+ else if (reader.name() == Tag::SimulationOptions) {
m_simulationOptionsItem.readContentFrom(&reader);
reader.skipCurrentElement();
- GUI::Session::XML::assertExpectedTag(&reader,
- Tags::SimulationOptionsTag);
- } else if (reader.name() == Tags::SamplesTag) {
+ GUI::Session::XML::assertExpectedTag(&reader, Tag::SimulationOptions);
+ } else if (reader.name() == Tag::Samples) {
Streamer s(&reader);
m_sampleItems.serialize(s);
// cleanup
- if (reader.name() != Tags::SamplesTag) {
+ if (reader.name() != Tag::Samples) {
if (!reader.isEndElement())
reader.skipCurrentElement();
reader.skipCurrentElement();
}
- GUI::Session::XML::assertExpectedTag(&reader, Tags::SamplesTag);
+ GUI::Session::XML::assertExpectedTag(&reader, Tag::Samples);
ASSERT(reader.isEndElement());
- GUI::Session::XML::assertExpectedTag(&reader, Tags::SamplesTag);
- } else if (reader.name() == Tags::InstrumentsTag) {
+ GUI::Session::XML::assertExpectedTag(&reader, Tag::Samples);
+ } else if (reader.name() == Tag::Instruments) {
Streamer s(&reader);
m_instruments.serialize(s);
// cleanup
- if (reader.name() != Tags::InstrumentsTag) {
+ if (reader.name() != Tag::Instruments) {
if (!reader.isEndElement())
reader.skipCurrentElement();
reader.skipCurrentElement();
}
- GUI::Session::XML::assertExpectedTag(&reader, Tags::InstrumentsTag);
+ GUI::Session::XML::assertExpectedTag(&reader, Tag::Instruments);
ASSERT(reader.isEndElement());
- GUI::Session::XML::assertExpectedTag(&reader, Tags::InstrumentsTag);
+ GUI::Session::XML::assertExpectedTag(&reader, Tag::Instruments);
} else
m_applicationModels.readFrom(&reader, &messageService);
}
@@ -390,25 +389,25 @@ void ProjectDocument::writeTo(QIODevice* device)
QXmlStreamWriter writer(device);
writer.setAutoFormatting(true);
writer.writeStartDocument();
- writer.writeStartElement(Tags::BornAgainTag);
+ writer.writeStartElement(Tag::BornAgain);
QString version_string = GUI::Util::Path::getBornAgainVersionString();
- writer.writeAttribute(Atts::BornAgainVersionAttribute, version_string);
+ writer.writeAttribute(Attrib::BornAgainVersionAttribute, version_string);
Streamer(&writer).writeVersion(2);
- writer.writeStartElement(Tags::InfoTag);
- writer.writeAttribute(Atts::ProjectName, projectName());
+ writer.writeStartElement(Tag::DocumentInfo);
+ writer.writeAttribute(Attrib::ProjectName, projectName());
writer.writeEndElement(); // InfoTag
- writer.writeStartElement(Tags::SimulationOptionsTag);
+ writer.writeStartElement(Tag::SimulationOptions);
m_simulationOptionsItem.writeContentTo(&writer);
writer.writeEndElement();
- writer.writeStartElement(Tags::SamplesTag);
+ writer.writeStartElement(Tag::Samples);
Streamer s(&writer);
m_sampleItems.serialize(s);
writer.writeEndElement();
- writer.writeStartElement(Tags::InstrumentsTag);
+ writer.writeStartElement(Tag::Instruments);
Streamer sInstruments(&writer);
m_instruments.serialize(sInstruments);
writer.writeEndElement();
diff --git a/GUI/Model/Sample/LayerRoughnessItems.cpp b/GUI/Model/Sample/LayerRoughnessItems.cpp
index 6312fd3cb0d..e950ad085ba 100644
--- a/GUI/Model/Sample/LayerRoughnessItems.cpp
+++ b/GUI/Model/Sample/LayerRoughnessItems.cpp
@@ -17,9 +17,9 @@
#include "GUI/Support/XML/Serialize.h"
namespace {
-namespace Tags {
+namespace Tag {
const QString Uid("Uid");
-} // namespace Tags
+} // namespace Tag
} // namespace
diff --git a/GUI/Model/Sample/MaterialItem.cpp b/GUI/Model/Sample/MaterialItem.cpp
index 4615e5f933e..f8861440ca0 100644
--- a/GUI/Model/Sample/MaterialItem.cpp
+++ b/GUI/Model/Sample/MaterialItem.cpp
@@ -25,7 +25,7 @@
namespace {
-namespace Tags {
+namespace Tag {
const QString Color("Color");
const QString Id("Id");
@@ -35,7 +35,7 @@ const QString Beta("Beta");
const QString Sld("Sld");
const QString Magnetization("Magnetization");
-} // namespace Tags
+} // namespace Tag
} // namespace
@@ -258,16 +258,16 @@ void MaterialItem::writeContentTo(QXmlStreamWriter* writer) const
{
GUI::Session::XML::writeAttribute(writer, GUI::Session::XML::Version, int(1));
- GUI::Session::XML::writeAttribute(writer, Tags::Id, m_id);
- GUI::Session::XML::writeAttribute(writer, Tags::Color, m_color);
- GUI::Session::XML::writeAttribute(writer, Tags::Name, m_name);
- GUI::Session::XML::writeAttribute(writer, Tags::Magnetization, m_magnetization);
+ GUI::Session::XML::writeAttribute(writer, Tag::Id, m_id);
+ GUI::Session::XML::writeAttribute(writer, Tag::Color, m_color);
+ GUI::Session::XML::writeAttribute(writer, Tag::Name, m_name);
+ GUI::Session::XML::writeAttribute(writer, Tag::Magnetization, m_magnetization);
if (hasRefractiveIndex()) {
- GUI::Session::XML::writeAttribute(writer, Tags::Delta, m_delta);
- GUI::Session::XML::writeAttribute(writer, Tags::Beta, m_beta);
+ GUI::Session::XML::writeAttribute(writer, Tag::Delta, m_delta);
+ GUI::Session::XML::writeAttribute(writer, Tag::Beta, m_beta);
} else
- GUI::Session::XML::writeAttribute(writer, Tags::Sld, std::get<complex_t>(m_data));
+ GUI::Session::XML::writeAttribute(writer, Tag::Sld, std::get<complex_t>(m_data));
}
void MaterialItem::readContentFrom(QXmlStreamReader* reader)
@@ -280,18 +280,18 @@ void MaterialItem::readContentFrom(QXmlStreamReader* reader)
if (version > 1)
throw DeserializationException::tooNew();
- GUI::Session::XML::readAttribute(reader, Tags::Id, &m_id);
- GUI::Session::XML::readAttribute(reader, Tags::Color, &m_color);
- GUI::Session::XML::readAttribute(reader, Tags::Name, &m_name);
- GUI::Session::XML::readAttribute(reader, Tags::Magnetization, &m_magnetization);
- if (reader->attributes().hasAttribute(Tags::Delta)) {
+ GUI::Session::XML::readAttribute(reader, Tag::Id, &m_id);
+ GUI::Session::XML::readAttribute(reader, Tag::Color, &m_color);
+ GUI::Session::XML::readAttribute(reader, Tag::Name, &m_name);
+ GUI::Session::XML::readAttribute(reader, Tag::Magnetization, &m_magnetization);
+ if (reader->attributes().hasAttribute(Tag::Delta)) {
double d, b;
- GUI::Session::XML::readAttribute(reader, Tags::Delta, &d);
- GUI::Session::XML::readAttribute(reader, Tags::Beta, &b);
+ GUI::Session::XML::readAttribute(reader, Tag::Delta, &d);
+ GUI::Session::XML::readAttribute(reader, Tag::Beta, &b);
m_data = Refractive(d, b);
} else {
complex_t c;
- GUI::Session::XML::readAttribute(reader, Tags::Sld, &c);
+ GUI::Session::XML::readAttribute(reader, Tag::Sld, &c);
m_data = c;
}
}
diff --git a/GUI/Support/Data/SimulationOptionsItem.cpp b/GUI/Support/Data/SimulationOptionsItem.cpp
index 34aafa24768..0b7d5ffe26b 100644
--- a/GUI/Support/Data/SimulationOptionsItem.cpp
+++ b/GUI/Support/Data/SimulationOptionsItem.cpp
@@ -20,7 +20,7 @@
namespace {
-namespace Tags {
+namespace Tag {
const QString RunImmediately("RunImmediately");
const QString NumberOfThreads("NumberOfThreads");
@@ -29,7 +29,7 @@ const QString NumberOfMonteCarloPoints("NumberOfMonteCarloPoints");
const QString UseAverageMaterials("UseAverageMaterials");
const QString IncludeSpecularPeak("IncludeSpecularPeak");
-} // namespace Tags
+} // namespace Tag
} // namespace
@@ -118,13 +118,13 @@ bool SimulationOptionsItem::includeSpecularPeak() const
void SimulationOptionsItem::writeContentTo(QXmlStreamWriter* writer) const
{
GUI::Session::XML::writeAttribute(writer, GUI::Session::XML::Version, int(1));
- GUI::Session::XML::writeAttribute(writer, Tags::RunImmediately, m_runImmediately);
- GUI::Session::XML::writeAttribute(writer, Tags::NumberOfThreads, m_numberOfThreads);
- GUI::Session::XML::writeAttribute(writer, Tags::Analytical, m_computationMethodAnalytical);
- GUI::Session::XML::writeAttribute(writer, Tags::NumberOfMonteCarloPoints,
+ GUI::Session::XML::writeAttribute(writer, Tag::RunImmediately, m_runImmediately);
+ GUI::Session::XML::writeAttribute(writer, Tag::NumberOfThreads, m_numberOfThreads);
+ GUI::Session::XML::writeAttribute(writer, Tag::Analytical, m_computationMethodAnalytical);
+ GUI::Session::XML::writeAttribute(writer, Tag::NumberOfMonteCarloPoints,
m_numberOfMonteCarloPoints);
- GUI::Session::XML::writeAttribute(writer, Tags::UseAverageMaterials, m_useAverageMaterials);
- GUI::Session::XML::writeAttribute(writer, Tags::IncludeSpecularPeak, m_includeSpecularPeak);
+ GUI::Session::XML::writeAttribute(writer, Tag::UseAverageMaterials, m_useAverageMaterials);
+ GUI::Session::XML::writeAttribute(writer, Tag::IncludeSpecularPeak, m_includeSpecularPeak);
}
void SimulationOptionsItem::readContentFrom(QXmlStreamReader* reader)
@@ -137,11 +137,11 @@ void SimulationOptionsItem::readContentFrom(QXmlStreamReader* reader)
if (version > 1)
throw DeserializationException::tooNew();
- m_runImmediately = GUI::Session::XML::readBoolAttribute(reader, Tags::RunImmediately);
- m_numberOfThreads = GUI::Session::XML::readUIntAttribute(reader, Tags::NumberOfThreads);
- m_computationMethodAnalytical = GUI::Session::XML::readBoolAttribute(reader, Tags::Analytical);
+ m_runImmediately = GUI::Session::XML::readBoolAttribute(reader, Tag::RunImmediately);
+ m_numberOfThreads = GUI::Session::XML::readUIntAttribute(reader, Tag::NumberOfThreads);
+ m_computationMethodAnalytical = GUI::Session::XML::readBoolAttribute(reader, Tag::Analytical);
m_numberOfMonteCarloPoints =
- GUI::Session::XML::readUIntAttribute(reader, Tags::NumberOfMonteCarloPoints);
- m_useAverageMaterials = GUI::Session::XML::readBoolAttribute(reader, Tags::UseAverageMaterials);
- m_includeSpecularPeak = GUI::Session::XML::readBoolAttribute(reader, Tags::IncludeSpecularPeak);
+ GUI::Session::XML::readUIntAttribute(reader, Tag::NumberOfMonteCarloPoints);
+ m_useAverageMaterials = GUI::Session::XML::readBoolAttribute(reader, Tag::UseAverageMaterials);
+ m_includeSpecularPeak = GUI::Session::XML::readBoolAttribute(reader, Tag::IncludeSpecularPeak);
}
--
GitLab