Unnecessary helper removed from BeamAngleItems.

GUI/coregui/Models/BeamAngleItems.cpp

@@ -44,11 +44,10 @@ double BeamInclinationAngleItem::inclinationAngle() const
 
 std::unique_ptr<IDistribution1D> BeamInclinationAngleItem::createDistribution1D() const
 {
-    std::unique_ptr<IDistribution1D> P_distribution {};
-    if(DistributionItem *distributionItem = dynamic_cast<DistributionItem *>(getGroupItem(P_DISTRIBUTION))) {
-        P_distribution = BeamAngleHelper::creatAngleDistribution(distributionItem);
-    }
-    return P_distribution;
+    if(auto distItem = dynamic_cast<DistributionItem *>(getGroupItem(P_DISTRIBUTION)))
+        return distItem->createDistribution(Units::degree);
+
+    return {};
 }
 
 // -------------------------------------------------------------------------- //
@@ -77,55 +76,8 @@ double BeamAzimuthalAngleItem::azimuthalAngle() const
 
 std::unique_ptr<IDistribution1D> BeamAzimuthalAngleItem::createDistribution1D() const
 {
-    std::unique_ptr<IDistribution1D> P_distribution {};
-    if(DistributionItem *distributionItem = dynamic_cast<DistributionItem *>(getGroupItem(P_DISTRIBUTION))) {
-        P_distribution = BeamAngleHelper::creatAngleDistribution(distributionItem);
-    }
-    return P_distribution;
-}
-
-// -------------------------------------------------------------------------- //
-
-std::unique_ptr<IDistribution1D>
-BeamAngleHelper::creatAngleDistribution(DistributionItem *distributionItem)
-{
+    if(auto distItem = dynamic_cast<DistributionItem *>(getGroupItem(P_DISTRIBUTION)))
+        return distItem->createDistribution(Units::degree);
 
-    std::unique_ptr<IDistribution1D> P_distribution {};
-    if (distributionItem->modelType() == Constants::DistributionGateType) {
-        double min
-            = distributionItem->getItemValue(DistributionGateItem::P_MIN).toDouble();
-        double max
-            = distributionItem->getItemValue(DistributionGateItem::P_MAX).toDouble();
-        P_distribution = GUIHelpers::make_unique<DistributionGate>(
-                    Units::deg2rad(min), Units::deg2rad(max));
-    } else if (distributionItem->modelType() == Constants::DistributionLorentzType) {
-        double mean
-            = distributionItem->getItemValue(DistributionLorentzItem::P_MEAN).toDouble();
-        double hwhm
-            = distributionItem->getItemValue(DistributionLorentzItem::P_HWHM).toDouble();
-        P_distribution = GUIHelpers::make_unique<DistributionLorentz>(
-                    Units::deg2rad(mean), Units::deg2rad(hwhm));
-    } else if (distributionItem->modelType() == Constants::DistributionGaussianType) {
-        double mean
-            = distributionItem->getItemValue(DistributionGaussianItem::P_MEAN).toDouble();
-        double std_dev = distributionItem->getItemValue(
-                                               DistributionGaussianItem::P_STD_DEV).toDouble();
-        P_distribution = GUIHelpers::make_unique<DistributionGaussian>(
-                    Units::deg2rad(mean), Units::deg2rad(std_dev));
-    } else if (distributionItem->modelType() == Constants::DistributionLogNormalType) {
-        double median = distributionItem->getItemValue(DistributionLogNormalItem::P_MEDIAN)
-                            .toDouble();
-        double scale_par = distributionItem->getItemValue(
-                                                 DistributionLogNormalItem::P_SCALE_PAR).toDouble();
-        P_distribution = GUIHelpers::make_unique<DistributionLogNormal>(
-                    Units::deg2rad(median), scale_par);
-    } else if (distributionItem->modelType() == Constants::DistributionCosineType) {
-        double mean
-            = distributionItem->getItemValue(DistributionCosineItem::P_MEAN).toDouble();
-        double sigma
-            = distributionItem->getItemValue(DistributionCosineItem::P_SIGMA).toDouble();
-        P_distribution = GUIHelpers::make_unique<DistributionCosine>(
-                    Units::deg2rad(mean), Units::deg2rad(sigma));
-    }
-    return P_distribution;
+    return {};
 }

GUI/coregui/Models/BeamAngleItems.h

@@ -43,14 +43,4 @@ protected:
     virtual std::unique_ptr<IDistribution1D> createDistribution1D() const override;
 };
 
-// TODO Move to anonymous namespace
-
-class BA_CORE_API_ BeamAngleHelper
-{
-public:
-    static std::unique_ptr<IDistribution1D> creatAngleDistribution(
-            DistributionItem *distributionItem);
-};
-
-
 #endif // BEAMANGLEITEMS_H

GUI/coregui/Models/BeamDistributionItem.cpp

@@ -124,10 +124,8 @@ double BeamDistributionItem::meanValue() const
 
 std::unique_ptr<IDistribution1D> BeamDistributionItem::createDistribution1D() const
 {
-    std::unique_ptr<IDistribution1D> P_distribution {};
-    if(DistributionItem *distributionItem = dynamic_cast<DistributionItem *>(
-                getGroupItem(P_DISTRIBUTION))) {
-        P_distribution = distributionItem->createDistribution();
-    }
-    return P_distribution;
+    if(auto distItem = dynamic_cast<DistributionItem *>(getGroupItem(P_DISTRIBUTION)))
+        return distItem->createDistribution();
+
+    return {};
 }