Changeset c660493 in sasview for sansview/perspectives

Timestamp:

Nov 5, 2009 6:20:19 PM (15 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:

58fe6c8

Parents:

c99a6c5

Message:

removed extra sizer resets and fixed bugs on mac

File:

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

sansview/perspectives/fitting/fitting.py

@@ -82 +82 @@
         # the type of optimizer selected, park or scipy
         self.fitter  = None
+        #let fit ready
+        self.fitproblem_count = None
         #Flag to let the plug-in know that it is running stand alone
         self.standalone=True
@@ -190 +192 @@
                     the fitting option is not allowed
         """
-        self.graph = graph
-        fitOption = "Select data for fitting"
-        fitOpenHint =  "Dialog with fitting parameters "
-        
+        #TODO: clean this up so that the string are not copied 
+        #      multiple times.
+        self.graph=graph
+       
         for item in graph.plottables:
             if item.__class__.__name__ is "Data2D":
@@ -434 +436 @@
             self._on_change_engine(engine='park')
             
+        self.fitproblem_count = fitproblem_count  
+          
         from sans.fit.Fitting import Fit
         self.fitter= Fit(self._fit_engine)
@@ -489 +493 @@
                                        completefn= self._simul_fit_completed,
                                        updatefn=self._updateFit)
-
+            
             self.calc_fit.queue()
-            if fitproblem_count > 1:
-                        #Mac crashes on this.
-                self.calc_fit.ready(2.5)
-            else:
-                time.sleep(0.5)
-        
+            self.ready_fit()
+            
         except FitAbort:
             print "in pluging"
@@ -503 +503 @@
             wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
             return 
-           
+    def ready_fit(self):
+        """
+        Ready for another fit
+        """
+        if self.fitproblem_count != None and self.fitproblem_count > 1:
+            self.calc_fit.ready(2.5)
+            
+        else:
+            time.sleep(0.4)
+             
     def onCalculateSld(self, event):
         """
@@ -978 +987 @@
         wx.PostEvent(self.parent, StatusEvent(status="Plot \
         #updating ... ",type="update"))
-        self.calc_thread.ready(0.01)
+        self.ready_fit()
+        #self.calc_thread.ready(0.01)
     
     
@@ -1106 +1116 @@
         wx.PostEvent(self.parent, StatusEvent(status="Plot \
         #updating ... ",type="update"))
-        self.calc_thread.ready(0.01)
+        self.ready_fit()
+        #self.calc_thread.ready(0.01)