Changeset 49d019c in sasview for src

Timestamp:

Apr 5, 2014 5:28:53 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

4d7e5d5

Parents:

9d6d5ba

Message:

Shorten the splash screen timeout. Fix data panel position on OSX.

Location:

src/sans/guiframe

Files:

• config.py (modified) (1 diff)
• gui_manager.py (modified) (7 diffs)

src/sans/guiframe/config.py

@@ -77 +77 @@
 WELCOME_PANEL_ON  = False
 TUTORIAL_PATH = None
-SS_MAX_DISPLAY_TIME = 4000 #4 sec
+SS_MAX_DISPLAY_TIME = 1500
 PLOPANEL_WIDTH = 350
 PLOPANEL_HEIGTH = 350

src/sans/guiframe/gui_manager.py

@@ -999 +999 @@
         size_t_bar = 70
         if not IS_WIN:
-            x_pos, _ = frame.GetPositionTuple()
             if IS_LINUX:
                 size_t_bar = 115
-            frame.SetPosition((x_pos, mac_pos_y + size_t_bar))
+            frame.SetPosition((0, mac_pos_y + size_t_bar))
         frame.Show(True)
         #add data panel 
@@ -1010 +1009 @@
         self.panels["data_panel"] = data_panel
         self._data_panel = data_panel
-        w, h = self._get_panels_size(self._data_panel)
-        win.SetSize((w, h))
+        d_panel_width, h = self._get_panels_size(self._data_panel)
+        win.SetSize((d_panel_width, h))
         style = self.__gui_style & GUIFRAME.MANAGER_ON
         if style != GUIFRAME.MANAGER_ON:
@@ -1018 +1017 @@
             flag = True
         if not IS_WIN:
-            x_pos, _ = win.GetPositionTuple()
-            win.SetPosition((x_pos, mac_pos_y + size_t_bar))
+            win.SetPosition((0, mac_pos_y + size_t_bar))
         win.Show(flag)
-        d_panel_width = w
         # Add the panels to the AUI manager
         for panel_class in panels:
@@ -1046 +1043 @@
             if not IS_WIN:
                 x_pos, _ = frame.GetPositionTuple()
-                frame.SetPosition((x_pos, mac_pos_y + size_t_bar))
+                frame.SetPosition((d_panel_width + 1, mac_pos_y + size_t_bar))
 
         if not IS_WIN:
@@ -1654 +1651 @@
         panel_id = str(evt.GetId())
         self.on_set_plot_focus(self.panels[panel_id])
-        self.show_panel(evt.GetId(), 'on')      
         wx.CallLater(5*TIME_FACTOR, self.set_schedule(True))
         self.set_plot_unfocus()
@@ -1780 +1776 @@
 
         self._default_save_location = os.path.dirname(path)
-        
-    def show_panel(self, uid, show=None):
-        """
-        Shows the panel with the given id
-        
-        :param uid: unique ID number of the panel to show
-        
-        """
-        #Not implemeted
-        return
         
     def load_state(self, path, is_project=False):   
@@ -3410 +3396 @@
         # case the splash screen disappears upon entering the event loop.
         s_screen = wx.SplashScreen(bitmap=bm,
-                         splashStyle=(wx.SPLASH_TIMEOUT|
-                                              wx.SPLASH_CENTRE_ON_SCREEN),
-                                 style=(wx.SIMPLE_BORDER|
-                                        wx.FRAME_NO_TASKBAR|
-                                        wx.FRAME_FLOAT_ON_PARENT),
-                                        
-                        milliseconds=SS_MAX_DISPLAY_TIME,
-                        parent=parent,
-                        id=wx.ID_ANY)
+                                   splashStyle=(wx.SPLASH_TIMEOUT|
+                                                wx.SPLASH_CENTRE_ON_SCREEN),
+                                   style=(wx.SIMPLE_BORDER|
+                                          wx.FRAME_NO_TASKBAR|
+                                          wx.FRAME_FLOAT_ON_PARENT),
+                                   milliseconds=SS_MAX_DISPLAY_TIME,
+                                   parent=parent,
+                                   id=wx.ID_ANY)
         from sans.guiframe.gui_statusbar import SPageStatusbar
         statusBar = SPageStatusbar(s_screen)