Changeset 80a327d in sasview for src

Timestamp:

Sep 24, 2018 1:14:38 PM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

d99b1a5

Parents:

adf1c2a

Message:

move updateRadiusEffective to class method

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)

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

@@ -2594 +2594 @@
 
         # Update radius_effective if relevant
-        def updateRadiusEffective():
-            ER_mode_row = self.getRowFromName("radius_effective_mode")
-            if ER_mode_row is None:
-                return
-            try:
-                ER_mode = int(self._model_model.item(ER_mode_row, 1).text())
-            except ValueError:
-                logging.error("radius_effective_mode was set to an invalid value.")
-                return
-            if ER_mode < 1:
-                # does not need updating if it is not being computed
-                return
-
-            ER_row = self.getRowFromName("radius_effective")
-            if ER_row is None:
-                return
-
-            scalar_results = self.logic.getScalarIntermediateResults(return_data)
-            ER_value = scalar_results.get("effective_radius") # note name of key
-            if ER_value is None:
-                return
-            # ensure the model does not recompute when updating the value
-            self._model_model.blockSignals(True)
-            self._model_model.item(ER_row, 1).setText(str(ER_value))
-            self._model_model.blockSignals(False)
-            # ensure the view is updated immediately
-            self._model_model.layoutChanged.emit()
-
-        updateRadiusEffective()
+        self.updateRadiusEffective(return_data)
 
     def complete2D(self, return_data):
@@ -2641 +2613 @@
         for plot in new_plots:
             self.communicate.plotUpdateSignal.emit([plot])
+
+    def updateRadiusEffective(self, return_data):
+        """
+        Given return data from sasmodels, update the effective radius parameter in the GUI table with the new
+        calculated value as returned by sasmodels (if the value was returned).
+        """
+        ER_mode_row = self.getRowFromName("radius_effective_mode")
+        if ER_mode_row is None:
+            return
+        try:
+            ER_mode = int(self._model_model.item(ER_mode_row, 1).text())
+        except ValueError:
+            logging.error("radius_effective_mode was set to an invalid value.")
+            return
+        if ER_mode < 1:
+            # does not need updating if it is not being computed
+            return
+
+        ER_row = self.getRowFromName("radius_effective")
+        if ER_row is None:
+            return
+
+        scalar_results = self.logic.getScalarIntermediateResults(return_data)
+        ER_value = scalar_results.get("effective_radius") # note name of key
+        if ER_value is None:
+            return
+        # ensure the model does not recompute when updating the value
+        self._model_model.blockSignals(True)
+        self._model_model.item(ER_row, 1).setText(str(ER_value))
+        self._model_model.blockSignals(False)
+        # ensure the view is updated immediately
+        self._model_model.layoutChanged.emit()
 
     def calculateResiduals(self, fitted_data):