[m.0] Init axes properties only in constructor ()

Merging branch 'm.0'  into 'main'.

See merge request !2751

GUI/Model/Descriptor/AxisProperty.cpp

@@ -27,26 +27,11 @@ const QString ExpandGroupbox("ExpandGroupbox"); // obsolete since v22.0
 } // namespace
 
 
-AxisProperty::AxisProperty() = default;
-
-AxisProperty::AxisProperty(const QString& name, const QString& unit)
-{
-    initMin(name + "_min (" + unit + ")", name + "_min (" + unit + ")", -1.,
-            RealLimits::limitless(), 3);
-    initMax(name + "_max (" + unit + ")", name + "_max (" + unit + ")", +1.,
-            RealLimits::limitless(), 3);
-}
-
-void AxisProperty::initMin(const QString& label, const QString& tooltip, double value,
-                           const RealLimits& limits, uint decimals)
-{
-    m_min.init(label, tooltip, value, decimals, limits, "min");
-}
-
-void AxisProperty::initMax(const QString& label, const QString& tooltip, double value,
-                           const RealLimits& limits, uint decimals)
+AxisProperty::AxisProperty(const QString& name, const QString& unit, double _min, double _max,
+                           const RealLimits& limit)
 {
-    m_max.init(label, tooltip, value, decimals, limits, "max");
+    m_min.init("Min (" + unit + ")", "Lower edge of first " + name + "-bin", _min, 3, limit, "min");
+    m_max.init("Max (" + unit + ")", "Upper edge of last " + name + "-bin", _max, 3, limit, "max");
 }
 
 void AxisProperty::writeTo(QXmlStreamWriter* w) const

GUI/Model/Descriptor/AxisProperty.h

@@ -28,8 +28,8 @@
 
 class AxisProperty {
 public:
-    AxisProperty();
-    AxisProperty(const QString& name, const QString& unit);
+    AxisProperty(const QString& name, const QString& unit, double _min, double _max,
+                 const RealLimits& limit);
 
     DoubleProperty& min() { return m_min; }
     const DoubleProperty& min() const { return m_min; }
@@ -37,11 +37,6 @@ public:
     DoubleProperty& max() { return m_max; }
     const DoubleProperty& max() const { return m_max; }
 
-    void initMin(const QString& label, const QString& tooltip, double value,
-                 const RealLimits& limits = RealLimits::nonnegative(), uint decimals = 3);
-    void initMax(const QString& label, const QString& tooltip, double value,
-                 const RealLimits& limits = RealLimits::nonnegative(), uint decimals = 3);
-
     uint nbins() const { return m_nbins; }
     void setNbins(uint v) { m_nbins = v; }
 

GUI/Model/Detector/DetectorItem.cpp

@@ -37,8 +37,8 @@ const QString ProjectionContainer("ProjectionContainer");
 
 
 DetectorItem::DetectorItem()
-    : m_phi_axis("phi", "deg")
-    , m_alpha_axis("alpha", "deg")
+    : m_phi_axis("phi", "deg", -1, 1, RealLimits::limited(-90, 90))
+    , m_alpha_axis("alpha", "deg", 0, 2, RealLimits::limited(-90, 90))
     , m_masks(std::make_unique<MasksSet>())
     , m_prjns(std::make_unique<MasksSet>())
 {

GUI/Model/Detector/OffspecDetectorItem.cpp

@@ -29,16 +29,9 @@ const QString BaseData("BaseData");
 } // namespace
 
 OffspecDetectorItem::OffspecDetectorItem()
+    : m_phi_axis("phi", "deg", -1, 1, RealLimits::limited(-90, 90))
+    , m_alpha_axis("alpha", "deg", 0, 2, RealLimits::limited(-90, 90))
 {
-    m_phi_axis.initMin("Min (deg)", "Lower edge of first phi-bin", -1.0,
-                       RealLimits::limited(-90, 90));
-    m_phi_axis.initMax("Max (deg)", "Upper edge of last phi-bin", 1.0,
-                       RealLimits::limited(-90, 90));
-
-    m_alpha_axis.initMin("Min (deg)", "Lower edge of first alpha-bin", 0.0,
-                         RealLimits::limited(-90, 90));
-    m_alpha_axis.initMax("Max (deg)", "Upper edge of last alpha-bin", 2.0,
-                         RealLimits::limited(-90, 90));
 }
 
 void OffspecDetectorItem::writeTo(QXmlStreamWriter* w) const

GUI/Model/Sim/InstrumentItems.cpp

@@ -504,6 +504,7 @@ void SpecularInstrumentItem::readFrom(QXmlStreamReader* r)
 
 DepthprobeInstrumentItem::DepthprobeInstrumentItem()
     : ScanningInstrumentItem(1e8)
+    , m_z_axis("depth", "nm", -100, 100, RealLimits::limitless())
 {
     setName("Depthprobe");
 
@@ -511,11 +512,6 @@ DepthprobeInstrumentItem::DepthprobeInstrumentItem()
     axisItem->setMin(0.0);
     axisItem->setMax(1.0);
     axisItem->resize(500);
-
-    m_z_axis.initMin("Min (nm)", "Starting value below sample horizon", -100.0,
-                     RealLimits::limitless());
-    m_z_axis.initMax("Max (nm)", "Ending value above sample horizon", 100.0,
-                     RealLimits::limitless());
 }
 
 size_t DepthprobeInstrumentItem::axdim(int) const

auto/Wrap/libBornAgainDevice_wrap.cpp

@@ -5591,7 +5591,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_  (PyObject *o, std::complex<double>* val)
 SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/home/ammar/.local/jcns/share/swig/4.2.1/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_  (/*@SWIG:/usr/local/share/swig/4.2.1/typemaps/swigmacros.swg,104,%ifcplusplus@*/
 const std::complex<double>&