Changeset 6f16e25 in sasview for src/sas/guiframe/local_perspectives/plotting/Plotter1D.py

Timestamp:

Oct 21, 2015 8:35:00 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

85130cb

Parents:

2d88fc4

Message:

clean up wx id handling in fitting perspective

File:

• src/sas/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (13 diffs)

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

@@ -19 +19 @@
 from sas.guiframe.events import StatusEvent
 from sas.guiframe.events import PanelOnFocusEvent
-from sas.guiframe.utils import PanelMenu
+from sas.guiframe.utils import PanelMenu, IdList
 from sas.guiframe.panel_base import PanelBase
 from sas.guiframe.gui_style import GUIFRAME_ICON
@@ -35 +35 @@
     """return the key of dictionary dic given the value"""
     return [k for k, v in dic.iteritems() if v == val][0]
-
-class IdCollection:
-    def __init__(self):
-        self._ids = []
-        self._index = 0
-    def next(self):
-        if len(self._ids) == self._index:
-           self._ids.append(wx.NewId())
-        self._index += 1
-        return self._ids[self._index-1]
-    def reset(self):
-        self._index = 0
-
 
 class ModelPanel1D(PlotPanel, PanelBase):
@@ -63 +50 @@
     ## Group ID
     group_id = None
-    _menu_ids = IdCollection()
+    _menu_ids = IdList()
 
     def __init__(self, parent, id=-1, color=None,
@@ -80 +67 @@
 
         self._available_data = []
-        self._menu_add_ids = []
         self._symbol_labels = self.get_symbol_label()
         self._color_labels = self.get_color_label()
@@ -568 +554 @@
         self._slicerpop.set_plots(self.plots)
         self._slicerpop.set_graph(self.graph)
-        self._menu_ids.reset()
+        ids = iter(self._menu_ids)
         if not self.graph.selected_plottable in self.plots:
             # Various plot options
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Save Image', 'Save image as PNG')
             wx.EVT_MENU(self, wx_id, self.onSaveImage)
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Print Image', 'Print image ')
             wx.EVT_MENU(self, wx_id, self.onPrint)
 
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Copy to Clipboard',
                                    'Copy to the clipboard')
@@ -595 +581 @@
                     continue
 
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             plot_menu.Append(wx_id, "&DataInfo", name)
             wx.EVT_MENU(self, wx_id, self. _onDataShow)
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             plot_menu.Append(wx_id, "&Save Points as a File", name)
             wx.EVT_MENU(self, wx_id, self._onSave)
@@ -605 +591 @@
             # add menu of other plugins
             item_list = self.parent.get_current_context_menu(self)
-
             if (not item_list == None) and (not len(item_list) == 0):
-                for item in item_list:
+                # Note: reusing menu ids in submenu.  This code works because
+                # IdItems is set up as a lazy iterator returning each id in
+                # sequence, creating new ids as needed so it never runs out.
+                # zip() is set up to stop when any iterator is empty, so it
+                # only asks for the number of ids in item_list.
+                for item, wx_id in zip(item_list, self._menu_ids):
 
                     try:
-                        wx_id = self._menu_ids.next()
                         plot_menu.Append(wx_id, item[0], name)
                         wx.EVT_MENU(self, wx_id, item[2])
@@ -620 +609 @@
 
             if self.parent.ClassName.count('wxDialog') == 0:
-                wx_id = self._menu_ids.next()
+                wx_id = ids.next()
                 plot_menu.Append(wx_id, '&Linear Fit', name)
                 wx.EVT_MENU(self, wx_id, self.onFitting)
                 plot_menu.AppendSeparator()
 
-                wx_id = self._menu_ids.next()
+                wx_id = ids.next()
                 plot_menu.Append(wx_id, "Remove", name)
                 wx.EVT_MENU(self, wx_id, self._onRemove)
                 if not plot.is_data:
-                    wx_id = self._menu_ids.next()
+                    wx_id = ids.next()
                     plot_menu.Append(wx_id, '&Freeze', name)
                     wx.EVT_MENU(self, wx_id, self.onFreeze)
@@ -635 +624 @@
 
                 if plot.is_data:
-                    wx_id = self._menu_ids.next()
+                    wx_id = ids.next()
                     self.hide_menu = plot_menu.Append(wx_id, "Hide Error Bar", name)
 
@@ -649 +638 @@
                     plot_menu.AppendSeparator()
 
-                wx_id = self._menu_ids.next()
+                wx_id = ids.next()
                 plot_menu.Append(wx_id, '&Modify Plot Property', name)
                 wx.EVT_MENU(self, wx_id, self.createAppDialog)
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             # plot_menu.SetTitle(name)
             self._slicerpop.AppendMenu(wx_id, '&%s' % name, plot_menu)
@@ -661 +650 @@
             loc_menu = wx.Menu()
             for label in self._loc_labels:
-                wx_id = self._menu_ids.next()
+                wx_id = ids.next()
                 loc_menu.Append(wx_id, str(label), str(label))
                 wx.EVT_MENU(self, wx_id, self.onChangeLegendLoc)
 
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Modify Graph Appearance',
                                    'Modify graph appearance')
@@ -673 +662 @@
 
             if self.position != None:
-                wx_id = self._menu_ids.next()
+                wx_id = ids.next()
                 self._slicerpop.Append(wx_id, '&Add Text')
                 wx.EVT_MENU(self, wx_id, self._on_addtext)
-                wx_id = self._menu_ids.next()
+                wx_id = ids.next()
                 self._slicerpop.Append(wx_id, '&Remove Text')
                 wx.EVT_MENU(self, wx_id, self._on_removetext)
                 self._slicerpop.AppendSeparator()
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Change Scale')
             wx.EVT_MENU(self, wx_id, self._onProperties)
             self._slicerpop.AppendSeparator()
-            wx_id = self._menu_ids.next()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Reset Graph Range')
             wx.EVT_MENU(self, wx_id, self.onResetGraph)
@@ -690 +679 @@
             if self.parent.ClassName.count('wxDialog') == 0:
                 self._slicerpop.AppendSeparator()
-                wx_id = self._menu_ids.next()
+                wx_id = ids.next()
                 self._slicerpop.Append(wx_id, '&Window Title')
                 wx.EVT_MENU(self, wx_id, self.onChangeCaption)