Changeset 7adc2a8 in sasview for src/sas/qtgui/Perspectives/Fitting/FitThread.py

Timestamp:

Aug 1, 2017 3: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

File:

• src/sas/qtgui/Perspectives/Fitting/FitThread.py (modified) (2 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())