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

Timestamp:

Aug 22, 2018 7:02:41 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

54492dc

Parents:

f7d39c9 (diff), 0fe7e5b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

• src/sas/qtgui/Perspectives/Fitting/FittingOptions.py (modified) (1 diff)

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

@@ -146 +146 @@
             """
             widget = self.widgetFromOption(option)
-            new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
-                else float(widget.text())
-            self.config.values[self.current_fitter_id][option] = new_value
+            if widget is None:
+                return
+            try:
+                new_value = widget.currentText() if isinstance(widget, QtWidgets.QComboBox) \
+                    else float(widget.text())
+                self.config.values[self.current_fitter_id][option] = new_value
+            except ValueError:
+                # Don't update bumps if widget has bad data
+                self.reject
 
         # Update the BUMPS singleton