Changeset 14ec91c5 in sasview for src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py

Timestamp:

Feb 2, 2018 9:21:48 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:

a90c9c5

Parents:

5e66738

Message:

More code review related fixes

File:

• src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py (modified) (10 diffs)

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

@@ -5 +5 @@
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
+import sas.qtgui.Utilities.LocalConfig as LocalConfig
+
 from PyQt5 import QtGui, QtCore, QtWidgets
 
@@ -15 +17 @@
 from sas.qtgui.Perspectives.Fitting.ConsoleUpdate import ConsoleUpdate
 from sas.qtgui.Perspectives.Fitting.ComplexConstraint import ComplexConstraint
-from sas.qtgui.Perspectives.Fitting.Constraints import Constraint
+from sas.qtgui.Perspectives.Fitting.Constraint import Constraint
 
 class ConstraintWidget(QtWidgets.QWidget, Ui_ConstraintWidgetUI):
@@ -22 +24 @@
     """
 
-    def __init__(self, parent=None, tab_id=1):
+    def __init__(self, parent=None):
         super(ConstraintWidget, self).__init__()
         self.parent = parent
         self.setupUi(self)
         self.currentType = "FitPage"
-        self.tab_id = tab_id
         # Page id for fitting
         # To keep with previous SasView values, use 300 as the start offset
-        self.page_id = 300 + self.tab_id
+        self.page_id = 301
 
         # Remember previous content of modified cell
@@ -118 +119 @@
         pass
 
+    def getTabsForFit(self):
+        """
+        Returns list of tab names selected for fitting
+        """
+        return [tab for tab in self.tabs_for_fitting if self.tabs_for_fitting[tab]]
+
     def onFit(self):
         """
@@ -123 +130 @@
         """
         # Find out all tabs to fit
-        tabs_to_fit = [tab for tab in self.tabs_for_fitting if self.tabs_for_fitting[tab]]
+        tabs_to_fit = self.getTabsForFit()
 
         # Single fitter for the simultaneous run
         sim_fitter = Fit()
         sim_fitter.fitter_id = self.page_id
+
+        # Notify the parent about fitting started
+        self.parent.fittingStartedSignal.emit(tabs_to_fit)
 
         # prepare fitting problems for each tab
@@ -157 +167 @@
         completefn = self.onBatchFitComplete if self.currentType=='BatchPage' else self.onFitComplete
 
-        #if USING_TWISTED:
-        handler = None
-        updater = None
-        #else:
-        #    handler = ConsoleUpdate(parent=self.parent,
-        #                            manager=self,
-        #                            improvement_delta=0.1)
-        #    updater = handler.update_fit
+        if LocalConfig.USING_TWISTED:
+            handler = None
+            updater = None
+        else:
+            handler = ConsoleUpdate(parent=self.parent,
+                                    manager=self,
+                                    improvement_delta=0.1)
+            updater = handler.update_fit
 
         batch_inputs = {}
@@ -178 +188 @@
                              completefn=completefn)
 
-        #if USING_TWISTED:
-        # start the trhrhread with twisted
-        calc_thread = threads.deferToThread(calc_fit.compute)
-        calc_thread.addCallback(completefn)
-        calc_thread.addErrback(self.onFitFailed)
-        #else:
-        #    # Use the old python threads + Queue
-        #    calc_fit.queue()
-        #    calc_fit.ready(2.5)
+        if LocalConfig.USING_TWISTED:
+            # start the trhrhread with twisted
+            calc_thread = threads.deferToThread(calc_fit.compute)
+            calc_thread.addCallback(completefn)
+            calc_thread.addErrback(self.onFitFailed)
+        else:
+            # Use the old python threads + Queue
+            calc_fit.queue()
+            calc_fit.ready(2.5)
 
 
@@ -300 +310 @@
         self.cmdFit.setEnabled(True)
 
+        # Notify the parent about completed fitting
+        self.parent.fittingStoppedSignal.emit(self.getTabsForFit())
+
         # get the elapsed time
         elapsed = result[1]
@@ -330 +343 @@
         self.cmdFit.setEnabled(True)
 
+        # Notify the parent about completed fitting
+        self.parent.fittingStoppedSignal.emit(self.getTabsForFit())
+
         # get the elapsed time
         elapsed = result[1]
@@ -348 +364 @@
         self.cmdFit.setText("Fit")
         self.cmdFit.setEnabled(True)
+
+        # Notify the parent about completed fitting
+        self.parent.fittingStoppedSignal.emit(self.getTabsForFit())
 
         msg = "Fitting failed: %s s.\n" % reason