Changeset c6343a5 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Jan 25, 2018 10:00:20 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:

17968c3

Parents:

116dd4c1

Message:

C&S fitting now runs and updates fit tabs - SASVIEW-860

File:

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

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

@@ -1086 +1086 @@
 
         # Prepare the fitter object
-        fitters, _ = self.prepareFitters()
+        try:
+            fitters, _ = self.prepareFitters()
+        except ValueError as ex:
+            # This should not happen! GUI explicitly forbids this situation
+            self.communicate.statusBarUpdateSignal.emit('Fitting attempt without parameters.')
+            return
 
         # Create the fitting thread, based on the fitter
@@ -1200 +1205 @@
         qmax = self.q_range_max
         params_to_fit = self.parameters_to_fit
+        if (not params_to_fit):
+            raise ValueError('Fitting requires at least one parameter to optimize.')
 
         # Potential weights added directly to data