Changeset 04349fe in sasview

Timestamp:

Apr 12, 2010 1:57:59 PM (15 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:

89c0919

Parents:

b3644f3

Message:

working on the status bar

Location:

guiframe

Files:

• data_loader.py (modified) (1 diff)
• statusbar.py (modified) (8 diffs)

guiframe/data_loader.py

@@ -158 +158 @@
         ## Creating a Data2D with output
         if hasattr(output,'data'):
+            msg = "Loading 2D data: %s"%output.filename
+            wx.PostEvent(parent, StatusEvent(status=msg, info="info", type="stop"))
             new_plot = Data2D(image=None, err_image=None)
       

guiframe/statusbar.py

@@ -41 +41 @@
         
          ## Current progress value of the bar 
+         self.nb_start = 0
+         self.nb_progress = 0
+         self.nb_stop = 0
          self.progress = 0      
          self.timer = wx.Timer(self, -1) 
@@ -57 +60 @@
         """
         wxStatusB.SetStatusText(self, text, MSG_POSITION)
+        icon_bmp =  wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, wx.ART_TOOLBAR)
+        self.bitmap_bt_warning.SetBitmapLabel(icon_bmp)
         
     def PopStatusText(self, *args, **kwds):
@@ -64 +69 @@
         wxStatusB.PushStatusText(self, field=MSG_POSITION,string=string)
         
+    def enable_clear_gauge(self):
+        """
+        """
+        flag = False
+        if (self.nb_start <= self.nb_stop) or (self.nb_progress <= self.nb_stop):
+            flag = True
+        return flag
+    
     def OnTimer_stop(self, evt): 
         """Clear the progress bar
@@ -74 +87 @@
         self.timer_stop.Stop() 
         self.clear_gauge(msg="")
+        self.nb_progress = 0 
+        self.nb_start = 0 
+        self.nb_stop = 0
        
     def OnTimer(self, evt): 
@@ -83 +99 @@
         if self.timer.IsRunning(): 
             self.gauge.Pulse()
-    """   
-    def set_progress(self): 
-        #Set the gauge value given the status of a thread
-        self.gauge.Show(True)
-        if self.timer.IsRunning(): 
-            while(self.thread.isrunning()):
-                self.progress += 1
-                # Update the progress value if it is less than the range 
-                if self.progress < self.gauge.GetRange()-20: 
-                    self.gauge.SetValue(int(self.progress)) 
-                else:
-                    self.gauge.SetValue(70) 
-                    self.progress = 0
-                    self.timer.Stop()
-            self.timer.Stop()
-            self.gauge.SetValue(90) 
-            self.progress =0
-    """        
+   
     def clear_gauge(self, msg=""):
         """
             Hide the gauge
         """
-        #self.SetStatusText(str(msg), MSG_POSITION)
         self.progress = 0
         self.gauge.SetValue(0)
@@ -144 +142 @@
         self.gauge.Show(True)
         if type.lower()=="start":
+            self.nb_start += 1
             self.timer.Stop()
             self.progress += 10
@@ -151 +150 @@
                 self.gauge.SetValue(int(self.progress)) 
         if type.lower()=="progress":
+            self.nb_progress += 1
             self.timer.Start(100)
             self.gauge.Pulse()
@@ -159 +159 @@
                 self.gauge.SetValue(int(self.progress))   
         if type.lower()=="stop":
+            self.nb_stop += 1
             self.gauge.Show(True)
-            self.timer.Stop()
-            self.progress = 0
-            self.gauge.SetValue(90) 
-            self.timer_stop.Start(3) 
+            print "self.enable_clear_gauge()",self.enable_clear_gauge()
+            if self.enable_clear_gauge():
+                self.timer.Stop()
+                self.progress = 0
+                self.gauge.SetValue(90) 
+                self.timer_stop.Start(3) 
                     
     def set_status(self, event):