Changeset c6343a5 in sasview

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

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (4 diffs)
• FittingWidget.py (modified) (2 diffs)

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

@@ -93 +93 @@
 
         # External signals
-        #self.parent.tabsModifiedSignal.connect(self.initializeFitList)
         self.parent.tabsModifiedSignal.connect(self.onModifiedTabs)
 
@@ -135 +134 @@
         fitter_id = 0
         sim_fitter=[sim_fitter]
-        for tab in tabs_to_fit:
-            tab_object = ObjectLibrary.getObject(tab)
-            sim_fitter, fitter_id = tab_object.prepareFitters(fitter=sim_fitter[0], fit_id=fitter_id)
-            page_ids.append([tab_object.page_id])
+        # Prepare the fitter object
+        try:
+            for tab in tabs_to_fit:
+                tab_object = ObjectLibrary.getObject(tab)
+                if tab_object is None:
+                    # No such tab!
+                    return
+                sim_fitter, fitter_id = tab_object.prepareFitters(fitter=sim_fitter[0], fit_id=fitter_id)
+                page_ids.append([tab_object.page_id])
+        except ValueError as ex:
+            # No parameters selected in one of the tabs
+            no_params_msg = "Fitting can not be performed.\n" +\
+                            "Not all tabs chosen for fitting have parameters selected for fitting."
+            reply = QtWidgets.QMessageBox.question(self,
+                                               'Warning',
+                                               no_params_msg,
+                                               QtWidgets.QMessageBox.Ok)
+
+            return
 
         # Create the fitting thread, based on the fitter
@@ -182 +196 @@
     def onHelp(self):
         """
-        Display the help page
-        """
-        pass
+        Show the "Fitting" section of help
+        """
+        tree_location = "/user/sasgui/perspectives/fitting/"
+
+        helpfile = "fitting_help.html#simultaneous-fit-mode"
+        help_location = tree_location + helpfile
+
+        # OMG, really? Crawling up the object hierarchy...
+        self.parent.parent.showHelp(help_location)
 
     def onTabCellEdit(self, row, column):
@@ -276 +296 @@
         Respond to the successful fit complete signal
         """
-        pass
+        # get the elapsed time
+        elapsed = result[1]
+
+        # result list
+        results = result[0][0]
+
+        # Find out all tabs to fit
+        tabs_to_fit = [tab for tab in self.tabs_for_fitting if self.tabs_for_fitting[tab]]
+
+        # update all involved tabs
+        for i, tab in enumerate(tabs_to_fit):
+            tab_object = ObjectLibrary.getObject(tab)
+            if tab_object is None:
+                # No such tab. removed while job was running
+                return
+            # Make sure result and target objects are the same (same model moniker)
+            if tab_object.kernel_module.name == results[i].model.name:
+                tab_object.fitComplete(([[results[i]]], elapsed))
 
     def onBatchFitComplete(self, result):

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