Changeset 58e0c83 in sasview

Timestamp:

Mar 24, 2011 2:42:08 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:

50764a4

Parents:

0806def

Message:

working on fit stop

Location:

sansview/perspectives/fitting

Files:

• fit_thread.py (modified) (2 diffs)
• fitting.py (modified) (4 diffs)

sansview/perspectives/fitting/fit_thread.py

@@ -7 +7 @@
     """Thread performing the fit """
     
-    def __init__(self, parent,
+    def __init__(self, 
                   fn,
                   page_id,
@@ -21 +21 @@
                  yieldtime,
                  worktime)
-        self.parent = parent
         self.handler = handler
         self.fitter = fn

sansview/perspectives/fitting/fitting.py

@@ -596 +596 @@
         ## perform single fit
         if fitproblem_count == 1:
-            calc_fit = FitThread(parent=self.parent,
-                                    handler = handler,
+            calc_fit = FitThread(handler = handler,
                                     fn=fitter,
                                    pars=pars,
@@ -605 +604 @@
             current_page_id = self.sim_page.uid
             ## Perform more than 1 fit at the time
-            calc_fit = FitThread(parent=self.parent,
-                                handler=handler,
+            calc_fit = FitThread(handler=handler,
                                     fn=fitter,
                                     page_id=list_page_id,
@@ -1054 +1052 @@
         Update the output of plotting model 1D
         """
-        #msg = "Plot updating ... "
-        #wx.PostEvent(self.parent, StatusEvent(status=msg,type="update"))
-        #self.ready_fit()
-        #self.calc_thread.ready(0.01)
+        msg = "Plot updating ... "
+        wx.PostEvent(self.parent, StatusEvent(status=msg,type="update"))
+        self.ready_fit()
+        
     
     def _fill_default_model2D(self, theory, page_id, qmax,qstep, qmin=None):
@@ -1221 +1219 @@
         Update the output of plotting model
         """
-        #wx.PostEvent(self.parent, StatusEvent(status="Plot \
+        wx.PostEvent(self.parent, StatusEvent(status="Plot \
         #updating ... ", type="update"))
-        #self.ready_fit()
-        #self.calc_thread.ready(0.01)
-    
+        self.ready_fit()
+  
     def _complete2D(self, image, data, model, page_id,  elapsed, index, qmin,
                      qmax, toggle_mode_on=False,state=None,qstep=DEFAULT_NPTS):