Changeset 7a955a9 in sasview

Timestamp:

Apr 28, 2011 2:19:20 PM (14 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:

cf14ceb

Parents:

5e8e615

Message:

working on splashpage

Location:

guiframe

Files:

• config.py (modified) (1 diff)
• gui_manager.py (modified) (5 diffs)
• gui_statusbar.py (modified) (1 diff)

guiframe/config.py

@@ -59 +59 @@
 SPLASH_SCREEN_WIDTH = 500
 SPLASH_SCREEN_HEIGHT = 300
-SS_MAX_DISPLAY_TIME = 3000 #3 sec
+SS_MAX_DISPLAY_TIME = 4000 #4 sec
 PLOPANEL_WIDTH = 350
 PLOPANEL_HEIGTH = 350

guiframe/gui_manager.py

@@ -264 +264 @@
         self.post_init()
         #self.show_welcome_panel(None)
-        self.Show(True)
+        #self.Show(True)
         #self._check_update(None)
              
@@ -2185 +2185 @@
                                  gui_style = DEFAULT_STYLE,
                                  size=size) 
+        self.frame.Hide()
         self.s_screen = None
         try:
@@ -2203 +2204 @@
                 self.frame.Show()   
         except:
-           msg = "Cannot display splash screen\n"
-           msg += str (sys.exc_value)
-           logging.error(msg)
-           self.frame.Show()
+            if self.s_screen is not None:
+                self.s_screen.Close()
+            msg = "Cannot display splash screen\n"
+            msg += str (sys.exc_value)
+            logging.error(msg)
+            self.frame.Show()
            
         if hasattr(self.frame, 'special'):
@@ -2255 +2258 @@
             raise
         self.frame.build_gui()
-        if self.s_screen is not None and self.s_screen.IsShown():
-            self.s_screen.Close()
+        #if self.s_screen is not None and self.s_screen.IsShown():
+        #    self.s_screen.Close()
         
     def set_welcome_panel(self, panel_class):
@@ -2335 +2338 @@
                         parent=parent,
                         id=wx.ID_ANY)
-
+        from gui_statusbar import SPageStatusbar
+        statusBar = SPageStatusbar(s_screen)
+        s_screen.SetStatusBar(statusBar)
         s_screen.Bind(wx.EVT_CLOSE, self.on_close_splash_screen)
         s_screen.Show()

guiframe/gui_statusbar.py

@@ -295 +295 @@
         
         
+class SPageStatusbar(wxStatusB):
+    def __init__(self, parent, timeout=None, *args, **kwds):
+        wxStatusB.__init__(self, parent, *args, **kwds)
+        self.SetFieldsCount(1) 
+        self.timeout = timeout
+        self.gauge = wx.Gauge(self,style=wx.GA_HORIZONTAL, size=parent.GetSize())
+        rect = self.GetFieldRect(0)
+        self.gauge.SetPosition((rect.x , rect.y ))
+        if self.timeout is not None:
+            self.gauge.SetRange(int(self.timeout))
+        self.timer = wx.Timer(self, -1) 
+        self.Bind(wx.EVT_TIMER, self._on_time, self.timer) 
+        self.timer.Start(1)
+        self.pos = 0
+       
+    def _on_time(self, evt): 
+        """
+        Update the progress bar while the timer is running 
+        
+        :param evt: wx.EVT_TIMER 
+  
+        """ 
+        # Check stop flag that can be set from non main thread 
+        if self.timeout is None and self.timer.IsRunning(): 
+            self.gauge.Pulse()
+            
+        
 if __name__ == "__main__":
     app = wx.PySimpleApp()
     frame = wx.Frame(None, wx.ID_ANY, 'test frame')
-    statusBar = StatusBar(frame, wx.ID_ANY)
+    #statusBar = StatusBar(frame, wx.ID_ANY)
+    statusBar = SPageStatusbar(frame)
     frame.SetStatusBar(statusBar)
     frame.Show(True)
-    event = MessageEvent()
-    event.type = "progress"
-    event.status  = "statusbar...."
-    event.info = "error"
-    statusBar.set_status(event=event)
+    #event = MessageEvent()
+    #event.type = "progress"
+    #event.status  = "statusbar...."
+    #event.info = "error"
+    #statusBar.set_status(event=event)
     app.MainLoop()