Changeset bf4402c3 in sasview

Timestamp:

Jan 31, 2011 2:04:51 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

cbf22e5

Parents:

8994b6b

Message:

remove unused code

Location:

guiframe

Files:

• gui_manager.py (modified) (5 diffs)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)
• plugin_base.py (modified) (1 diff)

guiframe/gui_manager.py

@@ -104 +104 @@
         self._help_menu = None
         self._tool_menu = None
+        self._plugin_menu_list = []
         ## Find plug-ins
         # Modify this so that we can specify the directory to look into
@@ -112 +113 @@
         ## List of panels
         self.panels = {}
-
-        ## Next available ID for wx gui events 
-        #TODO:  No longer used - remove all calls to this 
-        self.next_id = 20000
 
         # Default locations
@@ -143 +140 @@
         Store reference to the last panel on focus
         """
-        print "set_panel_on_focus", event.panel
         self.panel_on_focus = event.panel
         if self.panel_on_focus is not None and self._data_panel is not None:
@@ -515 +511 @@
         for item in self.plugins:
             if item != self._plotting_plugin:
-                for (self.next_id, menu, name) in \
-                    item.populate_menu(self.next_id, self):
+                for (menu, name) in \
+                    item.populate_menu(self):
                     self._menubar.Append(menu, name)
                    
@@ -567 +563 @@
         self._window_menu = wx.Menu()
         if self._plotting_plugin is not None:
-            for (self.next_id, menu, name) in \
-                self._plotting_plugin.populate_menu(self.next_id, self):
+            for (menu, name) in self._plotting_plugin.populate_menu(self):
                 self._window_menu.AppendSubMenu(menu, name)
         self._window_menu.AppendSeparator()

guiframe/local_perspectives/plotting/plotting.py

@@ -36 +36 @@
         return True
     
-    def populate_menu(self, id, parent):
+    def populate_menu(self, parent):
         """
         Create a 'Plot' menu to list the panels
@@ -50 +50 @@
                              "No plot available")
         self.menu.FindItemByPosition(0).Enable(False)
-        return [(id, self.menu, "Plot")]
+        return [(self.menu, "Plot")]
     
     def get_panels(self, parent):

guiframe/plugin_base.py

@@ -94 +94 @@
         return []
         
-    def populate_menu(self, id, parent):
+    def populate_menu(self, parent):
         """
         Create and return the list of application menu
         items for the plug-in. 
         
-        :param id: deprecated. Un-used.
         :param parent: parent window