From 0c9c890fd65637734c2ba21053e7195d7a7f9f36 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Wed, 10 Jul 2024 17:02:37 +0200
Subject: [PATCH] writeTo1 <- writeTo2
---
GUI/Model/Beam/DistributionItems.cpp | 52 +++++++------------------
GUI/Model/Beam/SourceItems.cpp | 4 +-
GUI/Model/Descriptor/AxisProperty.cpp | 8 +---
GUI/Model/Mask/MaskItems.cpp | 40 +++++--------------
GUI/Model/Material/MaterialItem.cpp | 16 ++------
GUI/Model/Sample/InterferenceItems.cpp | 48 ++++++-----------------
GUI/Model/Sample/ItemWithParticles.cpp | 4 +-
GUI/Model/Sample/Lattice2DItems.cpp | 8 +---
GUI/Model/Sample/LayerItem.cpp | 4 +-
GUI/Model/Sample/ParticleLayoutItem.cpp | 4 +-
GUI/Model/Sample/ProfileItems.cpp | 8 +---
GUI/Model/Sample/SampleItem.cpp | 4 +-
GUI/Model/Sim/BackgroundItems.cpp | 4 +-
13 files changed, 51 insertions(+), 153 deletions(-)
diff --git a/GUI/Model/Beam/DistributionItems.cpp b/GUI/Model/Beam/DistributionItems.cpp
index 4a896ecaa5a..886d6bb759e 100644
--- a/GUI/Model/Beam/DistributionItems.cpp
+++ b/GUI/Model/Beam/DistributionItems.cpp
@@ -54,9 +54,7 @@ void DistributionItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// relative sampling width
- w->writeStartElement(Tag::RelSamplingWidth);
- m_rel_sampling_width.writeTo1(w);
- w->writeEndElement();
+ m_rel_sampling_width.writeTo2(w, Tag::RelSamplingWidth);
}
void DistributionItem::readFrom(QXmlStreamReader* r)
@@ -100,9 +98,7 @@ void SymmetricResolutionItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// mean
- w->writeStartElement(Tag::Mean);
- m_mean.writeTo1(w);
- w->writeEndElement();
+ m_mean.writeTo2(w, Tag::Mean);
}
void SymmetricResolutionItem::readFrom(QXmlStreamReader* r)
@@ -194,14 +190,10 @@ void DistributionGateItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// minimum
- w->writeStartElement(Tag::Minimum);
- m_minimum.writeTo1(w);
- w->writeEndElement();
+ m_minimum.writeTo2(w, Tag::Minimum);
// maximum
- w->writeStartElement(Tag::Maximum);
- m_maximum.writeTo1(w);
- w->writeEndElement();
+ m_maximum.writeTo2(w, Tag::Maximum);
}
void DistributionGateItem::readFrom(QXmlStreamReader* r)
@@ -276,9 +268,7 @@ void DistributionLorentzItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// half width at half maximum
- w->writeStartElement(Tag::HWHM);
- m_hwhm.writeTo1(w);
- w->writeEndElement();
+ m_hwhm.writeTo2(w, Tag::HWHM);
}
void DistributionLorentzItem::readFrom(QXmlStreamReader* r)
@@ -350,9 +340,7 @@ void DistributionGaussianItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// standard deviation
- w->writeStartElement(Tag::StandardDeviation);
- m_standard_deviation.writeTo1(w);
- w->writeEndElement();
+ m_standard_deviation.writeTo2(w, Tag::StandardDeviation);
}
void DistributionGaussianItem::readFrom(QXmlStreamReader* r)
@@ -419,14 +407,10 @@ void DistributionLogNormalItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// median
- w->writeStartElement(Tag::Median);
- m_median.writeTo1(w);
- w->writeEndElement();
+ m_median.writeTo2(w, Tag::Median);
// scale parameter
- w->writeStartElement(Tag::ScaleParameter);
- m_scale_parameter.writeTo1(w);
- w->writeEndElement();
+ m_scale_parameter.writeTo2(w, Tag::ScaleParameter);
}
void DistributionLogNormalItem::readFrom(QXmlStreamReader* r)
@@ -501,9 +485,7 @@ void DistributionCosineItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// sigma
- w->writeStartElement(Tag::Sigma);
- m_hwhm.writeTo1(w);
- w->writeEndElement();
+ m_hwhm.writeTo2(w, Tag::Sigma);
}
void DistributionCosineItem::readFrom(QXmlStreamReader* r)
@@ -572,24 +554,16 @@ void DistributionTrapezoidItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// center
- w->writeStartElement(Tag::Center);
- m_center.writeTo1(w);
- w->writeEndElement();
+ m_center.writeTo2(w, Tag::Center);
// left width
- w->writeStartElement(Tag::LeftWidth);
- m_left_width.writeTo1(w);
- w->writeEndElement();
+ m_left_width.writeTo2(w, Tag::LeftWidth);
// middle width
- w->writeStartElement(Tag::MiddleWidth);
- m_middle_width.writeTo1(w);
- w->writeEndElement();
+ m_middle_width.writeTo2(w, Tag::MiddleWidth);
// right width
- w->writeStartElement(Tag::RightWidth);
- m_right_width.writeTo1(w);
- w->writeEndElement();
+ m_right_width.writeTo2(w, Tag::RightWidth);
}
void DistributionTrapezoidItem::readFrom(QXmlStreamReader* r)
diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp
index 8ec37fbd7fa..20a9b4f8142 100644
--- a/GUI/Model/Beam/SourceItems.cpp
+++ b/GUI/Model/Beam/SourceItems.cpp
@@ -64,9 +64,7 @@ void SourceItem::writeTo(QXmlStreamWriter* w) const
XML::writeAttribute(w, XML::Attrib::version, uint(2));
// intensity
- w->writeStartElement(Tag::Intensity);
- m_intensity.writeTo1(w);
- w->writeEndElement();
+ m_intensity.writeTo2(w, Tag::Intensity);
// wavelength
w->writeStartElement(Tag::Wavelength);
diff --git a/GUI/Model/Descriptor/AxisProperty.cpp b/GUI/Model/Descriptor/AxisProperty.cpp
index f8c6b0a58ea..fb439483177 100644
--- a/GUI/Model/Descriptor/AxisProperty.cpp
+++ b/GUI/Model/Descriptor/AxisProperty.cpp
@@ -59,14 +59,10 @@ void AxisProperty::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// min
- w->writeStartElement(Tag::Min);
- m_min.writeTo1(w);
- w->writeEndElement();
+ m_min.writeTo2(w, Tag::Min);
// max
- w->writeStartElement(Tag::Max);
- m_max.writeTo1(w);
- w->writeEndElement();
+ m_max.writeTo2(w, Tag::Max);
}
void AxisProperty::readFrom(QXmlStreamReader* r)
diff --git a/GUI/Model/Mask/MaskItems.cpp b/GUI/Model/Mask/MaskItems.cpp
index fc4c1e09e97..c13bca75c56 100644
--- a/GUI/Model/Mask/MaskItems.cpp
+++ b/GUI/Model/Mask/MaskItems.cpp
@@ -155,24 +155,16 @@ void RectangleItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// x low
- w->writeStartElement(Tag::XLow);
- m_x_low.writeTo1(w);
- w->writeEndElement();
+ m_x_low.writeTo2(w, Tag::XLow);
// y low
- w->writeStartElement(Tag::YLow);
- m_y_low.writeTo1(w);
- w->writeEndElement();
+ m_y_low.writeTo2(w, Tag::YLow);
// x up
- w->writeStartElement(Tag::XHig);
- m_x_up.writeTo1(w);
- w->writeEndElement();
+ m_x_up.writeTo2(w, Tag::XHig);
// y up
- w->writeStartElement(Tag::YHig);
- m_y_up.writeTo1(w);
- w->writeEndElement();
+ m_y_up.writeTo2(w, Tag::YHig);
}
void RectangleItem::readFrom(QXmlStreamReader* r)
@@ -337,9 +329,7 @@ void LineItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// position
- w->writeStartElement(Tag::Position);
- m_pos.writeTo1(w);
- w->writeEndElement();
+ m_pos.writeTo2(w, Tag::Position);
}
void LineItem::readFrom(QXmlStreamReader* r)
@@ -445,29 +435,19 @@ void EllipseItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// x center
- w->writeStartElement(Tag::XCenter);
- m_x_center.writeTo1(w);
- w->writeEndElement();
+ m_x_center.writeTo2(w, Tag::XCenter);
// y center
- w->writeStartElement(Tag::YCenter);
- m_y_center.writeTo1(w);
- w->writeEndElement();
+ m_y_center.writeTo2(w, Tag::YCenter);
// x radius
- w->writeStartElement(Tag::XRadius);
- m_x_radius.writeTo1(w);
- w->writeEndElement();
+ m_x_radius.writeTo2(w, Tag::XRadius);
// y radius
- w->writeStartElement(Tag::YRadius);
- m_y_radius.writeTo1(w);
- w->writeEndElement();
+ m_y_radius.writeTo2(w, Tag::YRadius);
// rotation angle
- w->writeStartElement(Tag::Angle);
- m_angle.writeTo1(w);
- w->writeEndElement();
+ m_angle.writeTo2(w, Tag::Angle);
}
void EllipseItem::readFrom(QXmlStreamReader* r)
diff --git a/GUI/Model/Material/MaterialItem.cpp b/GUI/Model/Material/MaterialItem.cpp
index 76ab02cbd8c..87f3a70fb3b 100644
--- a/GUI/Model/Material/MaterialItem.cpp
+++ b/GUI/Model/Material/MaterialItem.cpp
@@ -162,24 +162,16 @@ void MaterialItem::writeTo(QXmlStreamWriter* w) const
if (m_use_refractive_index) {
// delta
- w->writeStartElement(Tag::Delta);
- m_delta.writeTo1(w);
- w->writeEndElement();
+ m_delta.writeTo2(w, Tag::Delta);
// beta
- w->writeStartElement(Tag::Beta);
- m_beta.writeTo1(w);
- w->writeEndElement();
+ m_beta.writeTo2(w, Tag::Beta);
} else {
// sld real
- w->writeStartElement(Tag::SldRe);
- m_sld_re.writeTo1(w);
- w->writeEndElement();
+ m_sld_re.writeTo2(w, Tag::SldRe);
// sld imaginary
- w->writeStartElement(Tag::SldIm);
- m_sld_im.writeTo1(w);
- w->writeEndElement();
+ m_sld_im.writeTo2(w, Tag::SldIm);
}
}
diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp
index 7b4cc0971bc..d8e23dedad5 100644
--- a/GUI/Model/Sample/InterferenceItems.cpp
+++ b/GUI/Model/Sample/InterferenceItems.cpp
@@ -52,9 +52,7 @@ void InterferenceItem::writeTo(QXmlStreamWriter* w) const
XML::writeAttribute(w, XML::Attrib::version, uint(1));
// position variance
- w->writeStartElement(Tag::PositionVariance);
- m_position_variance.writeTo1(w);
- w->writeEndElement();
+ m_position_variance.writeTo2(w, Tag::PositionVariance);
}
void InterferenceItem::readFrom(QXmlStreamReader* r)
@@ -108,14 +106,10 @@ void Interference1DLatticeItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// length
- w->writeStartElement(Tag::Length);
- m_length.writeTo1(w);
- w->writeEndElement();
+ m_length.writeTo2(w, Tag::Length);
// rotation angle
- w->writeStartElement(Tag::RotationAngle);
- m_rotation_angle.writeTo1(w);
- w->writeEndElement();
+ m_rotation_angle.writeTo2(w, Tag::RotationAngle);
// decay function
w->writeStartElement(Tag::DecayFunction);
@@ -318,19 +312,13 @@ void Interference2DParacrystalItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// damping length
- w->writeStartElement(Tag::DampingLength);
- m_damping_length.writeTo1(w);
- w->writeEndElement();
+ m_damping_length.writeTo2(w, Tag::DampingLength);
// domain size 1
- w->writeStartElement(Tag::DomainSize1);
- m_domain_size1.writeTo1(w);
- w->writeEndElement();
+ m_domain_size1.writeTo2(w, Tag::DomainSize1);
// domain size 2
- w->writeStartElement(Tag::DomainSize2);
- m_domain_size2.writeTo1(w);
- w->writeEndElement();
+ m_domain_size2.writeTo2(w, Tag::DomainSize2);
// pdf 1
w->writeStartElement(Tag::PDF1);
@@ -479,14 +467,10 @@ void InterferenceHardDiskItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// radius
- w->writeStartElement(Tag::Radius);
- m_radius.writeTo1(w);
- w->writeEndElement();
+ m_radius.writeTo2(w, Tag::Radius);
// density
- w->writeStartElement(Tag::Density);
- m_density.writeTo1(w);
- w->writeEndElement();
+ m_density.writeTo2(w, Tag::Density);
}
void InterferenceHardDiskItem::readFrom(QXmlStreamReader* r)
@@ -557,24 +541,16 @@ void InterferenceRadialParacrystalItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// peak distance
- w->writeStartElement(Tag::PeakDistance);
- m_peak_distance.writeTo1(w);
- w->writeEndElement();
+ m_peak_distance.writeTo2(w, Tag::PeakDistance);
// damping length
- w->writeStartElement(Tag::DampingLength);
- m_damping_length.writeTo1(w);
- w->writeEndElement();
+ m_damping_length.writeTo2(w, Tag::DampingLength);
// domain size
- w->writeStartElement(Tag::DomainSize);
- m_domain_size.writeTo1(w);
- w->writeEndElement();
+ m_domain_size.writeTo2(w, Tag::DomainSize);
// kappa
- w->writeStartElement(Tag::Kappa);
- m_kappa.writeTo1(w);
- w->writeEndElement();
+ m_kappa.writeTo2(w, Tag::Kappa);
// pdf
w->writeStartElement(Tag::PDF);
diff --git a/GUI/Model/Sample/ItemWithParticles.cpp b/GUI/Model/Sample/ItemWithParticles.cpp
index b958d45f762..d1d36cdb24a 100644
--- a/GUI/Model/Sample/ItemWithParticles.cpp
+++ b/GUI/Model/Sample/ItemWithParticles.cpp
@@ -48,9 +48,7 @@ void ItemWithParticles::writeTo(QXmlStreamWriter* w) const
XML::writeAttribute(w, XML::Attrib::version, uint(1));
// abundance
- w->writeStartElement(Tag::Abundance);
- m_abundance.writeTo1(w);
- w->writeEndElement();
+ m_abundance.writeTo2(w, Tag::Abundance);
// position
w->writeStartElement(Tag::Position);
diff --git a/GUI/Model/Sample/Lattice2DItems.cpp b/GUI/Model/Sample/Lattice2DItems.cpp
index 4c74eb9b893..fdf4631d3e9 100644
--- a/GUI/Model/Sample/Lattice2DItems.cpp
+++ b/GUI/Model/Sample/Lattice2DItems.cpp
@@ -142,9 +142,7 @@ void SquareLattice2DItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// length
- w->writeStartElement(Tag::Length);
- m_length.writeTo1(w);
- w->writeEndElement();
+ m_length.writeTo2(w, Tag::Length);
}
void SquareLattice2DItem::readFrom(QXmlStreamReader* r)
@@ -193,9 +191,7 @@ void HexagonalLattice2DItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// length
- w->writeStartElement(Tag::Length);
- m_length.writeTo1(w);
- w->writeEndElement();
+ m_length.writeTo2(w, Tag::Length);
}
void HexagonalLattice2DItem::readFrom(QXmlStreamReader* r)
diff --git a/GUI/Model/Sample/LayerItem.cpp b/GUI/Model/Sample/LayerItem.cpp
index 1a44450e96c..0fe3c63480d 100644
--- a/GUI/Model/Sample/LayerItem.cpp
+++ b/GUI/Model/Sample/LayerItem.cpp
@@ -138,9 +138,7 @@ void LayerItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// thickness
- w->writeStartElement(Tag::Thickness);
- m_thickness.writeTo1(w);
- w->writeEndElement();
+ m_thickness.writeTo2(w, Tag::Thickness);
// roughness
w->writeStartElement(Tag::Roughness);
diff --git a/GUI/Model/Sample/ParticleLayoutItem.cpp b/GUI/Model/Sample/ParticleLayoutItem.cpp
index c368951806a..d1e543590df 100644
--- a/GUI/Model/Sample/ParticleLayoutItem.cpp
+++ b/GUI/Model/Sample/ParticleLayoutItem.cpp
@@ -106,9 +106,7 @@ void ParticleLayoutItem::writeTo(QXmlStreamWriter* w) const
XML::writeAttribute(w, XML::Attrib::version, uint(1));
// own density
- w->writeStartElement(Tag::OwnDensity);
- m_own_density.writeTo1(w);
- w->writeEndElement();
+ m_own_density.writeTo2(w, Tag::OwnDensity);
// interference function
w->writeStartElement(Tag::InterferenceFunction);
diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp
index 507a14b26dd..49202d79f57 100644
--- a/GUI/Model/Sample/ProfileItems.cpp
+++ b/GUI/Model/Sample/ProfileItems.cpp
@@ -118,9 +118,7 @@ void Profile1DVoigtItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// eta
- w->writeStartElement(Tag::Eta);
- m_eta.writeTo1(w);
- w->writeEndElement();
+ m_eta.writeTo2(w, Tag::Eta);
}
void Profile1DVoigtItem::readFrom(QXmlStreamReader* r)
@@ -252,9 +250,7 @@ void Profile2DVoigtItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// eta
- w->writeStartElement(Tag::Eta);
- m_eta.writeTo1(w);
- w->writeEndElement();
+ m_eta.writeTo2(w, Tag::Eta);
}
void Profile2DVoigtItem::readFrom(QXmlStreamReader* r)
diff --git a/GUI/Model/Sample/SampleItem.cpp b/GUI/Model/Sample/SampleItem.cpp
index 2d289455d64..b302f08941c 100644
--- a/GUI/Model/Sample/SampleItem.cpp
+++ b/GUI/Model/Sample/SampleItem.cpp
@@ -139,9 +139,7 @@ void SampleItem::writeTo(QXmlStreamWriter* w) const
w->writeEndElement();
// cross-correlation length
- w->writeStartElement(Tag::CrossCorrelationLength);
- m_cross_correlation_length.writeTo1(w);
- w->writeEndElement();
+ m_cross_correlation_length.writeTo2(w, Tag::CrossCorrelationLength);
// exernal field
w->writeStartElement(Tag::ExternalField);
diff --git a/GUI/Model/Sim/BackgroundItems.cpp b/GUI/Model/Sim/BackgroundItems.cpp
index 02b052eaac6..7bceffa6026 100644
--- a/GUI/Model/Sim/BackgroundItems.cpp
+++ b/GUI/Model/Sim/BackgroundItems.cpp
@@ -41,9 +41,7 @@ void ConstantBackgroundItem::writeTo(QXmlStreamWriter* w) const
XML::writeAttribute(w, XML::Attrib::version, uint(1));
// background value
- w->writeStartElement(Tag::BackgroundValue);
- m_background_value.writeTo1(w);
- w->writeEndElement();
+ m_background_value.writeTo2(w, Tag::BackgroundValue);
}
void ConstantBackgroundItem::readFrom(QXmlStreamReader* r)
--
GitLab