Re #10576. Disable the tie QtProperty. Fix a typo.

mantidproject · Apr 10, 2015 · 9827a08 · 9827a08
1 parent f689622
commit 9827a08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLocalParameterEditor.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MDFLocalParameterEditor.cpp
@@ -62,7 +62,7 @@ LocalParameterEditor::LocalParameterEditor(QWidget *parent, int index, bool fixe
   connect(action,SIGNAL(activated()),this,SLOT(fixAll()));
   setMenu->addAction(action);
 
-  action = new QAction("Unix all",this);
+  action = new QAction("Unfix all",this);
   action->setToolTip("Unfix all parameters.");
   connect(action,SIGNAL(activated()),this,SLOT(unfixAll()));
   setMenu->addAction(action);

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/FunctionBrowser.cpp
@@ -2115,7 +2115,11 @@ void FunctionBrowser::updateLocalTie(const QString& parName)
     }
     if ( m_localParameterValues[parName][m_currentDataset].fixed )
     {
-      addTieProperty(prop, QString::number(m_localParameterValues[parName][m_currentDataset].value));
+      auto ap = addTieProperty(prop, QString::number(m_localParameterValues[parName][m_currentDataset].value));
+      if (ap.prop)
+      {
+        ap.prop->setEnabled(false);
+      }
     }
 }