Changeset 7dfdd56 in sasview

Timestamp:

Apr 25, 2012 9:14:43 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:

567e88d

Parents:

036e9ba

Message:

Refs #57. Clean up some warnings in gui_manager.py

File:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -122 +122 @@
     custom_config = _find_local_config('custom_config', os.getcwd())
     if custom_config is None:
-        msg = "Custom_config file was not imported"
-        logging.info(msg)
+        msgConfig = "Custom_config file was not imported"
+        logging.info(msgConfig)
     else:
         logging.info("using custom_config in %s" % os.getcwd())
@@ -215 +215 @@
         """
         
-        wx.Frame.__init__(self, parent=parent, title=title, pos=pos,size=size)
+        wx.Frame.__init__(self, parent=parent, title=title, pos=pos, size=size)
         # title
         self.title = title
@@ -263 +263 @@
         #tool bar
         self._toolbar = None
+        # Status bar
+        self.sb = None
         # number of plugins
         self._num_perspectives = 0
@@ -293 +295 @@
         #data manager
         self.batch_on = False
-        from data_manager import DataManager
+        from sans.guiframe.data_manager import DataManager
         self._data_manager = DataManager()
         self._data_panel = DataPanel(parent=self)
         if self.panel_on_focus is not None:
-            self._data_panel.set_panel_on_focus(self.panel_on_focus.window_caption)
+            self._data_panel.set_panel_on_focus(
+                                self.panel_on_focus.window_caption)
         # list of plot panels in schedule to full redraw
         self.schedule = False
@@ -349 +352 @@
         t = time.localtime(time.time())
         time_str = time.strftime("%b %d %H;%M of %Y", t)
-        name = "Batch"  +  time_str
         details = "File Generated by %s : %s" % (APPLICATION_NAME,
                                                      str(plugin_name))
@@ -492 +494 @@
             excel_app.Visible = 1
         except:
-            msg = "Error occured when calling Excel\n"
-            msg += "Check that Excel in installed in this machine or \n"
-            msg += "Check that %s really exists.\n" % str(file_name)
+            msg = "Error occured when calling Excel\n" +
+                        "Check that Excel in installed in this machine or \n" +
+                        "Check that %s really exists.\n" % str(file_name)
             wx.PostEvent(self, StatusEvent(status=msg,
                                              info="error"))
@@ -577 +579 @@
     def get_data_manager(self):
         """
+        return the data manager.
         """
         return self._data_manager
@@ -582 +585 @@
     def get_toolbar(self):
         """
+        return the toolbar.
         """
         return self._toolbar
@@ -622 +626 @@
             self._data_panel.disable_app_combo(enable)
         if self._menubar is not None:
-            for menu,_ in self._menubar.GetMenus():
+            for menu, _ in self._menubar.GetMenus():
                 for items in menu.GetMenuItems():
                     items.Enable(enable)
@@ -677 +681 @@
     def build_gui(self):
         """
+        Build the GUI by setting up the toolbar, menu and layout.
         """
         # set tool bar
@@ -720 +725 @@
         """
         # Status bar
-        from gui_statusbar import StatusBar
+        from sans.guiframe.gui_statusbar import StatusBar
         self.sb = StatusBar(self, wx.ID_ANY)
         self.SetStatusBar(self.sb)
@@ -750 +755 @@
         field = self.sb.get_msg_position()
         wx.Frame.PushStatusText(self, field=field, 
-                                string="FIXME: PushStatusText called without text")
+                        string="FIXME: PushStatusText called without text")
 
     def add_perspective(self, plugin):
@@ -807 +812 @@
         
         """
-        import imp
         plugins = []
         # Go through files in panels directory
@@ -935 +939 @@
         data_pane = self._mgr.GetPane(self.panels["data_panel"].window_name)
         if style != GUIFRAME.MANAGER_ON:
-            self._mgr.GetPane(self.panels["data_panel"].window_name).Hide()
+            data_pane.Hide()
         else:
-            self._mgr.GetPane(self.panels["data_panel"].window_name).Show()
+            data_pane.Show()
             
         # Add the panels to the AUI manager
@@ -971 +975 @@
     def update_data(self, prev_data, new_data):
         """
-        """
-        prev_id, data_state = self._data_manager.update_data(prev_data=prev_data, 
-                                       new_data=new_data)
+        Update the data.
+        """
+        prev_id, data_state = self._data_manager.update_data(
+                              prev_data=prev_data, new_data=new_data)
         
         self._data_panel.remove_by_id(prev_id)
@@ -980 +985 @@
     def update_theory(self, data_id, theory, state=None):
         """
+        Update the theory
         """ 
         data_state = self._data_manager.update_theory(data_id=data_id, 
@@ -1010 +1016 @@
     def delete_data(self, data):
         """
+        Delete the data.
         """
         self._current_perspective.delete_data(data)
@@ -1233 +1240 @@
             menu_list = self._current_perspective.populate_menu(self)
             if menu_list:
-                for (menu,name) in menu_list:
+                for (menu, name) in menu_list:
                     if self._applications_menu_pos == -1:
                         self._menubar.Append(menu, name)
                     else:
-                        self._menubar.Insert(self._applications_menu_pos, menu, name)
+                        self._menubar.Insert(self._applications_menu_pos, 
+                                             menu, name)
                     self._applications_menu_name = name
                   
@@ -1263 +1271 @@
             self._help_menu.AppendSeparator()
             id = wx.NewId()
-            self._help_menu.Append(id,'&Tutorial', 'Software tutorial')
+            self._help_menu.Append(id, '&Tutorial', 'Software tutorial')
             wx.EVT_MENU(self, id, self._onTutorial)
             
@@ -1269 +1277 @@
             self._help_menu.AppendSeparator()
             id = wx.NewId()
-            self._help_menu.Append(id,'&About', 'Software information')
+            self._help_menu.Append(id, '&About', 'Software information')
             wx.EVT_MENU(self, id, self._onAbout)
         
@@ -1300 +1308 @@
         style1 = self.__gui_style & GUIFRAME.TOOLBAR_ON
         if style1 == GUIFRAME.TOOLBAR_ON:
-            self._toolbar_menu = self._view_menu.Append(id,'&Hide Toolbar', '')
+            self._toolbar_menu = self._view_menu.Append(id, '&Hide Toolbar', '')
         else:
-            self._toolbar_menu = self._view_menu.Append(id,'&Show Toolbar', '')
+            self._toolbar_menu = self._view_menu.Append(id, '&Show Toolbar', '')
         wx.EVT_MENU(self, id, self._on_toggle_toolbar)
                     
@@ -1314 +1322 @@
             self._view_menu.AppendSeparator()
             id = wx.NewId()
-            preference_menu = self._view_menu.Append(id,'Startup Setting', '')
+            preference_menu = self._view_menu.Append(id, 'Startup Setting', '')
             wx.EVT_MENU(self, id, self._on_preference_menu)
             
@@ -1396 +1404 @@
             id = wx.NewId()
             hint = "Clean up the dock area for plots on new-plot"
-            preferences_menu.AppendCheckItem(id, '&CleanUp Dock on NewPlot', hint)
+            preferences_menu.AppendCheckItem(id, '&CleanUp Dock on NewPlot', 
+                                             hint)
             wx.EVT_MENU(self, id, self.on_cleanup_dock)
             flag = self.cleanup_plots
@@ -1407 +1416 @@
             self._menubar.Remove(pos)
         #wx.EVT_MENU(self, id, self.show_preferences_panel)   
-        """
-        if len(self.plugins) == 2:
-            plug = self.plugins[1]
-            pers = plug.get_perspective()
-       
-            if len(pers) > 1:
-                self._window_menu = wx.Menu()
-                for item in self.panels:
-                    if item == 'default':
-                        continue
-                    panel = self.panels[item]
-                    if panel.window_name in pers:
-                        self._window_menu.Append(int(item),
-                                                  panel.window_caption,
-                                        "Show %s window" % panel.window_caption)
-                        wx.EVT_MENU(self, int(item), self.on_view)
-                self._menubar.Append(self._window_menu, '&Window')
-                """
+        #if len(self.plugins) == 2:
+        #    plug = self.plugins[1]
+        #    pers = plug.get_perspective()
+        #
+        #    if len(pers) > 1:
+        #        self._window_menu = wx.Menu()
+        #        for item in self.panels:
+        #            if item == 'default':
+        #                continue
+        #            panel = self.panels[item]
+        #            if panel.window_name in pers:
+        #                self._window_menu.Append(int(item),
+        #                                          panel.window_caption,
+        #                                "Show %s window" % panel.window_caption)
+        #                wx.EVT_MENU(self, int(item), self.on_view)
+        #        self._menubar.Append(self._window_menu, '&Window')
 
                 
     def _add_menu_application(self):
         """
-        
         # Attach a menu item for each defined perspective or application.
         # Only add the perspective menu if there are more than one perspectives
@@ -1484 +1490 @@
         #append item from plugin under menu file if necessary
         self._populate_file_menu()
-        style = self.__gui_style & GUIFRAME.DATALOADER_ON
         style1 = self.__gui_style & GUIFRAME.MULTIPLE_APPLICATIONS
         if OPEN_SAVE_MENU:
@@ -1560 +1565 @@
     def get_style(self):
         """
+        Return the gui style
         """
         return  self.__gui_style
@@ -1789 +1795 @@
     def clear_panel(self):
         """
+        Clear the panel
         """
         for item in self.panels:
@@ -1893 +1900 @@
             print log_msg
             return
-        message = ""
         log_msg = ''
         output = {}
@@ -1964 +1970 @@
             return PLUGINS_WLIST 
         try:
-            # Find the extension of the perspective and get that as 1st item in list
+            # Find the extension of the perspective 
+            # and get that as 1st item in list
             ind = None
             app_ext = self._current_perspective._extensions
@@ -1977 +1984 @@
                 plug_wlist.insert(0, ind)
                 try:
-                    plug_wlist ='|'.join(plug_wlist)
+                    plug_wlist = '|'.join(plug_wlist)
                 except:
                     plug_wlist = ''
@@ -2139 +2146 @@
             f=urllib2.urlopen(config.__update_URL__, 
                               timeout=1.0)
-            content=f.read()
+            content = f.read()
         except:
             content = "0.0.0"
@@ -2195 +2202 @@
         """
         if config._do_aboutbox:
-            import aboutbox 
+            import sans.guiframe.aboutbox 
             dialog = aboutbox.DialogAbout(None, -1, "")
             dialog.ShowModal()   
@@ -2616 +2623 @@
                 dx_val = 0.0
             if data.dxl != None:
-                if index == 0: x_st = "Xl"
+                if index == 0: 
+                    x_st = "Xl"
                 dx_val = data.dxl[index]
             elif data.dxw != None:
-                if index == 0: x_st = "Xw"
+                if index == 0: 
+                    x_st = "Xw"
                 dx_val = data.dxw[index]