From a57d170a86e4c6d17fa2969ff6d14fabc01064a2 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 8 Jul 2024 19:48:15 +0200
Subject: [PATCH] use setter of DoubleProperty
---
GUI/Model/Beam/BeamAngleItems.cpp | 8 +++---
GUI/Model/Beam/BeamDistributionItem.cpp | 2 +-
GUI/Model/Beam/BeamWavelengthItem.cpp | 4 +--
GUI/Model/Beam/DistributionItems.cpp | 31 ++++++++++--------------
GUI/Model/Beam/DistributionItems.h | 15 ------------
GUI/Model/Beam/GrazingScanItem.cpp | 4 +--
GUI/Model/FromCore/ItemizeSimulation.cpp | 26 ++++++++++----------
GUI/View/Device/DistributionSelector.cpp | 4 +--
8 files changed, 37 insertions(+), 57 deletions(-)
diff --git a/GUI/Model/Beam/BeamAngleItems.cpp b/GUI/Model/Beam/BeamAngleItems.cpp
index 1bf13d2d0a7..e225e11edfe 100644
--- a/GUI/Model/Beam/BeamAngleItems.cpp
+++ b/GUI/Model/Beam/BeamAngleItems.cpp
@@ -38,8 +38,8 @@ void BeamAzimuthalAngleItem::initDistribution(DistributionItem* newDistribution,
meanVal = cd->mean().dVal();
if (auto* nd = dynamic_cast<SymmetricResolutionItem*>(newDistribution)) {
- nd->setMean(meanVal);
- nd->setMeanDecimals(3);
+ nd->mean().setDVal(meanVal);
+ nd->mean().setDecimals(3);
}
newDistribution->initDistribution(meanVal);
@@ -87,8 +87,8 @@ void BeamInclinationAngleItem::initDistribution(DistributionItem* newDistributio
meanVal = cd->mean().dVal();
if (auto* nd = dynamic_cast<SymmetricResolutionItem*>(newDistribution)) {
- nd->setMean(meanVal);
- nd->setMeanDecimals(3);
+ nd->mean().setDVal(meanVal);
+ nd->mean().setDecimals(3);
}
newDistribution->initDistribution(meanVal);
diff --git a/GUI/Model/Beam/BeamDistributionItem.cpp b/GUI/Model/Beam/BeamDistributionItem.cpp
index 343e7b7bea3..46749414c76 100644
--- a/GUI/Model/Beam/BeamDistributionItem.cpp
+++ b/GUI/Model/Beam/BeamDistributionItem.cpp
@@ -66,7 +66,7 @@ double BeamDistributionItem::meanValue() const
void BeamDistributionItem::resetToValue(double value)
{
auto* d = new DistributionNoneItem();
- d->setMean(value);
+ d->mean().setDVal(value);
m_distribution.setCertainItem(d);
}
diff --git a/GUI/Model/Beam/BeamWavelengthItem.cpp b/GUI/Model/Beam/BeamWavelengthItem.cpp
index c1367d5180d..edca8591bd7 100644
--- a/GUI/Model/Beam/BeamWavelengthItem.cpp
+++ b/GUI/Model/Beam/BeamWavelengthItem.cpp
@@ -29,8 +29,8 @@ void initDistribution(DistributionItem* newDistribution,
meanVal = cd->mean().dVal();
if (auto* nd = dynamic_cast<SymmetricResolutionItem*>(newDistribution)) {
- nd->setMean(meanVal);
- nd->setMeanDecimals(4);
+ nd->mean().setDVal(meanVal);
+ nd->mean().setDecimals(4);
nd->mean().setLimits(RealLimits::positive());
}
diff --git a/GUI/Model/Beam/DistributionItems.cpp b/GUI/Model/Beam/DistributionItems.cpp
index 05a5fed1349..efabd9def58 100644
--- a/GUI/Model/Beam/DistributionItems.cpp
+++ b/GUI/Model/Beam/DistributionItems.cpp
@@ -90,11 +90,6 @@ SymmetricResolutionItem::SymmetricResolutionItem(double mean, int decimals,
m_mean.init(meanLabel, "", mean, decimals, RealLimits::limitless(), "mean");
}
-void SymmetricResolutionItem::setMeanDecimals(uint d)
-{
- m_mean.setDecimals(d);
-}
-
void SymmetricResolutionItem::writeTo(QXmlStreamWriter* w) const
{
XML::writeAttribute(w, XML::Attrib::version, uint(1));
@@ -152,7 +147,7 @@ double DistributionNoneItem::deviation(double) const
void DistributionNoneItem::initDistribution(double value)
{
- setMean(value);
+ mean().setDVal(value);
}
DoubleProperties DistributionNoneItem::distributionValues(bool withMean)
@@ -267,8 +262,8 @@ void DistributionLorentzItem::initDistribution(double value)
if (hw == 0.0)
hw = 0.1;
- setMean(value);
- setHwhm(hw);
+ mean().setDVal(value);
+ hwhm().setDVal(hw);
}
void DistributionLorentzItem::writeTo(QXmlStreamWriter* w) const
@@ -341,8 +336,8 @@ void DistributionGaussianItem::initDistribution(double value)
if (stddev == 0.0)
stddev = 0.1;
- setMean(value);
- setStandardDeviation(stddev);
+ mean().setDVal(value);
+ standardDeviation().setDVal(stddev);
}
void DistributionGaussianItem::writeTo(QXmlStreamWriter* w) const
@@ -410,8 +405,8 @@ void DistributionLogNormalItem::initDistribution(double value)
if (scale == 0.0)
scale = 0.1;
- setMedian(value);
- setScaleParameter(scale);
+ median().setDVal(value);
+ scaleParameter().setDVal(scale);
}
void DistributionLogNormalItem::writeTo(QXmlStreamWriter* w) const
@@ -492,8 +487,8 @@ void DistributionCosineItem::initDistribution(double value)
if (sigma == 0.0)
sigma = 0.1;
- setMean(value);
- setHwhm(sigma);
+ mean().setDVal(value);
+ hwhm().setDVal(sigma);
}
void DistributionCosineItem::writeTo(QXmlStreamWriter* w) const
@@ -561,10 +556,10 @@ void DistributionTrapezoidItem::initDistribution(double value)
double width(0.1 * std::abs(value));
if (width == 0.0)
width = 0.1;
- setCenter(value);
- setLeftWidth(width);
- setMiddleWidth(width);
- setRightWidth(width);
+ center().setDVal(value);
+ leftWidth().setDVal(width);
+ middleWidth().setDVal(width);
+ rightWidth().setDVal(width);
}
void DistributionTrapezoidItem::writeTo(QXmlStreamWriter* w) const
diff --git a/GUI/Model/Beam/DistributionItems.h b/GUI/Model/Beam/DistributionItems.h
index 85cc5e004f6..e3c06004534 100644
--- a/GUI/Model/Beam/DistributionItems.h
+++ b/GUI/Model/Beam/DistributionItems.h
@@ -37,7 +37,6 @@ public:
DoubleProperty& relSamplingWidth() { return m_rel_sampling_width; }
const DoubleProperty& relSamplingWidth() const { return m_rel_sampling_width; }
- void setRelSamplingWidth(double v) { m_rel_sampling_width.setDVal(v); }
//! Serialization of contents.
//!
@@ -60,9 +59,6 @@ public:
DoubleProperty& mean() { return m_mean; }
const DoubleProperty& mean() const { return m_mean; }
- void setMean(double v) { m_mean.setDVal(v); }
-
- void setMeanDecimals(uint d);
void writeTo(QXmlStreamWriter* w) const override;
void readFrom(QXmlStreamReader* r) override;
@@ -93,11 +89,9 @@ public:
DoubleProperty& minimum() { return m_minimum; }
const DoubleProperty& minimum() const { return m_minimum; }
- void setMinimum(double v) { m_minimum.setDVal(v); }
DoubleProperty& maximum() { return m_maximum; }
const DoubleProperty& maximum() const { return m_maximum; }
- void setMaximum(double v) { m_maximum.setDVal(v); }
void setRange(double min, double max);
@@ -120,7 +114,6 @@ public:
DoubleProperty& hwhm() { return m_hwhm; }
const DoubleProperty& hwhm() const { return m_hwhm; }
- void setHwhm(double v) { m_hwhm.setDVal(v); }
void initDistribution(double value) override;
@@ -142,7 +135,6 @@ public:
DoubleProperty& standardDeviation() { return m_standard_deviation; }
const DoubleProperty& standardDeviation() const { return m_standard_deviation; }
- void setStandardDeviation(double v) { m_standard_deviation.setDVal(v); }
void initDistribution(double value) override;
@@ -164,11 +156,9 @@ public:
DoubleProperty& median() { return m_median; }
const DoubleProperty& median() const { return m_median; }
- void setMedian(double v) { m_median.setDVal(v); }
DoubleProperty& scaleParameter() { return m_scale_parameter; }
const DoubleProperty& scaleParameter() const { return m_scale_parameter; }
- void setScaleParameter(double v) { m_scale_parameter.setDVal(v); }
void writeTo(QXmlStreamWriter* w) const override;
void readFrom(QXmlStreamReader* r) override;
@@ -190,7 +180,6 @@ public:
DoubleProperty& hwhm() { return m_hwhm; }
const DoubleProperty& hwhm() const { return m_hwhm; }
- void setHwhm(double v) { m_hwhm.setDVal(v); }
void writeTo(QXmlStreamWriter* w) const override;
void readFrom(QXmlStreamReader* r) override;
@@ -210,19 +199,15 @@ public:
DoubleProperty& center() { return m_center; }
const DoubleProperty& center() const { return m_center; }
- void setCenter(double v) { m_center.setDVal(v); }
DoubleProperty& leftWidth() { return m_left_width; }
const DoubleProperty& leftWidth() const { return m_left_width; }
- void setLeftWidth(double v) { m_left_width.setDVal(v); }
DoubleProperty& middleWidth() { return m_middle_width; }
const DoubleProperty& middleWidth() const { return m_middle_width; }
- void setMiddleWidth(double v) { m_middle_width.setDVal(v); }
DoubleProperty& rightWidth() { return m_right_width; }
const DoubleProperty& rightWidth() const { return m_right_width; }
- void setRightWidth(double v) { m_right_width.setDVal(v); }
void writeTo(QXmlStreamWriter* w) const override;
void readFrom(QXmlStreamReader* r) override;
diff --git a/GUI/Model/Beam/GrazingScanItem.cpp b/GUI/Model/Beam/GrazingScanItem.cpp
index 15b6b781fc0..ca516ce63f5 100644
--- a/GUI/Model/Beam/GrazingScanItem.cpp
+++ b/GUI/Model/Beam/GrazingScanItem.cpp
@@ -53,8 +53,8 @@ void initDistribution(DistributionItem* newDistribution,
meanVal = cd->mean().dVal();
if (auto* nd = dynamic_cast<SymmetricResolutionItem*>(newDistribution)) {
- nd->setMean(meanVal);
- nd->setMeanDecimals(3);
+ nd->mean().setDVal(meanVal);
+ nd->mean().setDecimals(3);
}
newDistribution->initDistribution(meanVal);
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 1cb34a127a1..13ed1f8ba8e 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -137,26 +137,26 @@ void setDistributionTypeAndPars(BeamDistributionItem* pdi, const IDistribution1D
item->setRange(factor * dd->min(), factor * dd->max());
} else if (const auto* dd = dynamic_cast<const DistributionLorentz*>(d)) {
auto* item = pdi->setDistributionItemType<DistributionLorentzItem>();
- item->setMean(factor * dd->mean());
- item->setHwhm(factor * dd->hwhm());
+ item->mean().setDVal(factor * dd->mean());
+ item->hwhm().setDVal(factor * dd->hwhm());
} else if (const auto* dd = dynamic_cast<const DistributionGaussian*>(d)) {
auto* item = pdi->setDistributionItemType<DistributionGaussianItem>();
- item->setMean(factor * dd->mean());
- item->setStandardDeviation(factor * dd->getStdDev());
+ item->mean().setDVal(factor * dd->mean());
+ item->standardDeviation().setDVal(factor * dd->getStdDev());
} else if (const auto* dd = dynamic_cast<const DistributionLogNormal*>(d)) {
auto* item = pdi->setDistributionItemType<DistributionLogNormalItem>();
- item->setMedian(factor * dd->getMedian());
- item->setScaleParameter(dd->getScalePar());
+ item->median().setDVal(factor * dd->getMedian());
+ item->scaleParameter().setDVal(dd->getScalePar());
} else if (const auto* dd = dynamic_cast<const DistributionCosine*>(d)) {
auto* item = pdi->setDistributionItemType<DistributionCosineItem>();
- item->setMean(factor * dd->mean());
- item->setHwhm(factor * dd->hwhm());
+ item->mean().setDVal(factor * dd->mean());
+ item->hwhm().setDVal(factor * dd->hwhm());
} else if (const auto* dd = dynamic_cast<const DistributionTrapezoid*>(d)) {
auto* item = pdi->setDistributionItemType<DistributionTrapezoidItem>();
item->center().setDVal(factor * dd->mean());
- item->setLeftWidth(factor * dd->getLeftWidth());
- item->setMiddleWidth(factor * dd->getMiddleWidth());
- item->setRightWidth(factor * dd->getRightWidth());
+ item->leftWidth().setDVal(factor * dd->getLeftWidth());
+ item->middleWidth().setDVal(factor * dd->getMiddleWidth());
+ item->rightWidth().setDVal(factor * dd->getRightWidth());
} else
ASSERT_NEVER;
}
@@ -168,7 +168,7 @@ void setDistribution(BeamDistributionItem* pdi, ParameterDistribution par_distr)
DistributionItem* distItem = pdi->distributionItem();
distItem->setNumberOfSamples((int)par_distr.nDraws());
- distItem->setRelSamplingWidth(par_distr.relSamplingWidth());
+ distItem->relSamplingWidth().setDVal(par_distr.relSamplingWidth());
}
void addDistributionToItem(BeamDistributionItem* pdi, const IDistribution1D* distribution)
@@ -180,7 +180,7 @@ void addDistributionToItem(BeamDistributionItem* pdi, const IDistribution1D* dis
DistributionItem* distItem = pdi->distributionItem();
distItem->setNumberOfSamples((int)distribution->nSamples());
- distItem->setRelSamplingWidth(distribution->relSamplingWidth());
+ distItem->relSamplingWidth().setDVal(distribution->relSamplingWidth());
}
void setGISASBeamItem(BeamItem* beam_item, const ScatteringSimulation& simulation)
diff --git a/GUI/View/Device/DistributionSelector.cpp b/GUI/View/Device/DistributionSelector.cpp
index 3ac8b260ceb..29f708691d5 100644
--- a/GUI/View/Device/DistributionSelector.cpp
+++ b/GUI/View/Device/DistributionSelector.cpp
@@ -60,13 +60,13 @@ void DistributionSelector::createDistributionWidgets()
auto* maxSpinBox = createSpinBox(it->maximum());
connect(minSpinBox, &DSpinBox::valueChanged, [it, maxSpinBox](double d) {
if (d > it->maximum().dVal()) {
- it->setMaximum(d);
+ it->maximum().setDVal(d);
maxSpinBox->updateValue();
}
});
connect(maxSpinBox, &DSpinBox::valueChanged, [it, minSpinBox](double d) {
if (d < it->minimum().dVal()) {
- it->setMinimum(d);
+ it->minimum().setDVal(d);
minSpinBox->updateValue();
}
});
--
GitLab