Minimal cleanup in BeamItems, default limits for BeamWavelength changed.

GUI/coregui/Models/BeamAngleItems.h

@@ -22,8 +22,7 @@
 class BA_CORE_API_ BeamAzimuthalAngleItem : public BeamDistributionItem
 {
 public:
-    explicit BeamAzimuthalAngleItem();
-    virtual ~BeamAzimuthalAngleItem(){}
+    BeamAzimuthalAngleItem();
 
     double azimuthalAngle() const;
 
@@ -34,8 +33,7 @@ protected:
 class BA_CORE_API_ BeamInclinationAngleItem : public BeamDistributionItem
 {
 public:
-    explicit BeamInclinationAngleItem();
-    virtual ~BeamInclinationAngleItem(){}
+    BeamInclinationAngleItem();
 
     double inclinationAngle() const;
 

GUI/coregui/Models/BeamDistributionItem.cpp

@@ -24,7 +24,7 @@
 
 const QString BeamDistributionItem::P_DISTRIBUTION = "Distribution";
 
-BeamDistributionItem::BeamDistributionItem(const QString name)
+BeamDistributionItem::BeamDistributionItem(const QString& name)
     : SessionItem(name)
 {
     addGroupProperty(P_DISTRIBUTION, Constants::DistributionExtendedGroup);
@@ -35,15 +35,8 @@ BeamDistributionItem::BeamDistributionItem(const QString name)
     mapper()->setOnChildPropertyChange(
                 [this](SessionItem* item, const QString &)
     {
-        if(item->modelType() == Constants::GroupItemType) {
+        if(item->modelType() == Constants::GroupItemType)
             initDistributionItem();
-        }
-//        if (item->modelType() == Constants::IntensityDataType
-//            && name == IntensityDataItem::P_AXES_UNITS) {
-//            auto intensityItem = dynamic_cast<IntensityDataItem *>(item);
-//            JobItemHelper::updateDataAxes(intensityItem, getInstrumentItem());
-
-//        }
     });
 
 }

GUI/coregui/Models/BeamDistributionItem.h

@@ -28,7 +28,7 @@ class BA_CORE_API_ BeamDistributionItem : public SessionItem
 {
 public:
     static const QString P_DISTRIBUTION;
-    explicit BeamDistributionItem(const QString name = QString());
+    explicit BeamDistributionItem(const QString& name);
     virtual ~BeamDistributionItem(){}
 
     std::unique_ptr<ParameterDistribution> getParameterDistributionForName(
@@ -37,6 +37,7 @@ public:
     virtual double meanValue() const;
 
 protected:
+//    virtual RealLimits limits() const;
     void initDistributionItem();
 
     virtual std::unique_ptr<IDistribution1D> createDistribution1D() const;

GUI/coregui/Models/BeamWavelengthItem.cpp

@@ -19,6 +19,12 @@
 BeamWavelengthItem::BeamWavelengthItem()
     : BeamDistributionItem(Constants::BeamWavelengthType)
 {
+    SessionItem *distribution = dynamic_cast<DistributionNoneItem *>(getGroupItem(P_DISTRIBUTION));
+    Q_ASSERT(distribution);
+    auto value = distribution->getItem(DistributionNoneItem::P_VALUE);
+    value->setLimits(RealLimits::positive());
+    value->setDecimals(4);
+    value->setValue(0.1);
 }
 
 //! Returns wavelength. In the case of distribution applied, returns its mean.

GUI/coregui/Models/BeamWavelengthItem.h

@@ -21,10 +21,8 @@
 
 class BA_CORE_API_ BeamWavelengthItem : public BeamDistributionItem
 {
-
 public:
-    explicit BeamWavelengthItem();
-    virtual ~BeamWavelengthItem(){}
+    BeamWavelengthItem();
 
     double wavelength() const;
 };

GUI/coregui/Models/DistributionItems.cpp

@@ -65,7 +65,7 @@ const QString DistributionNoneItem::P_VALUE = "Value";
 
 DistributionNoneItem::DistributionNoneItem() : DistributionItem(Constants::DistributionNoneType)
 {
-    addProperty(P_VALUE, 0.1)->setLimits(RealLimits::lowerLimited(1e-4));
+    addProperty(P_VALUE, 0.1)->setLimits(RealLimits::limitless());
     getItem(P_VALUE)->setDecimals(4);
 }