Changeset ef628a1 in sasview

Timestamp:

Feb 17, 2009 12:13:12 PM (16 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:

202a7dc3

Parents:

f343069

Message:

statusbar improved

Location:

guiframe

Files:

• model_thread.py (modified) (3 diffs)
• statusbar.py (modified) (4 diffs)

guiframe/model_thread.py

@@ -110 +110 @@
         self.model = model
         self.starttime = 0
-       
+        wx.PostEvent(self.parent, StatusEvent(status=\
+                    "Start Drawing model  ",curr_thread=self,type="start"))
         
     def isquit(self):
@@ -122 +123 @@
             raise KeyboardInterrupt
         
-    def update(self, output=None, time=None):
+    def update(self, output=None):
         
         wx.PostEvent(self.parent, StatusEvent(status="Plot \
-        #updating ... %g sec" % time,curr_thread=self,type="update"))
+        #updating ... ",curr_thread=self,type="update"))
         
         
@@ -138 +139 @@
         
         self.starttime = time.time()
-        print "model_thread"
+        
+        
+        lx = len(self.x)
         wx.PostEvent(self.parent, StatusEvent(status=\
-                    "Start Drawing model %g " % (self.starttime)))
-        lx = len(self.x)
-       
+                       "Computing ",curr_thread=self,type="update"))
         for i_x in range(len(self.x)):
             # Check whether we need to bail out
-            self.update(output=output, time=time.time() )
+            self.update(output=output )
             self.isquit()
             

guiframe/statusbar.py

@@ -15 +15 @@
          self.timer = wx.Timer(self,-1) 
          self.thread= None
-         #self.Bind(wx.EVT_TIMER,self.OnTimer, self.timer) 
+         self.Bind(wx.EVT_TIMER,self.OnTimer, self.timer) 
          
     def OnTimer(self, evt): 
@@ -23 +23 @@
         """ 
         # Check stop flag that can be set from non main thread 
-        if self.thread!=None and self.thread.isrunning():
-            self.set_progress()
+        self.gauge.Pulse()
        
     def set_progress(self):
@@ -64 +63 @@
                 self.gauge.Show(True)
                 if type.lower()=="start":
+                    self.timer.Stop()
                     self.SetStatusText( str(msg), 0)
+                    self.progress +=10
+                    self.gauge.SetValue(int(self.progress)) 
                     #self.timer.Start(1000)
                     #print "went here"
@@ -71 +73 @@
                     if self.progress < self.gauge.GetRange()-20:
                         self.gauge.SetValue(int(self.progress)) 
+                if type.lower()=="progress":
+                    self.timer.Start(100)
+                    self.SetStatusText( str(msg), 0)
+                    self.gauge.Pulse()
+                    print "in progress"
+                    
                 if  type.lower()=="update":