Changeset 98816c43 in sasview

Timestamp:

Apr 10, 2014 11:29:35 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:

92c6c36

Parents:

062ebef

Message:

Clean up Window menu

Location:

src/sans/guiframe

Files:

• gui_manager.py (modified) (5 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (7 diffs)
• local_perspectives/plotting/Plotter2D.py (modified) (2 diffs)

src/sans/guiframe/gui_manager.py

@@ -23 +23 @@
 warnings.simplefilter("ignore")
 import logging
-#import urllib2
 import httplib
 
@@ -263 +262 @@
         self._data_menu = None
         self._view_menu = None
-        self._window_menu = None
         self._data_panel_menu = None
         self._help_menu = None
@@ -763 +761 @@
         # WX 3.0 needs us to create the menu bar first.
         self._menubar = wx.MenuBar()
-        self.SetMenuBar(self._menubar)
+        if wx.VERSION_STRING >= '3.0.0.0':
+            self.SetMenuBar(self._menubar)
         self._add_menu_file()
         self._add_menu_edit()
@@ -777 +776 @@
         # Append item from plugin under menu file if necessary
         self._populate_file_menu()
+        if not wx.VERSION_STRING >= '3.0.0.0':
+            self.SetMenuBar(self._menubar)
         
         try:
@@ -2885 +2886 @@
                     data_panel.cb_plotpanel.SetString(pos, caption)
                     data_panel.cb_plotpanel.SetStringSelection(caption)
-        # update window Show menu
-        if self._window_menu != None:
-            for item in self._window_menu.GetMenuItems():
-                pos = self._window_menu.FindItem(old_caption)
-                if self._window_menu.GetLabel(pos) == str(old_caption):
-                    self._window_menu.SetLabel(pos, caption)
-                break
         # New Caption
         pane_info.SetTitle(caption)

src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -417 +417 @@
 
     def remove_data_by_id(self, id):
-        """'
-        remove data from plot
+        """
+            Remove data from plot
         """
         if id in self.plots.keys():
@@ -430 +430 @@
             if id in theory_list.keys():
                 data = theory_list[id]
-            # Update Graph menu and help string        
-            #h_id = self.parent._window_menu.FindItem(self.window_caption)
-            if data != None:
-                if data.__class__.__name__ == 'list':
-                    label = data[0].label
-                else:
-                    label = data.label
-            else:
-                label = '???'
-            #helpString = self.parent._window_menu.GetHelpString(h_id) 
-            d_string = (' ' + str(label) +';')
-            #new_tip = helpString.replace(d_string, '')
-            #self.parent._window_menu.SetHelpString(h_id, new_tip)  
-
+                
             del self.plots[id]
             self.graph.render(self)
@@ -450 +437 @@
                 #onRemove: graph is empty must be the panel must be destroyed
                 self.parent.delete_panel(self.uid)
-            
         
     def plot_data(self, data):
@@ -480 +466 @@
                 self._onEVT_FUNC_PROPERTY()
             except Exception, exc:
-                msg=" Encountered singular points..."
                 wx.PostEvent(self.parent, StatusEvent(status=\
                     "Plotting Error: %s"% str(exc), info="error"))
@@ -498 +483 @@
                     self.canvas._onDrawIdle()
             except Exception,exc:
-                msg=" Encountered singular points..."
                 wx.PostEvent(self.parent, StatusEvent(status=\
                     "Plotting Error: %s"% str(exc), info="error"))
             self.toolbar.update()
             self.is_zoomed = False
-            # Update Graph menu and help string        
-            #pos = self.parent._window_menu.FindItem(self.window_caption)
-            helpString = 'Show/Hide Graph: '
-            for plot in  self.plots.itervalues():
-                helpString += (' ' + str(plot.label) +';')
-            #self.parent._window_menu.SetHelpString(pos, helpString)  
-                
+            
     def draw_plot(self):
         """
@@ -850 +828 @@
                         self.get_symbol_label()[info[2]] 
             self.appearance_selected_plot.label = str(info[3])
-
-            #pos = self.parent._window_menu.FindItem(self.window_caption)
-            #helpString = 'Show/Hide Graph: '
-            #for plot in  self.plots.itervalues():
-            #    helpString += (' ' + str(plot.label) + ';')
-            #    self.parent._window_menu.SetHelpString(pos, helpString)
-            #    self._is_changed_legend_label = True
-                
         self.appD.Destroy()
         self._check_zoom_plot()
-
 
     def modifyGraphAppearance(self, event):
@@ -878 +847 @@
                                   self.is_xtick, self.is_ytick)
         self.graphApp.Bind(wx.EVT_CLOSE, self.on_graphApp_close)
-    
 
     def on_graphApp_close(self, event):

src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -241 +241 @@
                                    color=self.title_color)
             self.subplot.figure.canvas.draw_idle()    
-        # Update Graph menu and help string        
-        #pos = self.parent._window_menu.FindItem(self.window_caption)
-        helpString = 'Show/Hide Graph: '
-        helpString += (' ' + str(data.label) +';')
-        #self.parent._window_menu.SetHelpString(pos, helpString)
         ## store default value of zmin and zmax 
         self.default_zmin_ctl = self.zmin_2D
@@ -458 +453 @@
         dial.Destroy()
         
-        # Update Graph menu and help string 
-        if self.title_label != None:     
-            #pos = self.parent._window_menu.FindItem(self.window_caption)
-            helpString = 'Show/Hide Graph: '
-            helpString += (' ' + str(self.title_label) +';')
-            #self.parent._window_menu.SetHelpString(pos, helpString)
-
-        
     def _onEditDetector(self, event):
         """