Changeset 731efec in sasview for src/sas/qtgui/Perspectives

Timestamp:

Feb 12, 2018 4:12:13 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

6ca0da0

Parents:

235d766

Message:

Disconnect slots before reconnecting them again.

File:

• src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (7 diffs)

src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

@@ -1 +1 @@
 import os
 import sys
+import logging
 
 from twisted.internet import threads
@@ -100 +101 @@
         Intercept update signals from fitting tabs
         """
-        if tab is not None:
-            ObjectLibrary.getObject(tab).constraintAddedSignal.connect(self.initializeFitList)
-            ObjectLibrary.getObject(tab).newModelSignal.connect(self.initializeFitList)
+        if tab is None:
+            return
+        tab_object = ObjectLibrary.getObject(tab)
+
+        # Disconnect all local slots
+        tab_object.disconnect()
+
+        # Reconnect tab signals to local slots
+        tab_object.constraintAddedSignal.connect(self.initializeFitList)
+        tab_object.newModelSignal.connect(self.initializeFitList)
 
     def onFitTypeChange(self, checked):
@@ -548 +556 @@
             self.tabs_for_fitting[tab_name] = True
 
+        # Disable signals so we don't get infinite call recursion
+        self.tblTabList.blockSignals(True)
         self.tblTabList.setItem(pos, 0, item)
         self.tblTabList.setItem(pos, 1, self.uneditableItem(model_name))
@@ -553 +563 @@
         # Moniker is editable, so no option change
         item = QtWidgets.QTableWidgetItem(moniker)
-        # Disable signals so we don't get infinite call recursion
-        self.tblTabList.blockSignals(True)
         self.tblTabList.setItem(pos, 3, item)
         self.tblTabList.blockSignals(False)
@@ -564 +572 @@
             return
         self.tblConstraints.setEnabled(True)
+        self.tblConstraints.blockSignals(True)
         for constraint, constraint_name in zip(constraints, constraint_names):
             # Create the text for widget item
@@ -576 +585 @@
             self.tblConstraints.insertRow(pos)
             self.tblConstraints.setItem(pos, 0, item)
+        self.tblConstraints.blockSignals(False)
 
     def initializeFitList(self):
@@ -625 +635 @@
 
     def getObjectByName(self, name):
+        """
+        Given name of the fit, returns associated fit object
+        """
         for object_name in ObjectLibrary.listObjects():
             object = ObjectLibrary.getObject(object_name)