Changeset 99dd722 in sasview

Timestamp:

Apr 25, 2012 9:42:11 AM (13 years ago)

Author:

Robert Whitley <robert.whitley@…>

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:

d8fe20c

Parents:

567e88d

Message:

Refs #57. Fix more warnings in gui_manager.py

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (7 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2711 +2711 @@
             y_val = data.qy_data[index]
             i_val = data.data[index]
-            if data.err_data != None: di_val = data.err_data[index]
-            if data.dqx_data != None: dx_val = data.dqx_data[index]
-            if data.dqy_data != None: dy_val = data.dqy_data[index]
+            if data.err_data != None: 
+                di_val = data.err_data[index]
+            if data.dqx_data != None: 
+                dx_val = data.dqx_data[index]
+            if data.dqy_data != None: 
+                dy_val = data.dqy_data[index]
             #if data.mask != None: mask_val = data.mask[index] 
   
@@ -2780 +2783 @@
                             menu.Check(True)
                         else:
-                             menu.Check(False) 
+                            menu.Check(False) 
            
     def set_plotpanel_floating(self, event=None):
@@ -3326 +3329 @@
 
 
-# Toy application to test this Frame
 class ViewApp(wx.App):
     """
+    Toy application to test this Frame
     """
     def OnInit(self):
         """
-        """
-#        global GUIFRAME_WIDTH, GUIFRAME_HEIGHT  
-#        
-#        displays = (wx.Display(i) for i in range(wx.Display.GetCount()))
-#        sizes = [display.GetGeometry().GetSize() for display in displays]
-#        for x in displays:
-#            print x
-#        for y in sizes:
-#            print y
-#        
-#        if (GUIFRAME_WIDTH > ((wx.DisplaySize()[0]/100)*90) | GUIFRAME_HEIGHT > ((wx.DisplaySize()[1]/100)*90) ):
-#            GUIFRAME_WIDTH = (wx.DisplaySize()[0]/100)*90
-#            GUIFRAME_HEIGHT = (wx.DisplaySize()[1]/100)*90
-
-        pos, size = self.window_placement((GUIFRAME_WIDTH, GUIFRAME_HEIGHT))     
+        When initialised
+        """
+        pos, size = self.window_placement((GUIFRAME_WIDTH, 
+                                           GUIFRAME_HEIGHT))     
         self.frame = ViewerFrame(parent=None, 
                              title=APPLICATION_NAME, 
@@ -3460 +3452 @@
         customWidth, customHeight = size
         
-        # If the custom screen is bigger than the window screen than make maximum size
+        # If the custom screen is bigger than the 
+        # window screen than make maximum size
         if customWidth > displayWidth:
             customWidth = displayWidth
@@ -3493 +3486 @@
        
         # Prepare the picture.  On a 2GHz intel cpu, this takes about a second.
-        x, y = parent.GetSizeTuple()
         image = wx.Image(path, wx.BITMAP_TYPE_PNG)
         image.Rescale(SPLASH_SCREEN_WIDTH, 
@@ -3518 +3510 @@
                         parent=parent,
                         id=wx.ID_ANY)
-        from gui_statusbar import SPageStatusbar
+        from sans.guiframe.gui_statusbar import SPageStatusbar
         statusBar = SPageStatusbar(s_screen)
         s_screen.SetStatusBar(statusBar)
@@ -3528 +3520 @@
     def on_close_splash_screen(self, event):
         """
+        When the splash screen is closed.
         """
         self.frame.Show(True)