Changeset ea1753f in sasview for src/sas/qtgui/Perspectives/Fitting/FittingOptions.py

Timestamp:

Mar 28, 2019 9:48:07 AM (6 years ago)

Author:

ibressler

Branches:

ESS_GUI_bumps_abstraction

Children:

af893db

Parents:

740a738

Message:

FittingOptions?.updateConfigFromWidget()

• analog to updateWidgetFromConfig()

File:

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

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

@@ -364 +364 @@
 
         # update config values from widgets before any notification is sent
-        for param in fm.params.values():
-            widget = self.paramWidget(fm, param.shortName)
-            if widget is None:
-                continue
-            try:
-                if isinstance(widget, QtWidgets.QComboBox):
-                    new_value = widget.currentText()
-                else:
-                    try:
-                        new_value = int(widget.text())
-                    except ValueError:
-                        new_value = float(widget.text())
-                fm.params[param.shortName].value = new_value
-            except ValueError:
-                # Don't update bumps if widget has bad data
-                self.reject
+        try:
+            self.updateConfigFromWidget(fm)
+        except ValueError:
+            # Don't update bumps if widget has bad data
+            self.reject
 
         fm.storeConfig() # write the current settings to bumps module
@@ -423 +412 @@
                 eval(widget_name).setText(str(param.value))
 
+    def updateConfigFromWidget(self, fittingMethod):
+        # update config values from widgets before any notification is sent
+        for param in fittingMethod.params.values():
+            widget = self.paramWidget(fittingMethod, param.shortName)
+            if widget is None:
+                continue
+            new_value = None
+            if isinstance(widget, QtWidgets.QComboBox):
+                new_value = widget.currentText()
+            else:
+                try:
+                    new_value = int(widget.text())
+                except ValueError:
+                    new_value = float(widget.text())
+            if new_value is not None:
+                fittingMethod.params[param.shortName].value = new_value