diff --git a/GUI/Model/Beam/BeamDistributionItem.cpp b/GUI/Model/Beam/BeamDistributionItem.cpp index 90fdcace07309fceb8db6e4ab064d92ffe1bff0f..72b988ad79b11ae33293b851f1891a3a1d56d86e 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 80a46078b293a2994a811971d698cf358907b493..71ec4b9882c1cfc7b5c19a18431eaac7473bf0b3 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 e832ce15f1e852ddc79074e4057a6a5f94e47780..e18ce908e82b3565dc2d34ec3d593ac09f70940d 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); }