From dad4aa306b95721c67aabb5644234f122c44fba5 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Thu, 6 Jul 2023 14:05:32 +0200
Subject: [PATCH] cleanup
---
GUI/Model/Beam/SourceItems.cpp | 4 ++--
GUI/Model/Device/InstrumentItems.cpp | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp
index b1573c72a89..b83d73297a3 100644
--- a/GUI/Model/Beam/SourceItems.cpp
+++ b/GUI/Model/Beam/SourceItems.cpp
@@ -330,12 +330,12 @@ void ScanItem::readFrom(QXmlStreamReader* r)
SourceItem::readFrom(r);
XML::gotoEndElementOfTag(r, tag);
- // footprint
+ // footprint (moved to base class since v21 (version == 2))
} else if (version == 1 && tag == Tag::Footprint) {
m_footprint.readFrom(r);
XML::gotoEndElementOfTag(r, tag);
- // footprint groupbox: is expanded?
+ // footprint groupbox: is expanded? (moved to base class since v21 (version == 2))
} else if (version == 1 && tag == Tag::ExpandFootprintGroupbox) {
XML::readAttribute(r, XML::Attrib::value, &m_expandFootprint);
XML::gotoEndElementOfTag(r, tag);
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 01c34f4eafa..964a3625791 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -207,7 +207,7 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
XML::readAttribute(r, XML::Attrib::value, &m_description);
XML::gotoEndElementOfTag(r, tag);
- // with polarizer or analyzer? (OBSOLETE since v21)
+ // with polarizer or analyzer? (OBSOLETE since v21 (version == 2))
} else if (version == 1 && tag == Tag::WithPolarizerAnalyzer) {
XML::readAttribute(r, XML::Attrib::value, &m_withPolarizer);
m_withAnalyzer = m_withPolarizer;
@@ -218,7 +218,7 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
XML::readAttribute(r, XML::Attrib::value, &m_withPolarizer);
XML::gotoEndElementOfTag(r, tag);
- // polarization (alternate tag OBSOLETE since v21)
+ // polarization (alternate tag OBSOLETE since v21 (version == 2))
} else if (tag == Tag::PolarizerBlochVector || (version == 1 && tag == Tag::Polarization)) {
m_polarizerBlochVector.readFrom(r);
XML::gotoEndElementOfTag(r, tag);
@@ -233,17 +233,17 @@ void InstrumentItem::readFrom(QXmlStreamReader* r)
m_analyzerBlochVector.readFrom(r);
XML::gotoEndElementOfTag(r, tag);
- // analyzer direction OBSOLETE since v21
+ // analyzer direction OBSOLETE since v21 (version == 2)
} else if (version == 1 && tag == Tag::AnalyzerDirection) {
m_analyzerBlochVector.readFrom(r);
XML::gotoEndElementOfTag(r, tag);
- // analyzer efficiency OBSOLETE since v21
+ // analyzer efficiency OBSOLETE since v21 (version == 2)
} else if (version == 1 && tag == Tag::AnalyzerEfficiency) {
DoubleProperty analyzerEfficiency;
analyzerEfficiency.readFrom(r);
- XML::gotoEndElementOfTag(r, tag);
m_analyzerBlochVector.setR3(m_analyzerBlochVector.r3() * analyzerEfficiency.value());
+ XML::gotoEndElementOfTag(r, tag);
// background
} else if (tag == Tag::Background) {
--
GitLab