Changeset 17968c3 in sasview

Timestamp:

Jan 26, 2018 5:52: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:

9c0ce68

Parents:

c6343a5

Message:

Support for running C&S batch fits - SASVIEW-865

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConstraintWidget.py (modified) (3 diffs)
• FittingPerspective.py (modified) (1 diff)

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

@@ -181 +181 @@
         # start the trhrhread with twisted
         calc_thread = threads.deferToThread(calc_fit.compute)
-        calc_thread.addCallback(self.onFitComplete)
+        calc_thread.addCallback(completefn)
         calc_thread.addErrback(self.onFitFailed)
         #else:
@@ -296 +296 @@
         Respond to the successful fit complete signal
         """
+        #re-enable the Fit button
+        self.cmdFit.setText("Fit")
+        self.cmdFit.setEnabled(True)
+
         # get the elapsed time
         elapsed = result[1]
@@ -315 +319 @@
                 tab_object.fitComplete(([[results[i]]], elapsed))
 
+        msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)
+        self.parent.communicate.statusBarUpdateSignal.emit(msg)
+
     def onBatchFitComplete(self, result):
         """
         Respond to the successful batch fit complete signal
         """
+        #re-enable the Fit button
+        self.cmdFit.setText("Fit")
+        self.cmdFit.setEnabled(True)
+
+        # get the elapsed time
+        elapsed = result[1]
+
+        # ADD THE BATCH FIT VIEW HERE
+        #
+
+        msg = "Fitting completed successfully in: %s s.\n" % GuiUtils.formatNumber(elapsed)
+        self.parent.communicate.statusBarUpdateSignal.emit(msg)
+
         pass
 
     def onFitFailed(self, reason):
         """
-        """
-        print("FIT FAILED: ", reason)
+        Respond to fitting failure.
+        """
+        #re-enable the Fit button
+        self.cmdFit.setText("Fit")
+        self.cmdFit.setEnabled(True)
+
+        msg = "Fitting failed: %s s.\n" % reason
+        self.parent.communicate.statusBarUpdateSignal.emit(msg)
         pass
  

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

@@ -236 +236 @@
             raise AttributeError(msg)
 
+        if is_batch:
+            # Just create a new fit tab. No empty batchFit tabs
+            self.addFit(data_item, is_batch=is_batch)
+            return
+
         items = [data_item] if is_batch else data_item
-
         for data in items:
             # Find the first unassigned tab.
             # If none, open a new tab.
-            available_tabs = list([tab.acceptsData() for tab in self.tabs])
+            available_tabs = [tab.acceptsData() for tab in self.tabs]
 
             if numpy.any(available_tabs):