Changeset 66ff250 in sasview for sansview/perspectives/fitting/fit_thread.py

Timestamp:

Mar 18, 2011 6:20:50 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

e4957fb

Parents:

511c6810

Message:

working on fit stop

File:

• sansview/perspectives/fitting/fit_thread.py (modified) (6 diffs)

sansview/perspectives/fitting/fit_thread.py

@@ -1 +1 @@
 
+import sys
+from data_util.calcthread import CalcThread
 
-from data_util.calcthread import CalcThread
 
 class FitThread(CalcThread):
@@ -8 +9 @@
     def __init__(self, parent,
                   fn,
+                  page_id,
                    handler,
                   pars=None,
@@ -23 +25 @@
         self.fitter = fn
         self.pars = pars
+        self.page_id = page_id
         self.starttime = 0
         self.updatefn = updatefn
@@ -35 +38 @@
         except KeyboardInterrupt:
             raise KeyboardInterrupt
-        
+       
     def compute(self):
         """
@@ -41 +44 @@
         """
         try: 
-            self.handler.starting_fit()
-            self.updatefn()
+            #self.handler.starting_fit()
             #Result from the fit
             result = self.fitter.fit(handler=self.handler, curr_thread=self)
-            self.updatefn()
             self.complete(result= result,
+                          page_id=self.page_id,
                           pars = self.pars)
            
@@ -54 +56 @@
             #print "keyboard exception"
             #Stop on exception during fitting. Todo: need to put some mssg and reset progress bar.
-            self.handler.error(msg=msg)
+            raise
+            #if self.handler is not None:
+            #    self.handler.error(msg=msg)
+        except:
+            raise
+            #if self.handler is not None:
+            #    self.handler.error(msg=str(sys.exc_value))
+           
         
+