Ticket #9650: parameter_update_fix.patch

Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/FitPropertyBrowser.h

@@ -208 +208 @@
   /// Returns true if the fit should be done against binned (bunched) data.     
   bool rawData()const;
 
+  void setADSObserveEnabled(bool enabled);
+
   void postDeleteHandle(const std::string& wsName);
   void addHandle(const std::string& wsName,const boost::shared_ptr<Mantid::API::Workspace> ws);
 

Code/Mantid/MantidQt/MantidWidgets/src/FitPropertyBrowser.cpp

@@ -1666 +1666 @@
   (void)e;
   // Observe what workspaces are added and deleted unless it's a custom fitting, all workspaces for custom fitting (eg muon analysis) 
   // should be manually added.
-  observeAdd();
-  observePostDelete();
+  setADSObserveEnabled(true);
   populateWorkspaceNames();
 }
 
@@ -1677 +1676 @@
 void FitPropertyBrowser::hideEvent(QHideEvent* e)
 {
   (void)e;
-  observeAdd(false);
-  observePostDelete(false);
+  setADSObserveEnabled(false);
+}
+
+void FitPropertyBrowser::setADSObserveEnabled(bool enabled)
+{
+  observeAdd(enabled);
+  observePostDelete(enabled);
 }
 
 /// workspace was added
@@ -1688 +1692 @@
   QStringList oldWorkspaces = m_workspaceNames;
   QString oldName = QString::fromStdString(workspaceName());
   int i = m_workspaceNames.indexOf(QString(wsName.c_str()));
+
+  bool initialSignalsBlocked = m_enumManager->signalsBlocked();
+
   // if new workspace append this workspace name
   if (i < 0)
   {
+    if (!m_workspaceNames.isEmpty())
+    {
+      m_enumManager->blockSignals(true);
+    }
+
     m_workspaceNames.append(QString(wsName.c_str()));
     m_workspaceNames.sort();
     m_enumManager->setEnumNames(m_workspace, m_workspaceNames);
@@ -1701 +1713 @@
   {
     m_enumManager->setValue(m_workspace,i);
   }
+
+  m_enumManager->blockSignals(initialSignalsBlocked);
+  /*
   if (m_workspaceNames.size() == 1)
   {
     setWorkspaceName(QString::fromStdString(wsName));
   }
-  getHandler()->updateWorkspaces(oldWorkspaces);
+  */
 }
 
 /// workspace was removed
@@ -1718 +1733 @@
   {
     m_workspaceNames.removeAt(i);
   }
+
+  bool initialSignalsBlocked = m_enumManager->signalsBlocked();
+
+  if (QString::fromStdString(wsName) != oldName)
+  {
+    m_enumManager->blockSignals(true);
+  }
+
   m_enumManager->setEnumNames(m_workspace, m_workspaceNames);
+
   i = m_workspaceNames.indexOf(oldName);
   if (i >= 0)
   {
     m_enumManager->setValue(m_workspace,i);
   } 
-  getHandler()->updateWorkspaces(oldWorkspaces);
+
+  m_enumManager->blockSignals(initialSignalsBlocked);
 }