Skip to content
Snippets Groups Projects

GUI: RealModel is refactored

Merged Mikhail Svechnikov requested to merge realModel into main
All threads resolved!
Files
5
+ 10
10
@@ -41,12 +41,12 @@ const QString NativeDataUnits("NativeDataUnits");
} // namespace Tags
namespace Attributes {
namespace Atts {
const QString version("version");
const QString value("value");
} // namespace Attributes
} // namespace Atts
} // namespace
@@ -350,24 +350,24 @@ void RealItem::writeTo(QXmlStreamWriter* writer) const
QByteArray a = serializeBinaryData();
if (!a.isEmpty()) {
writer->writeStartElement(Tags::BinaryData);
writer->writeAttribute(Attributes::version, "1");
writer->writeAttribute(Atts::version, "1");
writer->writeCharacters(a.toBase64());
writer->writeEndElement(); // BinaryData
}
// instrument id
writer->writeStartElement(Tags::InstrumentId);
GUI::Session::XML::writeAttribute(writer, Attributes::value, m_instrumentId);
GUI::Session::XML::writeAttribute(writer, Atts::value, m_instrumentId);
writer->writeEndElement();
// name
writer->writeStartElement(Tags::Name);
GUI::Session::XML::writeAttribute(writer, Attributes::value, m_name);
GUI::Session::XML::writeAttribute(writer, Atts::value, m_name);
writer->writeEndElement();
// native data units
writer->writeStartElement(Tags::NativeDataUnits);
GUI::Session::XML::writeAttribute(writer, Attributes::value, m_nativeDataUnits);
GUI::Session::XML::writeAttribute(writer, Atts::value, m_nativeDataUnits);
writer->writeEndElement();
// data
@@ -399,7 +399,7 @@ void RealItem::readFrom(QXmlStreamReader* reader)
// binary data
if (reader->name() == Tags::BinaryData) {
if (reader->attributes().value(Attributes::version).toInt() == 1) {
if (reader->attributes().value(Atts::version).toInt() == 1) {
QString valueAsBase64 =
reader->readElementText(QXmlStreamReader::SkipChildElements);
const auto data = QByteArray::fromBase64(
@@ -410,12 +410,12 @@ void RealItem::readFrom(QXmlStreamReader* reader)
// instrument id
} else if (reader->name() == Tags::InstrumentId) {
GUI::Session::XML::readAttribute(reader, Attributes::value, &m_instrumentId);
GUI::Session::XML::readAttribute(reader, Atts::value, &m_instrumentId);
GUI::Session::XML::gotoEndElementOfTag(reader, Tags::InstrumentId);
// name
} else if (reader->name() == Tags::Name) {
GUI::Session::XML::readAttribute(reader, Attributes::value, &m_name);
GUI::Session::XML::readAttribute(reader, Atts::value, &m_name);
GUI::Session::XML::gotoEndElementOfTag(reader, Tags::Name);
// data
@@ -428,7 +428,7 @@ void RealItem::readFrom(QXmlStreamReader* reader)
// native data
} else if (reader->name() == Tags::NativeDataUnits) {
GUI::Session::XML::readAttribute(reader, Attributes::value, &m_nativeDataUnits);
GUI::Session::XML::readAttribute(reader, Atts::value, &m_nativeDataUnits);
GUI::Session::XML::gotoEndElementOfTag(reader, Tags::NativeDataUnits);
} else {
Loading