Changeset a2cb1f9 in sasview for sansview/perspectives/fitting

Timestamp:

Jun 9, 2011 5:47:24 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

64bc8e3

Parents:

5011193

Message:

cleaned up around on_Fit and added sleep

File:

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

sansview/perspectives/fitting/fitting.py

@@ -622 +622 @@
         #if self.calc_fit!= None and self.calc_fit.isrunning():
         #    self.calc_fit.stop()
-         #Handler used for park engine displayed message
+        msg = "Fitting is in progress..."
+        wx.PostEvent( self.parent, StatusEvent(status=msg, type="progress" ))
+        
+        #Handler used for park engine displayed message
         handler = ConsoleUpdate(parent=self.parent,
                                 manager=self,
                                 improvement_delta=0.1)
-        
+        time.sleep(0.2)
         ## perform single fit
         if fitproblem_count == 1:
@@ -645 +648 @@
                                     ftol=self.ftol)
         self.fit_thread_list[current_page_id] = calc_fit
+        time.sleep(0.3)
+        
+        #self.ready_fit(calc_fit=calc_fit)
         calc_fit.queue()
-        msg = "Fitting is in progress..."
-        wx.PostEvent( self.parent, StatusEvent(status=msg, type="progress" ))
-        
-        self.ready_fit(calc_fit=calc_fit)
-      
             
     def ready_fit(self, calc_fit):
@@ -891 +892 @@
         :param qmax: the maximum value of x to replot model
           
-        """     
+        """  
+        time.sleep(0.2)   
         try:
             if result == None:
@@ -957 +959 @@
             page_id = []
         ## fit more than 1 model at the same time 
+        time.sleep(0.2)  
         try:
             msg = "" 
@@ -1137 +1140 @@
         msg = "Plot updating ... "
         wx.PostEvent(self.parent, StatusEvent(status=msg,type="update"))
-        self.ready_fit()
+        #self.ready_fit()
         
     
@@ -1312 +1315 @@
         wx.PostEvent(self.parent, StatusEvent(status="Plot \
         #updating ... ", type="update"))
-        self.ready_fit()
+        #self.ready_fit()
   
     def _complete2D(self, image, data, model, page_id,  elapsed, index, qmin,