Changeset f6aee42 in sasview

Timestamp:

Jun 20, 2011 7:06:16 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:

9ade6ad

Parents:

00ea2a7

Message:

give mac some sleep on computation: timing issue

Files:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitpage.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (6 diffs)
• sansview/perspectives/fitting/model_thread.py (modified) (1 diff)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -142 +142 @@
         # It was found that wx >= 2.9.3 sends an event even if no size changed.
         # So manually recode the size (=x_size) and compare here.
+        """
         if self.x_size != None:
             if self.x_size == self.GetSize():
@@ -148 +149 @@
                 return
         self.x_size = self.GetSize()
+        """
         # Ready for another event
         # Do not remove this Skip. Otherwise it will get runtime error on wx>=2.9.

sansview/perspectives/fitting/fitpage.py

@@ -1619 +1619 @@
         else:
             self.enable_smearer.Enable()
-            
+
+    def _mac_sleep(self, sec=0.2):
+        """
+        Give sleep to MAC
+        """
+        if self.is_mac:
+            time.sleep(sec)
+
     def get_view_mode(self):
         """
@@ -1930 +1937 @@
             self.Layout() 
             self.Refresh() 
-        #time.sleep(0.1)  
+        self._mac_sleep(0.1)  
         #plot model ( when drawing, do not update chisqr value again)
         self._draw_model(update_chisqr=False)    

sansview/perspectives/fitting/fitting.py

@@ -50 +50 @@
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
 
-   
+if sys.platform.count("darwin")==0:
+    ON_MAC = False
+else:
+    ON_MAC = True   
 
 class Plugin(PluginBase):
@@ -513 +516 @@
                 enable1D=enable1D, enable2D=enable2D,
                 qmin=qmin, qmax=qmax)
-            #time.sleep(0.2)
-
+            self._mac_sleep(0.2)
+            
+    def _mac_sleep(self, sec=0.2):
+        """
+        Give sleep to MAC
+        """
+        if ON_MAC:
+           time.sleep(sec)
+                
     def draw_model(self, model, page_id, data=None, smearer=None,
                    enable1D=True, enable2D=False,
@@ -642 +652 @@
                                 improvement_delta=0.1)
         
-        #time.sleep(0.2)
+        self._mac_sleep(0.2)
         ## perform single fit
         
@@ -663 +673 @@
 
         self.fit_thread_list[current_page_id] = calc_fit
-        #time.sleep(0.3)
+        self._mac_sleep(0.2)
         
         #self.ready_fit(calc_fit=calc_fit)
@@ -913 +923 @@
           
         """  
+        self._mac_sleep(0.2)
         if page_id[0] in self.fit_thread_list.keys():
             del self.fit_thread_list[page_id[0]]  
@@ -984 +995 @@
             page_id = []
         ## fit more than 1 model at the same time 
-        #time.sleep(0.2)  
+        self._mac_sleep(0.2) 
         try:
             msg = "" 

sansview/perspectives/fitting/model_thread.py

@@ -21 +21 @@
                  updatefn   = None,
                  update_chisqr=True,
-                 yieldtime  = 0.01,
-                 worktime   = 0.01
+                 yieldtime  = 0.04,
+                 worktime   = 0.04
                  ):
         CalcThread.__init__(self,completefn,