FitParameterItem: adding items

GUI/Model/Job/FitParameterItem.cpp

@@ -44,19 +44,24 @@ const double range_factor = 0.5;
 } // namespace
 
 
-FitParameterItem::FitParameterItem()
-    : SessionItem(M_TYPE)
+FitParameterItem::FitParameterItem(QObject *parent)
+    : QObject(parent)
+    , SessionItem(M_TYPE)
+    , m_typeItem(new FitComboItem(fitParameterTypeCombo(), this))
+    , m_startValueItem(new FitDoubleItem(0.0, this))
+    , m_minItem(new FitEditableDoubleItem(0.0, true, this))
+    , m_maxItem(new FitEditableDoubleItem(0.0, false, this))
 {
-    addProperty(P_TYPE, fitParameterTypeCombo().variant());
-    addProperty(P_START_VALUE, double(0.0));
-    addProperty(P_MIN, double(0.0));
-    addProperty(P_MAX, double(0.0))->setEnabled(false);
+//    addProperty(P_TYPE, fitParameterTypeCombo().variant());
+//    addProperty(P_START_VALUE, double(0.0));
+//    addProperty(P_MIN, double(0.0));
+//    addProperty(P_MAX, double(0.0))->setEnabled(false);
     registerTag(T_LINK, 0, -1, {FitParameterLinkItem::M_TYPE});
     setDefaultTag(T_LINK);
 
-    startValueItem()->setLimits(RealLimits::limitless());
-    minimumItem()->setLimits(RealLimits::limitless());
-    maximumItem()->setLimits(RealLimits::limitless());
+//    startValueItem()->setLimits(RealLimits::limitless());
+//    minimumItem()->setLimits(RealLimits::limitless());
+//    maximumItem()->setLimits(RealLimits::limitless());
 
     onTypeChange();
 }
@@ -301,3 +306,74 @@ bool FitParameterItem::isFixed() const
 {
     return currentType() == "fixed";
 }
+
+//------------------------------------------------------------------------------------------------
+
+FitComboItem::FitComboItem(QObject *parent)
+    : QObject(parent)
+{
+}
+
+FitComboItem::FitComboItem(const ComboProperty& combo, QObject *parent)
+    : QObject(parent)
+    , m_combo(combo)
+{
+}
+
+ComboProperty FitComboItem::combo()
+{
+    return m_combo;
+}
+
+void FitComboItem::setCombo(const ComboProperty &c)
+{
+    m_combo = c;
+}
+
+//------------------------------------------------------------------------------------------------
+
+FitDoubleItem::FitDoubleItem(QObject *parent)
+    : QObject(parent)
+    , m_value(0.0)
+{
+}
+
+FitDoubleItem::FitDoubleItem(double value, QObject *parent)
+    : QObject(parent)
+    , m_value(value)
+{
+}
+
+double FitDoubleItem::value()
+{
+    return m_value;
+}
+
+void FitDoubleItem::setValue(double v)
+{
+    m_value = v;
+}
+
+//------------------------------------------------------------------------------------------------
+
+FitEditableDoubleItem::FitEditableDoubleItem(QObject *parent)
+    : FitDoubleItem(0.0, parent)
+    , m_isEnabled(true)
+{
+}
+
+FitEditableDoubleItem::FitEditableDoubleItem(double value, bool isEnabled, QObject *parent)
+    : FitDoubleItem(value, parent)
+    , m_isEnabled(isEnabled)
+{
+}
+
+bool FitEditableDoubleItem::isEnabled()
+{
+    return m_isEnabled;
+}
+
+void FitEditableDoubleItem::setEnabled(bool b)
+{
+    m_isEnabled = b;
+}

GUI/Model/Job/FitParameterItem.h

@@ -24,10 +24,11 @@ class FitParameterLinkItem;
 //! Holds ComboProperty values, accessible from FitparameterModel.
 class FitComboItem : public QObject {
 public:
-    FitComboItem(QObject* parent = nullptr) : QObject(parent) {}
+    FitComboItem(QObject* parent = nullptr);
+    FitComboItem(const ComboProperty& combo, QObject* parent = nullptr);
 
-    ComboProperty combo() {return m_combo;}
-    void setCombo(const ComboProperty& c) {m_combo = c;}
+    ComboProperty combo();
+    void setCombo(const ComboProperty& c);
 
 private:
     ComboProperty m_combo;
@@ -36,29 +37,31 @@ private:
 //! Holds double values, accessible from FitparameterModel.
 class FitDoubleItem : public QObject {
 public:
-    FitDoubleItem(QObject* parent = nullptr) : QObject(parent) {}
+    FitDoubleItem(QObject* parent = nullptr);
+    FitDoubleItem(double value, QObject* parent = nullptr);
 
-    double value() {return m_value;}
-    void setValue(double v) {m_value = v;}
+    double value();
+    void setValue(double v);
 
 private:
     double m_value;
 };
 
 //! Holds double values which can be enabled or disabled.
-class FitDoubleEditableItem : public FitDoubleItem {
+class FitEditableDoubleItem : public FitDoubleItem {
 public:
-    FitDoubleEditableItem(QObject* parent = nullptr) : FitDoubleItem(parent) {}
+    FitEditableDoubleItem(QObject* parent = nullptr);
+    FitEditableDoubleItem(double value, bool isEnabled, QObject* parent = nullptr);
 
-    bool isEnabled() {return m_isEnabled;}
-    void setEnabled(bool b) {m_isEnabled = b;}
+    bool isEnabled();
+    void setEnabled(bool b);
 
 private:
     bool m_isEnabled;
 };
 
 //! Represents a fit parameter in GUI. Contains links to corresponding ParameterItems in a tuning tree.
-class FitParameterItem : public SessionItem {
+class FitParameterItem  : public QObject, public SessionItem {
 private:
     static constexpr auto P_TYPE{"Type"};
     static constexpr auto P_START_VALUE{"Value"};
@@ -69,7 +72,7 @@ private:
 public:
     static constexpr auto M_TYPE{"FitParameter"};
 
-    FitParameterItem();
+    FitParameterItem(QObject* parent = nullptr);
 
     void initMinMaxValues(const RealLimits& limits);
 
@@ -111,6 +114,10 @@ private:
     bool isUpperLimited() const;
     bool isFixed() const;
 
+    FitComboItem* m_typeItem;
+    FitDoubleItem* m_startValueItem;
+    FitEditableDoubleItem* m_minItem;
+    FitEditableDoubleItem* m_maxItem;
     QVector<FitParameterLinkItem*> m_links;
 };