Changeset bbcf9f0 in sasview

Timestamp:

Jan 9, 2019 4:11:30 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

33c0561

Parents:

d1ad101

Message:

1. Disconnect signals before reconnecting them. SASVIEW-1238
2. Update Smearing label on the main fitting tab

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (1 diff)
• FittingWidget.py (modified) (2 diffs)

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

@@ -214 +214 @@
         tab_object = ObjectLibrary.getObject(tab)
 
-        # Disconnect all local slots
-        #tab_object.disconnect()
+        # Disconnect all local slots, if connected
+        if tab_object.receivers(tab_object.newModelSignal) > 0:
+            tab_object.newModelSignal.disconnect()
+        if tab_object.receivers(tab_object.constraintAddedSignal) > 0:
+            tab_object.constraintAddedSignal.disconnect()
 
         # Reconnect tab signals to local slots

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

@@ -284 +284 @@
         # Data for chosen model
         self.model_data = None
+        self._previous_model_index = 0
 
         # Which shell is being currently displayed?
@@ -2020 +2021 @@
         React to changes in the smearing widget
         """
+        # update display
+        smearing, accuracy, smearing_min, smearing_max = self.smearing_widget.state()
+        self.lblCurrentSmearing.setText(smearing)
         self.calculateQGridForModel()