New mapping in FitParameterItems

GUI/coregui/Models/FitParameterAbsModel.cpp

@@ -28,8 +28,8 @@ FitParameterAbsModel::FitParameterAbsModel(FitParameterContainerItem *fitParCont
     m_columnNames.insert(ITEM_NAME, "Name");
     m_columnNames.insert(ITEM_USE, FitParameterItem::P_TYPE);
     m_columnNames.insert(ITEM_MIN, FitParameterItem::P_MIN);
-    m_columnNames.insert(ITEM_START, FitParameterItem::P_START_VALUE);
     m_columnNames.insert(ITEM_MAX, FitParameterItem::P_MAX);
+    m_columnNames.insert(ITEM_START, FitParameterItem::P_START_VALUE);
 
     connectModel(fitParContainer->model());
 
@@ -43,16 +43,25 @@ FitParameterAbsModel::FitParameterAbsModel(FitParameterContainerItem *fitParCont
 
 Qt::ItemFlags FitParameterAbsModel::flags(const QModelIndex &index) const
 {
+    if(!m_root_item) return Qt::NoItemFlags;
+
     Qt::ItemFlags returnVal = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-    if (index.isValid() && index.parent() == QModelIndex()) {
-        if (index.column() == 0)
-            returnVal |= Qt::ItemIsDropEnabled;
-        else
-            returnVal |= Qt::ItemIsEditable;
-    } else if (!index.isValid()) {
-        returnVal |= Qt::ItemIsDropEnabled;
+    if(SessionItem *item = itemForIndex(index)) {
+//        if(item->isEnabled()) returnVal |= Qt::ItemIsEnabled;
+        if(item->isEditable()) returnVal |= Qt::ItemIsEditable;
     }
     return returnVal;
+
+//    Qt::ItemFlags returnVal = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+//    if (index.isValid() && index.parent() == QModelIndex()) {
+//        if (index.column() == 0)
+//            returnVal |= Qt::ItemIsDropEnabled;
+//        else
+//            returnVal |= Qt::ItemIsEditable;
+//    } else if (!index.isValid()) {
+//        returnVal |= Qt::ItemIsDropEnabled;
+//    }
+//    return returnVal;
 }
 
 QModelIndex FitParameterAbsModel::index(int row, int column, const QModelIndex &parent) const

GUI/coregui/Models/FitParameterItems.cpp

@@ -69,9 +69,47 @@ FitParameterItem::FitParameterItem()
     addProperty(P_TYPE, partype.getVariant());
     addProperty(P_START_VALUE, 0.0);
     addProperty(P_MIN, 0.0);
-    addProperty(P_MAX, 0.0);
+    addProperty(P_MAX, 0.0)->setEnabled(false);
     registerTag(T_LINK, 0, -1, QStringList() << Constants::FitParameterLinkType);
     setDefaultTag(T_LINK);
+
+
+    mapper()->setOnPropertyChange(
+                [this](const QString &name) {
+        if(name == P_TYPE) {
+            ComboProperty partype = getItemValue(P_TYPE).value<ComboProperty>();
+            if(partype.getValue() == Constants::FITPAR_FIXED) {
+                if(isTag(P_MIN)) {
+                    getItem(P_MIN)->setEditable(false);
+                }
+            } else if(partype.getValue() == Constants::FITPAR_LIMITED) {
+                if(isTag(P_MIN)) {
+                    getItem(P_MIN)->setEditable(true);
+                }
+            }
+
+            else if(partype.getValue() == Constants::FITPAR_LIMITED) {
+                if(isTag(P_MIN)) {
+                    getItem(P_MIN)->setEditable(true);
+                }
+            }
+
+            else if(partype.getValue() == Constants::FITPAR_LOWERLIMITED) {
+                if(isTag(P_MIN)) {
+                    getItem(P_MIN)->setEditable(true);
+                }
+            }
+
+            else if(partype.getValue() == Constants::FITPAR_UPPERLIMITED) {
+                if(isTag(P_MIN)) {
+                    getItem(P_MIN)->setEditable(false);
+                }
+            }
+        }
+
+
+    });
+
 }
 
 // ----------------------------------------------------------------------------