From 0615263f3e6e9422c4145e25f2ceda9bf7fde2ec Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Wed, 21 Dec 2022 17:35:54 +0100
Subject: [PATCH] clang-format
---
GUI/Model/CatDevice/MaskItemCatalog.cpp | 2 +-
GUI/Model/Descriptor/AxisProperty.cpp | 6 +-
GUI/Model/Descriptor/DistributionItems.cpp | 78 +++++-----
GUI/Model/Device/BackgroundItems.cpp | 8 +-
GUI/Model/Device/BeamAngleItems.cpp | 28 ++--
GUI/Model/Device/BeamDistributionItem.cpp | 6 +-
GUI/Model/Device/BeamItems.cpp | 28 ++--
GUI/Model/Device/BeamWavelengthItem.cpp | 14 +-
GUI/Model/Device/DetectorItems.cpp | 8 +-
GUI/Model/Device/FootprintItems.cpp | 18 +--
GUI/Model/Device/InstrumentCollection.cpp | 12 +-
GUI/Model/Device/InstrumentItems.cpp | 56 +++----
GUI/Model/Device/MaskItems.cpp | 146 ++++++++++---------
GUI/Model/Device/RectangularDetectorItem.cpp | 70 ++++-----
GUI/Model/Device/ResolutionFunctionItems.cpp | 6 +-
GUI/Model/Device/ResolutionFunctionItems.h | 2 +-
GUI/Model/Device/SphericalDetectorItem.cpp | 24 +--
17 files changed, 257 insertions(+), 255 deletions(-)
diff --git a/GUI/Model/CatDevice/MaskItemCatalog.cpp b/GUI/Model/CatDevice/MaskItemCatalog.cpp
index 56e9e3213d0..e08a148044f 100644
--- a/GUI/Model/CatDevice/MaskItemCatalog.cpp
+++ b/GUI/Model/CatDevice/MaskItemCatalog.cpp
@@ -40,7 +40,7 @@ MaskItem* MaskItemCatalog::create(Type type)
QVector<MaskItemCatalog::Type> MaskItemCatalog::types()
{
return {Type::RegionOfInterest, Type::Rectangle, Type::Polygon, Type::VerticalLine,
- Type::HorizontalLine, Type::MaskAll, Type::Ellipse};
+ Type::HorizontalLine, Type::MaskAll, Type::Ellipse};
}
MaskItemCatalog::UiInfo MaskItemCatalog::uiInfo(Type type)
diff --git a/GUI/Model/Descriptor/AxisProperty.cpp b/GUI/Model/Descriptor/AxisProperty.cpp
index 22095930014..4e3411ccb11 100644
--- a/GUI/Model/Descriptor/AxisProperty.cpp
+++ b/GUI/Model/Descriptor/AxisProperty.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Base/Util/Assert.h"
#include "GUI/Model/Descriptor/AxisProperty.h"
+#include "Base/Util/Assert.h"
#include "GUI/Support/XML/Serialize.h"
#include "GUI/Support/XML/UtilXML.h"
@@ -61,7 +61,7 @@ void AxisProperty::rwAxisProperty(Streamer& s, const QString& tag)
s.finish(tag);
}
-void AxisProperty::writeTo(QXmlStreamWriter *w) const
+void AxisProperty::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -81,7 +81,7 @@ void AxisProperty::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void AxisProperty::readFrom(QXmlStreamReader *r)
+void AxisProperty::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp
index 5d528a16972..78f745f1db5 100644
--- a/GUI/Model/Descriptor/DistributionItems.cpp
+++ b/GUI/Model/Descriptor/DistributionItems.cpp
@@ -62,11 +62,11 @@ bool DistributionItem::hasSigmaFactor() const
void DistributionItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwValue(s, Tag::NumberOfSamples, m_numberOfSamples);
+ // s.assertVersion(0);
+ // Serialize::rwValue(s, Tag::NumberOfSamples, m_numberOfSamples);
-// if (hasSigmaFactor())
-// Serialize::rwProperty(s, Tag::SigmaFactor, m_sigmaFactor);
+ // if (hasSigmaFactor())
+ // Serialize::rwProperty(s, Tag::SigmaFactor, m_sigmaFactor);
// m_limits and a changed unit (with setUnit) will not be serialized here. They have to be set
// again by the owner of DistributionItem after reading it
@@ -76,7 +76,7 @@ void DistributionItem::serialize(Streamer& s)
writeTo(s.xmlWriter());
}
-void DistributionItem::writeTo(QXmlStreamWriter *w) const
+void DistributionItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -96,7 +96,7 @@ void DistributionItem::writeTo(QXmlStreamWriter *w) const
}
}
-void DistributionItem::readFrom(QXmlStreamReader *r)
+void DistributionItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -145,15 +145,15 @@ void SymmetricResolutionItem::setMeanDecimals(uint d)
void SymmetricResolutionItem::serialize(Streamer& s)
{
-// DistributionItem::serialize(s);
-// Serialize::rwProperty(s, Tag::Mean, m_mean);
+ // DistributionItem::serialize(s);
+ // Serialize::rwProperty(s, Tag::Mean, m_mean);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void SymmetricResolutionItem::writeTo(QXmlStreamWriter *w) const
+void SymmetricResolutionItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -168,7 +168,7 @@ void SymmetricResolutionItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void SymmetricResolutionItem::readFrom(QXmlStreamReader *r)
+void SymmetricResolutionItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -261,16 +261,16 @@ void DistributionGateItem::setRange(double min, double max)
void DistributionGateItem::serialize(Streamer& s)
{
-// DistributionItem::serialize(s);
-// Serialize::rwProperty(s, Tag::Minimum, m_minimum);
-// Serialize::rwProperty(s, Tag::Maximum, m_maximum);
+ // DistributionItem::serialize(s);
+ // Serialize::rwProperty(s, Tag::Minimum, m_minimum);
+ // Serialize::rwProperty(s, Tag::Maximum, m_maximum);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void DistributionGateItem::writeTo(QXmlStreamWriter *w) const
+void DistributionGateItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -290,7 +290,7 @@ void DistributionGateItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DistributionGateItem::readFrom(QXmlStreamReader *r)
+void DistributionGateItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -369,15 +369,15 @@ void DistributionLorentzItem::initDistribution(double value)
void DistributionLorentzItem::serialize(Streamer& s)
{
-// SymmetricResolutionItem::serialize(s);
-// Serialize::rwProperty(s, Tag::HWHM, m_hwhm);
+ // SymmetricResolutionItem::serialize(s);
+ // Serialize::rwProperty(s, Tag::HWHM, m_hwhm);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void DistributionLorentzItem::writeTo(QXmlStreamWriter *w) const
+void DistributionLorentzItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -392,7 +392,7 @@ void DistributionLorentzItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DistributionLorentzItem::readFrom(QXmlStreamReader *r)
+void DistributionLorentzItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -468,15 +468,15 @@ void DistributionGaussianItem::initDistribution(double value)
void DistributionGaussianItem::serialize(Streamer& s)
{
-// SymmetricResolutionItem::serialize(s);
-// Serialize::rwProperty(s, Tag::StandardDeviation, m_standardDeviation);
+ // SymmetricResolutionItem::serialize(s);
+ // Serialize::rwProperty(s, Tag::StandardDeviation, m_standardDeviation);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void DistributionGaussianItem::writeTo(QXmlStreamWriter *w) const
+void DistributionGaussianItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -491,7 +491,7 @@ void DistributionGaussianItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DistributionGaussianItem::readFrom(QXmlStreamReader *r)
+void DistributionGaussianItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -554,16 +554,16 @@ void DistributionLogNormalItem::initDistribution(double value)
void DistributionLogNormalItem::serialize(Streamer& s)
{
-// DistributionItem::serialize(s);
-// Serialize::rwProperty(s, Tag::Median, m_median);
-// Serialize::rwProperty(s, Tag::ScaleParameter, m_scaleParameter);
+ // DistributionItem::serialize(s);
+ // Serialize::rwProperty(s, Tag::Median, m_median);
+ // Serialize::rwProperty(s, Tag::ScaleParameter, m_scaleParameter);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void DistributionLogNormalItem::writeTo(QXmlStreamWriter *w) const
+void DistributionLogNormalItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -583,7 +583,7 @@ void DistributionLogNormalItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DistributionLogNormalItem::readFrom(QXmlStreamReader *r)
+void DistributionLogNormalItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -661,15 +661,15 @@ void DistributionCosineItem::initDistribution(double value)
void DistributionCosineItem::serialize(Streamer& s)
{
-// SymmetricResolutionItem::serialize(s);
-// Serialize::rwProperty(s, Tag::Sigma, m_sigma);
+ // SymmetricResolutionItem::serialize(s);
+ // Serialize::rwProperty(s, Tag::Sigma, m_sigma);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void DistributionCosineItem::writeTo(QXmlStreamWriter *w) const
+void DistributionCosineItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -684,7 +684,7 @@ void DistributionCosineItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DistributionCosineItem::readFrom(QXmlStreamReader *r)
+void DistributionCosineItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -752,18 +752,18 @@ void DistributionTrapezoidItem::initDistribution(double value)
void DistributionTrapezoidItem::serialize(Streamer& s)
{
-// DistributionItem::serialize(s);
-// Serialize::rwProperty(s, Tag::Center, m_center);
-// Serialize::rwProperty(s, Tag::LeftWidth, m_leftWidth);
-// Serialize::rwProperty(s, Tag::MiddleWidth, m_middleWidth);
-// Serialize::rwProperty(s, Tag::RightWidth, m_rightWidth);
+ // DistributionItem::serialize(s);
+ // Serialize::rwProperty(s, Tag::Center, m_center);
+ // Serialize::rwProperty(s, Tag::LeftWidth, m_leftWidth);
+ // Serialize::rwProperty(s, Tag::MiddleWidth, m_middleWidth);
+ // Serialize::rwProperty(s, Tag::RightWidth, m_rightWidth);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void DistributionTrapezoidItem::writeTo(QXmlStreamWriter *w) const
+void DistributionTrapezoidItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -793,7 +793,7 @@ void DistributionTrapezoidItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DistributionTrapezoidItem::readFrom(QXmlStreamReader *r)
+void DistributionTrapezoidItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/BackgroundItems.cpp b/GUI/Model/Device/BackgroundItems.cpp
index 44dfcd38ea9..a0e91f14fe0 100644
--- a/GUI/Model/Device/BackgroundItems.cpp
+++ b/GUI/Model/Device/BackgroundItems.cpp
@@ -39,15 +39,15 @@ std::unique_ptr<IBackground> ConstantBackgroundItem::createBackground() const
void ConstantBackgroundItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwProperty(s, Tag::BackgroundValue, m_backgroundValue);
+ // s.assertVersion(0);
+ // Serialize::rwProperty(s, Tag::BackgroundValue, m_backgroundValue);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void ConstantBackgroundItem::writeTo(QXmlStreamWriter *w) const
+void ConstantBackgroundItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -57,7 +57,7 @@ void ConstantBackgroundItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void ConstantBackgroundItem::readFrom(QXmlStreamReader *r)
+void ConstantBackgroundItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/BeamAngleItems.cpp b/GUI/Model/Device/BeamAngleItems.cpp
index d6b89048131..848049cb3da 100644
--- a/GUI/Model/Device/BeamAngleItems.cpp
+++ b/GUI/Model/Device/BeamAngleItems.cpp
@@ -24,20 +24,20 @@ BeamAzimuthalAngleItem::BeamAzimuthalAngleItem()
void BeamAzimuthalAngleItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// m_distribution.rwSelected(s, Tag::BeamAzimuthalDistribution);
+ // s.assertVersion(0);
+ // m_distribution.rwSelected(s, Tag::BeamAzimuthalDistribution);
-// if (s.xmlReader()) {
-// m_distribution->setLimits(RealLimits::limited(-90.0, 90.0));
-// m_distribution->setUnit(Unit::degree);
-// }
+ // if (s.xmlReader()) {
+ // m_distribution->setLimits(RealLimits::limited(-90.0, 90.0));
+ // m_distribution->setUnit(Unit::degree);
+ // }
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void BeamAzimuthalAngleItem::readFrom(QXmlStreamReader *r)
+void BeamAzimuthalAngleItem::readFrom(QXmlStreamReader* r)
{
// Here we only directly call parental method, so no versioning
BeamDistributionItem::readFrom(r);
@@ -85,20 +85,20 @@ BeamInclinationAngleItem::BeamInclinationAngleItem()
void BeamInclinationAngleItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// m_distribution.rwSelected(s, Tag::BeamInclinationDistribution);
+ // s.assertVersion(0);
+ // m_distribution.rwSelected(s, Tag::BeamInclinationDistribution);
-// if (s.xmlReader()) {
-// m_distribution->setLimits(RealLimits::limited(-90.0, 90.0));
-// m_distribution->setUnit(Unit::degree);
-// }
+ // if (s.xmlReader()) {
+ // m_distribution->setLimits(RealLimits::limited(-90.0, 90.0));
+ // m_distribution->setUnit(Unit::degree);
+ // }
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void BeamInclinationAngleItem::readFrom(QXmlStreamReader *r)
+void BeamInclinationAngleItem::readFrom(QXmlStreamReader* r)
{
// Here we only directly call parental method, so no versioning
BeamDistributionItem::readFrom(r);
diff --git a/GUI/Model/Device/BeamDistributionItem.cpp b/GUI/Model/Device/BeamDistributionItem.cpp
index 828aacbd501..4572ea239b6 100644
--- a/GUI/Model/Device/BeamDistributionItem.cpp
+++ b/GUI/Model/Device/BeamDistributionItem.cpp
@@ -22,9 +22,9 @@ namespace Tag {
const QString Distribution("Distribution");
}
-}
+} // namespace
-void BeamDistributionItem::writeTo(QXmlStreamWriter *w) const
+void BeamDistributionItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -34,7 +34,7 @@ void BeamDistributionItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void BeamDistributionItem::readFrom(QXmlStreamReader *r)
+void BeamDistributionItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/BeamItems.cpp b/GUI/Model/Device/BeamItems.cpp
index 42364cbd94d..180636c2bc2 100644
--- a/GUI/Model/Device/BeamItems.cpp
+++ b/GUI/Model/Device/BeamItems.cpp
@@ -58,18 +58,18 @@ BeamItem::BeamItem()
void BeamItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwProperty(s, Tag::Intensity, m_intensity);
-// Serialize::rwClass(s, Tag::Wavelength, *m_wavelengthItem);
-// Serialize::rwClass(s, Tag::AzimuthalAngle, *m_azimuthalAngleItem);
-// Serialize::rwClass(s, Tag::InclinationAngle, *m_inclinationAngleItem);
+ // s.assertVersion(0);
+ // Serialize::rwProperty(s, Tag::Intensity, m_intensity);
+ // Serialize::rwClass(s, Tag::Wavelength, *m_wavelengthItem);
+ // Serialize::rwClass(s, Tag::AzimuthalAngle, *m_azimuthalAngleItem);
+ // Serialize::rwClass(s, Tag::InclinationAngle, *m_inclinationAngleItem);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
- writeTo(s.xmlWriter());
+ writeTo(s.xmlWriter());
}
-void BeamItem::writeTo(QXmlStreamWriter *w) const
+void BeamItem::writeTo(QXmlStreamWriter* w) const
{
ASSERT(m_wavelengthItem);
ASSERT(m_inclinationAngleItem);
@@ -97,7 +97,7 @@ void BeamItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void BeamItem::readFrom(QXmlStreamReader *r)
+void BeamItem::readFrom(QXmlStreamReader* r)
{
ASSERT(m_wavelengthItem);
ASSERT(m_inclinationAngleItem);
@@ -210,16 +210,16 @@ SpecularBeamItem::SpecularBeamItem(const InstrumentItem* owningInstrument)
void SpecularBeamItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwBaseClass<BeamItem>(s, "BeamItem", this);
-// m_footprint.rwSelected(s, Tag::Footprint);
+ // s.assertVersion(0);
+ // Serialize::rwBaseClass<BeamItem>(s, "BeamItem", this);
+ // m_footprint.rwSelected(s, Tag::Footprint);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
- writeTo(s.xmlWriter());
+ writeTo(s.xmlWriter());
}
-void SpecularBeamItem::writeTo(QXmlStreamWriter *w) const
+void SpecularBeamItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -234,7 +234,7 @@ void SpecularBeamItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void SpecularBeamItem::readFrom(QXmlStreamReader *r)
+void SpecularBeamItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/BeamWavelengthItem.cpp b/GUI/Model/Device/BeamWavelengthItem.cpp
index bfa8aa8e178..4678b074606 100644
--- a/GUI/Model/Device/BeamWavelengthItem.cpp
+++ b/GUI/Model/Device/BeamWavelengthItem.cpp
@@ -56,20 +56,20 @@ BeamWavelengthItem::BeamWavelengthItem(bool onlySymmetricDistributions)
void BeamWavelengthItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// m_distribution.rwSelected(s, Tag::BeamWavelengthDistribution);
+ // s.assertVersion(0);
+ // m_distribution.rwSelected(s, Tag::BeamWavelengthDistribution);
-// if (s.xmlReader()) {
-// m_distribution->setLimits(RealLimits::positive());
-// m_distribution->setUnit(Unit::nanometer);
-// }
+ // if (s.xmlReader()) {
+ // m_distribution->setLimits(RealLimits::positive());
+ // m_distribution->setUnit(Unit::nanometer);
+ // }
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void BeamWavelengthItem::readFrom(QXmlStreamReader *r)
+void BeamWavelengthItem::readFrom(QXmlStreamReader* r)
{
// Here we only directly call parental method, so no versioning
BeamDistributionItem::readFrom(r);
diff --git a/GUI/Model/Device/DetectorItems.cpp b/GUI/Model/Device/DetectorItems.cpp
index 5348fd57b84..fdf6dc0ad86 100644
--- a/GUI/Model/Device/DetectorItems.cpp
+++ b/GUI/Model/Device/DetectorItems.cpp
@@ -26,8 +26,8 @@ namespace Tag {
const QString ResolutionFunction("ResolutionFunction");
const QString MaskModel("MaskModel");
-}
-}
+} // namespace Tag
+} // namespace
DetectorItem::DetectorItem() {}
@@ -42,7 +42,7 @@ std::unique_ptr<IDetector> DetectorItem::createDetector() const
return result;
}
-void DetectorItem::writeTo(QXmlStreamWriter *w) const
+void DetectorItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -57,7 +57,7 @@ void DetectorItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DetectorItem::readFrom(QXmlStreamReader *r)
+void DetectorItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/FootprintItems.cpp b/GUI/Model/Device/FootprintItems.cpp
index 23dc6b4e494..e46cddaeaed 100644
--- a/GUI/Model/Device/FootprintItems.cpp
+++ b/GUI/Model/Device/FootprintItems.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
+#include "GUI/Model/Device/FootprintItems.h"
#include "Device/Beam/FootprintGauss.h"
#include "Device/Beam/FootprintSquare.h"
-#include "GUI/Model/Device/FootprintItems.h"
#include "GUI/Support/XML/Serialize.h"
#include "GUI/Support/XML/UtilXML.h"
@@ -41,21 +41,21 @@ FootprintGaussianItem::FootprintGaussianItem(double value)
void FootprintGaussianItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwProperty(s, Tag::GaussianFootprint, m_gaussianFootprintValue);
+ // s.assertVersion(0);
+ // Serialize::rwProperty(s, Tag::GaussianFootprint, m_gaussianFootprintValue);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void FootprintGaussianItem::writeTo(QXmlStreamWriter *w) const
+void FootprintGaussianItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
m_gaussianFootprintValue.writeTo(w, Tag::GaussianFootprint);
}
-void FootprintGaussianItem::readFrom(QXmlStreamReader *r)
+void FootprintGaussianItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -84,21 +84,21 @@ FootprintSquareItem::FootprintSquareItem(double value)
void FootprintSquareItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwProperty(s, Tag::SquareFootprint, m_squareFootprintValue);
+ // s.assertVersion(0);
+ // Serialize::rwProperty(s, Tag::SquareFootprint, m_squareFootprintValue);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void FootprintSquareItem::writeTo(QXmlStreamWriter *w) const
+void FootprintSquareItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
m_squareFootprintValue.writeTo(w, Tag::SquareFootprint);
}
-void FootprintSquareItem::readFrom(QXmlStreamReader *r)
+void FootprintSquareItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/InstrumentCollection.cpp b/GUI/Model/Device/InstrumentCollection.cpp
index 073995634b2..c53f2ab17f4 100644
--- a/GUI/Model/Device/InstrumentCollection.cpp
+++ b/GUI/Model/Device/InstrumentCollection.cpp
@@ -34,15 +34,15 @@ void InstrumentCollection::clear()
void InstrumentCollection::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwCatalogized<InstrumentItemCatalog>(s, "InstrumentCollection", m_instruments);
+ // s.assertVersion(0);
+ // Serialize::rwCatalogized<InstrumentItemCatalog>(s, "InstrumentCollection", m_instruments);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void InstrumentCollection::writeTo(QXmlStreamWriter *w) const
+void InstrumentCollection::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -54,7 +54,7 @@ void InstrumentCollection::writeTo(QXmlStreamWriter *w) const
}
}
-void InstrumentCollection::readFrom(QXmlStreamReader *r)
+void InstrumentCollection::readFrom(QXmlStreamReader* r)
{
m_instruments.clear();
@@ -74,7 +74,7 @@ void InstrumentCollection::readFrom(QXmlStreamReader *r)
}
}
-void InstrumentCollection::emplace_back(InstrumentItem *item)
+void InstrumentCollection::emplace_back(InstrumentItem* item)
{
addEmptyInstrumentSelection().setCurrentItem(item);
}
@@ -103,7 +103,7 @@ QStringList InstrumentCollection::instrumentNames() const
return existingNames;
}
-SelectionProperty<InstrumentItemCatalog> &InstrumentCollection::addEmptyInstrumentSelection()
+SelectionProperty<InstrumentItemCatalog>& InstrumentCollection::addEmptyInstrumentSelection()
{
SelectionProperty<InstrumentItemCatalog> newInstrumentSelection;
m_instruments.push_back(std::move(newInstrumentSelection));
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index 03bcdb05bd3..a4fb30ce3e8 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -127,24 +127,24 @@ T* InstrumentItem::beam() const
void InstrumentItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwValue(s, Tag::Id, m_id);
-// Serialize::rwValue(s, Tag::Name, m_name);
-// Serialize::rwValue(s, Tag::Description, m_description);
-// Serialize::rwValue(s, Tag::WithPolarizerAnalyzer, m_withPolarizerAnalyzer);
-// m_polarization.rwProperty(s, Tag::Polarization);
-// m_analyzerDirection.rwProperty(s, Tag::AnalyzerDirection);
-// Serialize::rwProperty(s, Tag::AnalyzerEfficiency, m_analyzerEfficiency);
-// Serialize::rwProperty(s, Tag::AnalyzerTotalTransmission, m_analyzerTotalTransmission);
-// m_background.rwSelected(s, Tag::Background);
-// Serialize::rwClass(s, Tag::Beam, *m_beamItem);
+ // s.assertVersion(0);
+ // Serialize::rwValue(s, Tag::Id, m_id);
+ // Serialize::rwValue(s, Tag::Name, m_name);
+ // Serialize::rwValue(s, Tag::Description, m_description);
+ // Serialize::rwValue(s, Tag::WithPolarizerAnalyzer, m_withPolarizerAnalyzer);
+ // m_polarization.rwProperty(s, Tag::Polarization);
+ // m_analyzerDirection.rwProperty(s, Tag::AnalyzerDirection);
+ // Serialize::rwProperty(s, Tag::AnalyzerEfficiency, m_analyzerEfficiency);
+ // Serialize::rwProperty(s, Tag::AnalyzerTotalTransmission, m_analyzerTotalTransmission);
+ // m_background.rwSelected(s, Tag::Background);
+ // Serialize::rwClass(s, Tag::Beam, *m_beamItem);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void InstrumentItem::writeTo(QXmlStreamWriter *w) const
+void InstrumentItem::writeTo(QXmlStreamWriter* w) const
{
ASSERT(m_beamItem);
@@ -201,7 +201,7 @@ void InstrumentItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void InstrumentItem::readFrom(QXmlStreamReader *r)
+void InstrumentItem::readFrom(QXmlStreamReader* r)
{
ASSERT(m_beamItem);
@@ -377,16 +377,16 @@ DepthProbeInstrumentItem::DepthProbeInstrumentItem()
void DepthProbeInstrumentItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwBaseClass<InstrumentItem>(s, "InstrumentItem", this);
-// m_zAxis.rwAxisProperty(s, "zAxis");
+ // s.assertVersion(0);
+ // Serialize::rwBaseClass<InstrumentItem>(s, "InstrumentItem", this);
+ // m_zAxis.rwAxisProperty(s, "zAxis");
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void DepthProbeInstrumentItem::writeTo(QXmlStreamWriter *w) const
+void DepthProbeInstrumentItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -401,7 +401,7 @@ void DepthProbeInstrumentItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void DepthProbeInstrumentItem::readFrom(QXmlStreamReader *r)
+void DepthProbeInstrumentItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -488,16 +488,16 @@ Instrument2DItem::Instrument2DItem()
void Instrument2DItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwBaseClass<InstrumentItem>(s, "InstrumentItem", this);
-// m_detector.rwSelected(s, Tag::Detector);
+ // s.assertVersion(0);
+ // Serialize::rwBaseClass<InstrumentItem>(s, "InstrumentItem", this);
+ // m_detector.rwSelected(s, Tag::Detector);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void Instrument2DItem::writeTo(QXmlStreamWriter *w) const
+void Instrument2DItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -512,7 +512,7 @@ void Instrument2DItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void Instrument2DItem::readFrom(QXmlStreamReader *r)
+void Instrument2DItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -627,16 +627,16 @@ OffspecInstrumentItem::OffspecInstrumentItem()
void OffspecInstrumentItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwBaseClass<Instrument2DItem>(s, "Instrument2DItem", this);
-// m_alphaAxis.rwAxisProperty(s, "alphaAxis");
+ // s.assertVersion(0);
+ // Serialize::rwBaseClass<Instrument2DItem>(s, "Instrument2DItem", this);
+ // m_alphaAxis.rwAxisProperty(s, "alphaAxis");
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void OffspecInstrumentItem::writeTo(QXmlStreamWriter *w) const
+void OffspecInstrumentItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -651,7 +651,7 @@ void OffspecInstrumentItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void OffspecInstrumentItem::readFrom(QXmlStreamReader *r)
+void OffspecInstrumentItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/MaskItems.cpp b/GUI/Model/Device/MaskItems.cpp
index e4acd43c0fa..36ce10935f2 100644
--- a/GUI/Model/Device/MaskItems.cpp
+++ b/GUI/Model/Device/MaskItems.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
+#include "GUI/Model/Device/MaskItems.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/InfinitePlane.h"
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Support/XML/Serialize.h"
#include "GUI/Support/XML/UtilXML.h"
@@ -134,7 +134,7 @@ void MaskItem::setIsVisibleValue(bool visible)
emit maskVisibilityChanged();
}
-void MaskItem::writeTo(QXmlStreamWriter *w) const
+void MaskItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -154,7 +154,7 @@ void MaskItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void MaskItem::readFrom(QXmlStreamReader *r)
+void MaskItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -272,14 +272,14 @@ void RectangleItem::setYUp(double val)
void RectangleItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
-// Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
+ // s.assertVersion(0);
+ // Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
+ // Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
-// Serialize::rwSessionItem<double>(s, "xlow", getItem(P_XLOW));
-// Serialize::rwSessionItem<double>(s, "ylow", getItem(P_YLOW));
-// Serialize::rwSessionItem<double>(s, "xup", getItem(P_XUP));
-// Serialize::rwSessionItem<double>(s, "yup", getItem(P_YUP));
+ // Serialize::rwSessionItem<double>(s, "xlow", getItem(P_XLOW));
+ // Serialize::rwSessionItem<double>(s, "ylow", getItem(P_YLOW));
+ // Serialize::rwSessionItem<double>(s, "xup", getItem(P_XUP));
+ // Serialize::rwSessionItem<double>(s, "yup", getItem(P_YUP));
if (s.xmlReader())
readFrom(s.xmlReader());
@@ -287,7 +287,7 @@ void RectangleItem::serialize(Streamer& s)
writeTo(s.xmlWriter());
}
-void RectangleItem::writeTo(QXmlStreamWriter *w) const
+void RectangleItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -317,7 +317,7 @@ void RectangleItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void RectangleItem::readFrom(QXmlStreamReader *r)
+void RectangleItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -412,9 +412,9 @@ void PolygonPointItem::setPosY(double val)
void PolygonPointItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwSessionItem<double>(s, "x", getItem(P_POSX));
-// Serialize::rwSessionItem<double>(s, "y", getItem(P_POSY));
+ // s.assertVersion(0);
+ // Serialize::rwSessionItem<double>(s, "x", getItem(P_POSX));
+ // Serialize::rwSessionItem<double>(s, "y", getItem(P_POSY));
if (s.xmlReader())
readFrom(s.xmlReader());
@@ -422,14 +422,14 @@ void PolygonPointItem::serialize(Streamer& s)
writeTo(s.xmlWriter());
}
-void PolygonPointItem::writeTo(QXmlStreamWriter *w) const
+void PolygonPointItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::xPos, posX());
XML::writeAttribute(w, XML::Attrib::yPos, posY());
XML::writeAttribute(w, XML::Attrib::version, uint(1));
}
-void PolygonPointItem::readFrom(QXmlStreamReader *r)
+void PolygonPointItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -490,29 +490,29 @@ void PolygonItem::addPoint(double x, double y)
void PolygonItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
-// Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
-
-// Serialize::rwSessionItem<bool>(s, "closed", getItem(P_ISCLOSED));
-
-// if (s.xmlReader()) {
-// QVector<PolygonPointItem*> pts;
-// Serialize::rwVector(s, "points", pts);
-// for (const auto* point : pts)
-// addPoint(point->posX(), point->posY());
-// qDeleteAll(pts);
-// } else {
-// auto p = points();
-// Serialize::rwVector(s, "points", p);
-// }
+ // s.assertVersion(0);
+ // Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
+ // Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
+
+ // Serialize::rwSessionItem<bool>(s, "closed", getItem(P_ISCLOSED));
+
+ // if (s.xmlReader()) {
+ // QVector<PolygonPointItem*> pts;
+ // Serialize::rwVector(s, "points", pts);
+ // for (const auto* point : pts)
+ // addPoint(point->posX(), point->posY());
+ // qDeleteAll(pts);
+ // } else {
+ // auto p = points();
+ // Serialize::rwVector(s, "points", p);
+ // }
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void PolygonItem::writeTo(QXmlStreamWriter *w) const
+void PolygonItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -534,9 +534,10 @@ void PolygonItem::writeTo(QXmlStreamWriter *w) const
}
}
-void PolygonItem::readFrom(QXmlStreamReader *r)
+void PolygonItem::readFrom(QXmlStreamReader* r)
{
- // m_points.clear(); <-- do not forget to empty owning vector before filling it with new objects
+ // m_points.clear(); <-- do not forget to empty owning vector before filling it with new
+ // objects
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -552,7 +553,8 @@ void PolygonItem::readFrom(QXmlStreamReader *r)
// is closed?
} else if (tag == Tag::IsClosed) {
bool isClosed = false;
- XML::readAttribute(r, XML::Attrib::value, &isClosed); // TODO do we need to read 'isClosed'?
+ XML::readAttribute(r, XML::Attrib::value,
+ &isClosed); // TODO do we need to read 'isClosed'?
setIsClosed(isClosed);
XML::gotoEndElementOfTag(r, tag);
@@ -595,11 +597,11 @@ void VerticalLineItem::setPosX(double val)
void VerticalLineItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
-// Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
+ // s.assertVersion(0);
+ // Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
+ // Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
-// Serialize::rwSessionItem<double>(s, "x", getItem(P_POSX));
+ // Serialize::rwSessionItem<double>(s, "x", getItem(P_POSX));
if (s.xmlReader())
readFrom(s.xmlReader());
@@ -607,7 +609,7 @@ void VerticalLineItem::serialize(Streamer& s)
writeTo(s.xmlWriter());
}
-void VerticalLineItem::writeTo(QXmlStreamWriter *w) const
+void VerticalLineItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -622,7 +624,7 @@ void VerticalLineItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void VerticalLineItem::readFrom(QXmlStreamReader *r)
+void VerticalLineItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -674,11 +676,11 @@ void HorizontalLineItem::setPosY(double pos_y)
void HorizontalLineItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
-// Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
+ // s.assertVersion(0);
+ // Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
+ // Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
-// Serialize::rwSessionItem<double>(s, "y", getItem(P_POSY));
+ // Serialize::rwSessionItem<double>(s, "y", getItem(P_POSY));
if (s.xmlReader())
readFrom(s.xmlReader());
@@ -686,7 +688,7 @@ void HorizontalLineItem::serialize(Streamer& s)
writeTo(s.xmlWriter());
}
-void HorizontalLineItem::writeTo(QXmlStreamWriter *w) const
+void HorizontalLineItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -701,7 +703,7 @@ void HorizontalLineItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void HorizontalLineItem::readFrom(QXmlStreamReader *r)
+void HorizontalLineItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -807,15 +809,15 @@ void EllipseItem::setAngle(const double val)
void EllipseItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
-// Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
+ // s.assertVersion(0);
+ // Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
+ // Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
-// Serialize::rwSessionItem<double>(s, "x", getItem(P_XCENTER));
-// Serialize::rwSessionItem<double>(s, "y", getItem(P_YCENTER));
-// Serialize::rwSessionItem<double>(s, "xr", getItem(P_XRADIUS));
-// Serialize::rwSessionItem<double>(s, "yr", getItem(P_YRADIUS));
-// Serialize::rwSessionItem<double>(s, "angle", getItem(P_ANGLE));
+ // Serialize::rwSessionItem<double>(s, "x", getItem(P_XCENTER));
+ // Serialize::rwSessionItem<double>(s, "y", getItem(P_YCENTER));
+ // Serialize::rwSessionItem<double>(s, "xr", getItem(P_XRADIUS));
+ // Serialize::rwSessionItem<double>(s, "yr", getItem(P_YRADIUS));
+ // Serialize::rwSessionItem<double>(s, "angle", getItem(P_ANGLE));
if (s.xmlReader())
readFrom(s.xmlReader());
@@ -823,7 +825,7 @@ void EllipseItem::serialize(Streamer& s)
writeTo(s.xmlWriter());
}
-void EllipseItem::writeTo(QXmlStreamWriter *w) const
+void EllipseItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -858,7 +860,7 @@ void EllipseItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void EllipseItem::readFrom(QXmlStreamReader *r)
+void EllipseItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
@@ -927,9 +929,9 @@ std::unique_ptr<IShape2D> MaskAllItem::createShape(double) const
void MaskAllItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
-// Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
+ // s.assertVersion(0);
+ // Serialize::rwSessionItem<bool>(s, "maskValue", getItem(P_MASK_VALUE));
+ // Serialize::rwSessionItem<bool>(s, "visible", getItem(P_IS_VISIBLE));
if (s.xmlReader())
readFrom(s.xmlReader());
@@ -971,16 +973,16 @@ void MaskItems::clear()
void MaskItems::serialize(Streamer& s)
{
-// QVector<MaskItem*> items;
-// if (!s.xmlReader())
-// items = maskItems();
+ // QVector<MaskItem*> items;
+ // if (!s.xmlReader())
+ // items = maskItems();
-// s.assertVersion(0);
-// Serialize::rwCatalogized<MaskItemCatalog>(s, "maskItems", items);
+ // s.assertVersion(0);
+ // Serialize::rwCatalogized<MaskItemCatalog>(s, "maskItems", items);
-// if (s.xmlReader())
-// for (auto m : items)
-// m_maskContainer->addMask(m);
+ // if (s.xmlReader())
+ // for (auto m : items)
+ // m_maskContainer->addMask(m);
if (s.xmlReader())
readFrom(s.xmlReader());
@@ -988,7 +990,7 @@ void MaskItems::serialize(Streamer& s)
writeTo(s.xmlWriter());
}
-void MaskItems::writeTo(QXmlStreamWriter *w) const
+void MaskItems::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -1000,7 +1002,7 @@ void MaskItems::writeTo(QXmlStreamWriter *w) const
}
}
-void MaskItems::readFrom(QXmlStreamReader *r, MessageService *)
+void MaskItems::readFrom(QXmlStreamReader* r, MessageService*)
{
m_maskContainer->clear();
diff --git a/GUI/Model/Device/RectangularDetectorItem.cpp b/GUI/Model/Device/RectangularDetectorItem.cpp
index 08f3afcd223..85990f72f60 100644
--- a/GUI/Model/Device/RectangularDetectorItem.cpp
+++ b/GUI/Model/Device/RectangularDetectorItem.cpp
@@ -96,46 +96,46 @@ RectangularDetectorItem::RectangularDetectorItem()
void RectangularDetectorItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// // base class members
-// Serialize::rwClass(s, Tag::Masks, m_maskItems);
-// m_resolutionFunction.rwSelected(s, Tag::ResolutionFunction);
-
-// // own members
-// Serialize::rwValue(s, Tag::XSize, m_xSize);
-// Serialize::rwValue(s, Tag::YSize, m_ySize);
-// Serialize::rwProperty(s, Tag::Width, m_width);
-// Serialize::rwProperty(s, Tag::Height, m_height);
-
-// if (auto* w = s.xmlWriter()) {
-// w->writeStartElement(Tag::Alignment);
-// m_detectorAlignment.writeTo(w);
-// w->writeEndElement();
-// } else {
-// auto* r = s.xmlReader();
-// r->readNextStartElement();
-// if (r->name() == Tag::Alignment) {
-// m_detectorAlignment.readFrom(r);
-// XML::gotoEndElementOfTag(r, Tag::Alignment);
-// }
-// }
-
-// m_normalVector.rwProperty(s, Tag::NormalVector);
-// m_directionVector.rwProperty(s, Tag::DirectionVector);
-// Serialize::rwProperty(s, Tag::u0, m_u0);
-// Serialize::rwProperty(s, Tag::v0, m_v0);
-// Serialize::rwProperty(s, Tag::Distance, m_distance);
-
-// if (s.xmlReader()) {
-// m_resolutionFunction->setUnit("mm");
-// }
+ // s.assertVersion(0);
+ // // base class members
+ // Serialize::rwClass(s, Tag::Masks, m_maskItems);
+ // m_resolutionFunction.rwSelected(s, Tag::ResolutionFunction);
+
+ // // own members
+ // Serialize::rwValue(s, Tag::XSize, m_xSize);
+ // Serialize::rwValue(s, Tag::YSize, m_ySize);
+ // Serialize::rwProperty(s, Tag::Width, m_width);
+ // Serialize::rwProperty(s, Tag::Height, m_height);
+
+ // if (auto* w = s.xmlWriter()) {
+ // w->writeStartElement(Tag::Alignment);
+ // m_detectorAlignment.writeTo(w);
+ // w->writeEndElement();
+ // } else {
+ // auto* r = s.xmlReader();
+ // r->readNextStartElement();
+ // if (r->name() == Tag::Alignment) {
+ // m_detectorAlignment.readFrom(r);
+ // XML::gotoEndElementOfTag(r, Tag::Alignment);
+ // }
+ // }
+
+ // m_normalVector.rwProperty(s, Tag::NormalVector);
+ // m_directionVector.rwProperty(s, Tag::DirectionVector);
+ // Serialize::rwProperty(s, Tag::u0, m_u0);
+ // Serialize::rwProperty(s, Tag::v0, m_v0);
+ // Serialize::rwProperty(s, Tag::Distance, m_distance);
+
+ // if (s.xmlReader()) {
+ // m_resolutionFunction->setUnit("mm");
+ // }
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void RectangularDetectorItem::writeTo(QXmlStreamWriter *w) const
+void RectangularDetectorItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -195,7 +195,7 @@ void RectangularDetectorItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void RectangularDetectorItem::readFrom(QXmlStreamReader *r)
+void RectangularDetectorItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/ResolutionFunctionItems.cpp b/GUI/Model/Device/ResolutionFunctionItems.cpp
index 0d420b7f01a..ee477724609 100644
--- a/GUI/Model/Device/ResolutionFunctionItems.cpp
+++ b/GUI/Model/Device/ResolutionFunctionItems.cpp
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/Model/Device/ResolutionFunctionItems.h"
+#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "GUI/Support/XML/Serialize.h"
#include "GUI/Support/XML/UtilXML.h"
@@ -59,7 +59,7 @@ void ResolutionFunction2DGaussianItem::serialize(Streamer& s)
Serialize::rwProperty(s, Tag::SigmaY, m_sigmaY);
}
-void ResolutionFunction2DGaussianItem::writeTo(QXmlStreamWriter *w) const
+void ResolutionFunction2DGaussianItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -67,7 +67,7 @@ void ResolutionFunction2DGaussianItem::writeTo(QXmlStreamWriter *w) const
m_sigmaY.writeTo(w, Tag::SigmaY);
}
-void ResolutionFunction2DGaussianItem::readFrom(QXmlStreamReader * r)
+void ResolutionFunction2DGaussianItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
diff --git a/GUI/Model/Device/ResolutionFunctionItems.h b/GUI/Model/Device/ResolutionFunctionItems.h
index 0d14225a9e9..03f86c36c4e 100644
--- a/GUI/Model/Device/ResolutionFunctionItems.h
+++ b/GUI/Model/Device/ResolutionFunctionItems.h
@@ -51,7 +51,7 @@ public:
void setUnit(const std::variant<QString, Unit>& unit) override;
void serialize(Streamer& s) override;
void writeTo(QXmlStreamWriter* w) const override;
- void readFrom(QXmlStreamReader*r) override;
+ void readFrom(QXmlStreamReader* r) override;
DoubleProperty& sigmaX() { return m_sigmaX; }
const DoubleProperty& sigmaX() const { return m_sigmaX; }
diff --git a/GUI/Model/Device/SphericalDetectorItem.cpp b/GUI/Model/Device/SphericalDetectorItem.cpp
index b93bc5d470a..43609ffb442 100644
--- a/GUI/Model/Device/SphericalDetectorItem.cpp
+++ b/GUI/Model/Device/SphericalDetectorItem.cpp
@@ -25,7 +25,7 @@ const QString AlphaAxis("AlphaAxis");
const QString PhiAxis("PhiAxis");
const QString BaseData("BaseData");
-}
+} // namespace Tag
void initResolutionFunction(ResolutionFunctionItem* newFunc, const ResolutionFunctionItem*)
{
@@ -51,24 +51,24 @@ SphericalDetectorItem::SphericalDetectorItem()
void SphericalDetectorItem::serialize(Streamer& s)
{
-// s.assertVersion(0);
-// // base class members
-// Serialize::rwClass(s, "masks", m_maskItems);
-// m_resolutionFunction.rwSelected(s, "ResolutionFunction");
+ // s.assertVersion(0);
+ // // base class members
+ // Serialize::rwClass(s, "masks", m_maskItems);
+ // m_resolutionFunction.rwSelected(s, "ResolutionFunction");
-// // own members
-// m_phiAxis.rwAxisProperty(s, "phiAxis");
-// m_alphaAxis.rwAxisProperty(s, "alphaAxis");
+ // // own members
+ // m_phiAxis.rwAxisProperty(s, "phiAxis");
+ // m_alphaAxis.rwAxisProperty(s, "alphaAxis");
-// if (s.xmlReader())
-// m_resolutionFunction->setUnit(Unit::degree);
+ // if (s.xmlReader())
+ // m_resolutionFunction->setUnit(Unit::degree);
if (s.xmlReader())
readFrom(s.xmlReader());
else if (s.xmlWriter())
writeTo(s.xmlWriter());
}
-void SphericalDetectorItem::writeTo(QXmlStreamWriter *w) const
+void SphericalDetectorItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -88,7 +88,7 @@ void SphericalDetectorItem::writeTo(QXmlStreamWriter *w) const
w->writeEndElement();
}
-void SphericalDetectorItem::readFrom(QXmlStreamReader *r)
+void SphericalDetectorItem::readFrom(QXmlStreamReader* r)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
--
GitLab