Changeset 99dd722 in sasview


Ignore:
Timestamp:
Apr 25, 2012 7:42:11 AM (12 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:
1 edited

Legend:

Unmodified
Added
Removed
  • sansguiframe/src/sans/guiframe/gui_manager.py

    r567e88d r99dd722  
    27112711            y_val = data.qy_data[index] 
    27122712            i_val = data.data[index] 
    2713             if data.err_data != None: di_val = data.err_data[index] 
    2714             if data.dqx_data != None: dx_val = data.dqx_data[index] 
    2715             if data.dqy_data != None: dy_val = data.dqy_data[index] 
     2713            if data.err_data != None:  
     2714                di_val = data.err_data[index] 
     2715            if data.dqx_data != None:  
     2716                dx_val = data.dqx_data[index] 
     2717            if data.dqy_data != None:  
     2718                dy_val = data.dqy_data[index] 
    27162719            #if data.mask != None: mask_val = data.mask[index]  
    27172720   
     
    27802783                            menu.Check(True) 
    27812784                        else: 
    2782                              menu.Check(False)  
     2785                            menu.Check(False)  
    27832786            
    27842787    def set_plotpanel_floating(self, event=None): 
     
    33263329 
    33273330 
    3328 # Toy application to test this Frame 
    33293331class ViewApp(wx.App): 
    33303332    """ 
     3333    Toy application to test this Frame 
    33313334    """ 
    33323335    def OnInit(self): 
    33333336        """ 
    3334         """ 
    3335 #        global GUIFRAME_WIDTH, GUIFRAME_HEIGHT   
    3336 #         
    3337 #        displays = (wx.Display(i) for i in range(wx.Display.GetCount())) 
    3338 #        sizes = [display.GetGeometry().GetSize() for display in displays] 
    3339 #        for x in displays: 
    3340 #            print x 
    3341 #        for y in sizes: 
    3342 #            print y 
    3343 #         
    3344 #        if (GUIFRAME_WIDTH > ((wx.DisplaySize()[0]/100)*90) | GUIFRAME_HEIGHT > ((wx.DisplaySize()[1]/100)*90) ): 
    3345 #            GUIFRAME_WIDTH = (wx.DisplaySize()[0]/100)*90 
    3346 #            GUIFRAME_HEIGHT = (wx.DisplaySize()[1]/100)*90 
    3347  
    3348         pos, size = self.window_placement((GUIFRAME_WIDTH, GUIFRAME_HEIGHT))      
     3337        When initialised 
     3338        """ 
     3339        pos, size = self.window_placement((GUIFRAME_WIDTH,  
     3340                                           GUIFRAME_HEIGHT))      
    33493341        self.frame = ViewerFrame(parent=None,  
    33503342                             title=APPLICATION_NAME,  
     
    34603452        customWidth, customHeight = size 
    34613453         
    3462         # If the custom screen is bigger than the window screen than make maximum size 
     3454        # If the custom screen is bigger than the  
     3455        # window screen than make maximum size 
    34633456        if customWidth > displayWidth: 
    34643457            customWidth = displayWidth 
     
    34933486        
    34943487        # Prepare the picture.  On a 2GHz intel cpu, this takes about a second. 
    3495         x, y = parent.GetSizeTuple() 
    34963488        image = wx.Image(path, wx.BITMAP_TYPE_PNG) 
    34973489        image.Rescale(SPLASH_SCREEN_WIDTH,  
     
    35183510                        parent=parent, 
    35193511                        id=wx.ID_ANY) 
    3520         from gui_statusbar import SPageStatusbar 
     3512        from sans.guiframe.gui_statusbar import SPageStatusbar 
    35213513        statusBar = SPageStatusbar(s_screen) 
    35223514        s_screen.SetStatusBar(statusBar) 
     
    35283520    def on_close_splash_screen(self, event): 
    35293521        """ 
     3522        When the splash screen is closed. 
    35303523        """ 
    35313524        self.frame.Show(True) 
Note: See TracChangeset for help on using the changeset viewer.