From d56d1e5f0b21ba0b9ffded9a0ade25a276b54175 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Wed, 24 Jul 2024 22:17:24 +0200
Subject: [PATCH] inline fct; connection to core distribs moved to
InstrumentItems
---
GUI/Model/Beam/BeamDistributionItem.cpp | 6 ------
GUI/Model/Beam/BeamDistributionItem.h | 2 --
GUI/Model/Sim/InstrumentItems.cpp | 5 +++--
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/GUI/Model/Beam/BeamDistributionItem.cpp b/GUI/Model/Beam/BeamDistributionItem.cpp
index 90fdcace073..72b988ad79b 100644
--- a/GUI/Model/Beam/BeamDistributionItem.cpp
+++ b/GUI/Model/Beam/BeamDistributionItem.cpp
@@ -14,7 +14,6 @@
#include "GUI/Model/Beam/BeamDistributionItem.h"
#include "GUI/Model/Beam/DistributionItems.h"
-#include "Param/Distrib/Distributions.h"
namespace {
namespace Tag {
@@ -66,8 +65,3 @@ double BeamDistributionItem::scaleFactor() const
{
return 1.0;
}
-
-std::unique_ptr<IDistribution1D> BeamDistributionItem::createDistribution1D() const
-{
- return distributionItem()->createDistribution(scaleFactor());
-}
diff --git a/GUI/Model/Beam/BeamDistributionItem.h b/GUI/Model/Beam/BeamDistributionItem.h
index 80a46078b29..71ec4b9882c 100644
--- a/GUI/Model/Beam/BeamDistributionItem.h
+++ b/GUI/Model/Beam/BeamDistributionItem.h
@@ -39,8 +39,6 @@ public:
DistributionItem* distributionItem() const { return m_distribution.certainItem(); }
PolyItem<DistributionCatalog>& distributionSelection() { return m_distribution; }
- virtual std::unique_ptr<IDistribution1D> createDistribution1D() const;
-
protected:
PolyItem<DistributionCatalog> m_distribution;
};
diff --git a/GUI/Model/Sim/InstrumentItems.cpp b/GUI/Model/Sim/InstrumentItems.cpp
index e832ce15f1e..e18ce908e82 100644
--- a/GUI/Model/Sim/InstrumentItems.cpp
+++ b/GUI/Model/Sim/InstrumentItems.cpp
@@ -76,8 +76,9 @@ const QString ZAxis("ZAxis");
void setBeamDistribution(ParameterDistribution::WhichParameter which,
const BeamDistributionItem* item, ISimulation* simulation)
{
- ASSERT(item->distributionItem());
- if (std::unique_ptr<IDistribution1D> d = item->createDistribution1D())
+ DistributionItem* di = item->distributionItem();
+ ASSERT(di);
+ if (std::unique_ptr<IDistribution1D> d = di->createDistribution(item->scaleFactor()))
simulation->addParameterDistribution(which, *d);
}
--
GitLab