From 1deca84192ef0f4d8b71347f89b00523a3718f8f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 10 Feb 2022 13:32:35 +0100
Subject: [PATCH] Serializer: rename fct
---
GUI/Model/Device/BeamAngleItems.cpp | 4 ++--
GUI/Model/Device/BeamWavelengthItem.cpp | 2 +-
GUI/Model/Device/MaskItems.cpp | 6 +++---
GUI/Model/Device/PointwiseAxisItem.cpp | 4 ++--
GUI/Model/Device/RectangularDetectorItem.cpp | 2 +-
GUI/Model/Device/SpecularBeamInclinationItem.cpp | 2 +-
GUI/Model/Device/SphericalDetectorItem.cpp | 2 +-
GUI/Model/Sample/MaterialItem.cpp | 2 +-
GUI/Model/Sample/MaterialItems.cpp | 2 +-
GUI/Model/Sample/MultiLayerItem.cpp | 2 +-
GUI/Model/XML/Serializer.cpp | 4 ++--
GUI/Model/XML/Serializer.h | 4 ++--
12 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/GUI/Model/Device/BeamAngleItems.cpp b/GUI/Model/Device/BeamAngleItems.cpp
index 7288ee139d6..1d6e959cb2d 100644
--- a/GUI/Model/Device/BeamAngleItems.cpp
+++ b/GUI/Model/Device/BeamAngleItems.cpp
@@ -28,7 +28,7 @@ void BeamAzimuthalAngleItem::serialize(Serializer& s)
s.assertVersion(0);
s.rw<DistributionItemCatalog>(m_distribution);
- if (s.isReading()) {
+ if (s.xmlReader()) {
m_distribution->setLimits(RealLimits::limited(-90.0, 90.0));
m_distribution->setUnit(Unit::degree);
}
@@ -76,7 +76,7 @@ void BeamInclinationAngleItem::serialize(Serializer& s)
s.assertVersion(0);
s.rw<DistributionItemCatalog>(m_distribution);
- if (s.isReading()) {
+ if (s.xmlReader()) {
m_distribution->setLimits(RealLimits::limited(-90.0, 90.0));
m_distribution->setUnit(Unit::degree);
}
diff --git a/GUI/Model/Device/BeamWavelengthItem.cpp b/GUI/Model/Device/BeamWavelengthItem.cpp
index 9824a7f0cee..73cc2df2006 100644
--- a/GUI/Model/Device/BeamWavelengthItem.cpp
+++ b/GUI/Model/Device/BeamWavelengthItem.cpp
@@ -59,7 +59,7 @@ void BeamWavelengthItem::serialize(Serializer& s)
s.assertVersion(0);
s.rw<DistributionItemCatalog>(m_distribution);
- if (s.isReading()) {
+ if (s.xmlReader()) {
m_distribution->setLimits(RealLimits::positive());
m_distribution->setUnit(Unit::nanometer);
}
diff --git a/GUI/Model/Device/MaskItems.cpp b/GUI/Model/Device/MaskItems.cpp
index 39987e294be..d3501b589a1 100644
--- a/GUI/Model/Device/MaskItems.cpp
+++ b/GUI/Model/Device/MaskItems.cpp
@@ -301,7 +301,7 @@ void PolygonItem::serialize(Serializer& s)
s.rw<bool>("visible", getItem(P_IS_VISIBLE));
s.rw<bool>("closed", getItem(P_ISCLOSED));
- if (s.isReading()) {
+ if (s.xmlReader()) {
QVector<PolygonPointItem*> pts;
s.rw("points", pts);
for (const auto* point : pts)
@@ -521,13 +521,13 @@ void MaskItems::clear()
void MaskItems::serialize(Serializer& s)
{
QVector<MaskItem*> items;
- if (!s.isReading())
+ if (!s.xmlReader())
items = maskItems();
s.assertVersion(0);
s.rw<MaskItemCatalog>("maskItems", items);
- if (s.isReading())
+ if (s.xmlReader())
for (auto m : items)
m_maskContainer->addMask(m);
}
diff --git a/GUI/Model/Device/PointwiseAxisItem.cpp b/GUI/Model/Device/PointwiseAxisItem.cpp
index f2c1c7c98b3..2ec45fcf627 100644
--- a/GUI/Model/Device/PointwiseAxisItem.cpp
+++ b/GUI/Model/Device/PointwiseAxisItem.cpp
@@ -36,7 +36,7 @@ PointwiseAxisItem::~PointwiseAxisItem() = default;
void PointwiseAxisItem::serialize(Serializer& s)
{
QByteArray a;
- if (s.isWriting())
+ if (s.xmlWriter())
a = serializeBinaryData();
s.assertVersion(0);
@@ -44,7 +44,7 @@ void PointwiseAxisItem::serialize(Serializer& s)
s.rw<QString>("nativeUnits", getItem(P_NATIVE_AXIS_UNITS));
s.rw("axisData", a);
- if (s.isReading())
+ if (s.xmlReader())
deserializeBinaryData(a);
}
diff --git a/GUI/Model/Device/RectangularDetectorItem.cpp b/GUI/Model/Device/RectangularDetectorItem.cpp
index 6691cb79e09..ce5ff3802d0 100644
--- a/GUI/Model/Device/RectangularDetectorItem.cpp
+++ b/GUI/Model/Device/RectangularDetectorItem.cpp
@@ -111,7 +111,7 @@ void RectangularDetectorItem::serialize(Serializer& s)
s.rw(m_v0);
s.rw(m_distance);
- if (s.isReading()) {
+ if (s.xmlReader()) {
setDetectorAlignment(static_cast<RectangularDetector::EDetectorArrangement>(alignment));
m_resolutionFunction->setUnit("mm");
}
diff --git a/GUI/Model/Device/SpecularBeamInclinationItem.cpp b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
index 1f19aa47db0..b53d68e843f 100644
--- a/GUI/Model/Device/SpecularBeamInclinationItem.cpp
+++ b/GUI/Model/Device/SpecularBeamInclinationItem.cpp
@@ -82,7 +82,7 @@ void SpecularBeamInclinationItem::serialize(Serializer& s)
s.rwWithInit<PointwiseAxisItem>("pointwiseAxis", m_pointwiseAlphaAxis,
setAxisPresentationDefaults);
- if (s.isReading()) {
+ if (s.xmlReader()) {
m_distribution->setLimits(RealLimits::limited(-90.0, 90.0));
m_distribution->setUnit(Unit::degree);
if (m_pointwiseAlphaAxis)
diff --git a/GUI/Model/Device/SphericalDetectorItem.cpp b/GUI/Model/Device/SphericalDetectorItem.cpp
index 28c1cf6e8bb..5287688a4da 100644
--- a/GUI/Model/Device/SphericalDetectorItem.cpp
+++ b/GUI/Model/Device/SphericalDetectorItem.cpp
@@ -52,7 +52,7 @@ void SphericalDetectorItem::serialize(Serializer& s)
s.rw("phiAxis", m_phiAxis);
s.rw("alphaAxis", m_alphaAxis);
- if (s.isReading())
+ if (s.xmlReader())
m_resolutionFunction->setUnit(Unit::degree);
}
diff --git a/GUI/Model/Sample/MaterialItem.cpp b/GUI/Model/Sample/MaterialItem.cpp
index c8db39e9e7b..465446c1b34 100644
--- a/GUI/Model/Sample/MaterialItem.cpp
+++ b/GUI/Model/Sample/MaterialItem.cpp
@@ -311,7 +311,7 @@ void MaterialItem::serialize(Serializer& s)
s.rw("val1", val1);
s.rw("val2", val2);
- if (s.isReading()) {
+ if (s.xmlReader()) {
if (hasRefractive)
m_data = Refractive(val1, val2);
else
diff --git a/GUI/Model/Sample/MaterialItems.cpp b/GUI/Model/Sample/MaterialItems.cpp
index b40471caf50..e58b13014cc 100644
--- a/GUI/Model/Sample/MaterialItems.cpp
+++ b/GUI/Model/Sample/MaterialItems.cpp
@@ -161,7 +161,7 @@ void MaterialItems::removeMaterial(MaterialItem* materialItem)
void MaterialItems::serialize(Serializer& s)
{
- if (s.isReading())
+ if (s.xmlReader())
clear();
s.assertVersion(0);
s.rw("MaterialItems", m_materialItems);
diff --git a/GUI/Model/Sample/MultiLayerItem.cpp b/GUI/Model/Sample/MultiLayerItem.cpp
index a24539653e3..b3b96f06927 100644
--- a/GUI/Model/Sample/MultiLayerItem.cpp
+++ b/GUI/Model/Sample/MultiLayerItem.cpp
@@ -151,7 +151,7 @@ void MultiLayerItem::serialize(Serializer& s)
s.rw("Materials", m_materials);
s.rw("Layers", m_layers, &m_materials);
- if (s.isReading()) {
+ if (s.xmlReader()) {
// set non-stored infos
for (auto* l : m_layers) {
l->setIsTopLayer(m_layers.first() == l);
diff --git a/GUI/Model/XML/Serializer.cpp b/GUI/Model/XML/Serializer.cpp
index ae1889f8ed6..dc0e280b306 100644
--- a/GUI/Model/XML/Serializer.cpp
+++ b/GUI/Model/XML/Serializer.cpp
@@ -32,12 +32,12 @@ constexpr auto Version("version");
} // namespace
-bool Serializer::isReading() const
+bool Serializer::xmlReader() const
{
return m_r;
}
-bool Serializer::isWriting() const
+bool Serializer::xmlWriter() const
{
return m_w;
}
diff --git a/GUI/Model/XML/Serializer.h b/GUI/Model/XML/Serializer.h
index 745d878141b..bcc87fba6ea 100644
--- a/GUI/Model/XML/Serializer.h
+++ b/GUI/Model/XML/Serializer.h
@@ -40,8 +40,8 @@ public:
{
}
- bool isReading() const; //!< Returns true if this is a reader.
- bool isWriting() const; //!< Returns true if this is a writer.
+ bool xmlReader() const; //!< Returns true if this is a reader.
+ bool xmlWriter() const; //!< Returns true if this is a writer.
//! As writer, serializes the given version number. As reader, does nothing.
void writeVersion(unsigned version) const;
--
GitLab