From 8d7c1d810e02b9d0e410c3559505195b5a463c9f Mon Sep 17 00:00:00 2001
From: Tobias Knopff <t.knopff@fz-juelich.de>
Date: Fri, 21 May 2021 15:23:01 +0200
Subject: [PATCH] Make DistributionGaussianItem::P_STD_DEV private
---
GUI/Models/DistributionItems.cpp | 5 +++++
GUI/Models/DistributionItems.h | 4 +++-
GUI/Models/TransformFromDomain.cpp | 3 +--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/GUI/Models/DistributionItems.cpp b/GUI/Models/DistributionItems.cpp
index 6a44d9cebdd..d4d990762bc 100644
--- a/GUI/Models/DistributionItems.cpp
+++ b/GUI/Models/DistributionItems.cpp
@@ -317,6 +317,11 @@ double DistributionGaussianItem::deviation(double scale) const
return getItemValue(P_STD_DEV).toDouble() * scale;
}
+void DistributionGaussianItem::setStandardDeviation(const double std_dev)
+{
+ setItemValue(P_STD_DEV, std_dev);
+}
+
void DistributionGaussianItem::init_distribution(double value)
{
double sigma(0.1 * std::abs(value));
diff --git a/GUI/Models/DistributionItems.h b/GUI/Models/DistributionItems.h
index a4e432ca44c..4c0b4228933 100644
--- a/GUI/Models/DistributionItems.h
+++ b/GUI/Models/DistributionItems.h
@@ -119,9 +119,10 @@ public:
};
class BA_CORE_API_ DistributionGaussianItem : public SymmetricDistributionItem {
-public:
+private:
static const QString P_STD_DEV;
+public:
static const QString M_TYPE;
DistributionGaussianItem();
@@ -129,6 +130,7 @@ public:
std::unique_ptr<IDistribution1D> createDistribution(double scale = 1.0) const override;
std::unique_ptr<IRangedDistribution> createIRangedDistribution(double scale) const override;
double deviation(double scale) const override;
+ void setStandardDeviation(double std_dev);
void init_distribution(double value) override;
};
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 95df9d1b689..f88e4208832 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -766,8 +766,7 @@ void setDistribution(BeamDistributionItem* part_distr_item, ParameterDistributio
DistributionGaussianItem* distr_gauss_item =
part_distr_item->setDistributionGroupItem<DistributionGaussianItem>();
distr_gauss_item->setMeanValue(factor * distr->getMean());
- distr_gauss_item->setItemValue(DistributionGaussianItem::P_STD_DEV,
- factor * distr->getStdDev());
+ distr_gauss_item->setStandardDeviation(factor * distr->getStdDev());
item = distr_gauss_item;
} else if (const DistributionLogNormal* distr =
dynamic_cast<const DistributionLogNormal*>(p_distribution)) {
--
GitLab