Changeset 7adc2a8 in sasview

Timestamp:

Aug 1, 2017 5:12:36 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:

985ad94

Parents:

0d13814

Message:

Allow old style threads for fitting

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• ConsoleUpdate.py (added)
• FitThread.py (modified) (2 diffs)
• FittingWidget.py (modified) (4 diffs)

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

@@ -74 +74 @@
                          list_reset_flag)
             result = map(map_apply, inputs)
-
-            self.complete(result=result,
-                          batch_inputs=self.batch_inputs,
-                          batch_outputs=self.batch_outputs,
-                          page_id=self.page_id,
-                          pars=self.pars,
-                          elapsed=time.time() - self.starttime)
-
-            return result[0], time.time()-self.starttime
+            results = (result[0], time.time()-self.starttime)
+            if self.handler:
+                self.completefn(results)
+            else:
+                return (results)
 
         except KeyboardInterrupt, msg:
@@ -96 +92 @@
                 self.handler.stop(msg=msg)
         except Exception as ex:
+            # print "ERROR IN FIT THREAD: ", traceback.format_exc()
             if self.handler is not None:
                 self.handler.error(msg=traceback.format_exc())

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

@@ -27 +27 @@
 from sas.qtgui.Perspectives.Fitting.UI.FittingWidgetUI import Ui_FittingWidgetUI
 from sas.qtgui.Perspectives.Fitting.FitThread import FitThread
+from sas.qtgui.Perspectives.Fitting.ConsoleUpdate import ConsoleUpdate
+
 from sas.qtgui.Perspectives.Fitting.ModelThread import Calc1D
 from sas.qtgui.Perspectives.Fitting.ModelThread import Calc2D
@@ -45 +47 @@
 
 DEFAULT_POLYDISP_FUNCTION = 'gaussian'
+
+USING_TWISTED = True
 
 class FittingWidget(QtGui.QWidget, Ui_FittingWidgetUI):
@@ -636 +640 @@
         list_page_id = [page_id]
         #---------------------------------
+        if USING_TWISTED:
+            handler = None
+            updater = None
+        else:
+            handler = ConsoleUpdate(parent=self.parent,
+                                    manager=self,
+                                    improvement_delta=0.1)
+            updater = handler.update_fit
 
         # Parameterize the fitter
@@ -653 +665 @@
                              batch_outputs=batch_outputs,
                              page_id=list_page_id,
-                             updatefn=self.updateFit,
-                             completefn=None)
-
-        # start the trhrhread
-        calc_thread = threads.deferToThread(calc_fit.compute)
-        calc_thread.addCallback(self.fitComplete)
-        calc_thread.addErrback(self.fitFailed)
+                             updatefn=updater,
+                             completefn=self.fitComplete)
+
+        if USING_TWISTED:
+            # start the trhrhread with twisted
+            calc_thread = threads.deferToThread(calc_fit.compute)
+            calc_thread.addCallback(self.fitComplete)
+            calc_thread.addErrback(self.fitFailed)
+        else:
+            # Use the old python threads + Queue
+            calc_fit.queue()
+            calc_fit.ready(2.5)
+
 
         #disable the Fit button
-        self.cmdFit.setText('Calculating...')
+        self.cmdFit.setText('Running...')
         self.communicate.statusBarUpdateSignal.emit('Fitting started...')
         self.cmdFit.setEnabled(False)