Changeset 2d88fc4 in sasview for src/sas/plottools

Timestamp:

Oct 20, 2015 8:55:16 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:

6f16e25

Parents:

6f3fea2

Message:

reduce number of NewIds? used for each plot. Refs #448.

File:

• src/sas/plottools/toolbar.py (modified) (3 diffs)

src/sas/plottools/toolbar.py

@@ -19 +19 @@
 
 class NavigationToolBar(NavigationToolbar2WxAgg):
+    _NTB2_HOME = wx.NewId()
+    _NTB2_BACK = wx.NewId()
+    _NTB2_FORWARD = wx.NewId()
+    _NTB2_PAN = wx.NewId()
+    _NTB2_ZOOM = wx.NewId()
+    _NTB2_SAVE = wx.NewId()
+    _NTB2_PRINT = wx.NewId()
+    _NTB2_RESET = wx.NewId()
+    _NTB2_COPY = wx.NewId()
     """
     Overwrite matplotlib toolbar
@@ -31 +40 @@
     def _init_toolbar(self):
         self._parent = self.canvas.GetParent()
-        self._NTB2_HOME = wx.NewId()
-        self._NTB2_BACK = wx.NewId()
-        self._NTB2_FORWARD = wx.NewId()
-        self._NTB2_PAN = wx.NewId()
-        self._NTB2_ZOOM = wx.NewId()
-        self._NTB2_SAVE = wx.NewId()
-        self._NTB2_PRINT = wx.NewId()
-        self._NTB2_RESET = wx.NewId()
 
         # for mpl 1.2+ compatibility
@@ -101 +102 @@
         """
         # Slicer plot popup menu
-        wx_id = wx.NewId()
         popup = wx.Menu()
-        popup.Append(wx_id, '&Save image', 'Save image as PNG')
-        wx.EVT_MENU(self, wx_id, self.save_figure)
+        popup.Append(self._NTB2_SAVE, '&Save image', 'Save image as PNG')
+        wx.EVT_MENU(self, self._NTB2_SAVE, self.save_figure)
 
-        wx_id = wx.NewId()
-        popup.Append(wx_id, '&Print image', 'Print image ')
-        wx.EVT_MENU(self, wx_id, self.print_figure)
+        popup.Append(self._NTB2_PRINT, '&Print image', 'Print image ')
+        wx.EVT_MENU(self, self._NTB2_PRINT, self.print_figure)
 
-        wx_id = wx.NewId()
-        popup.Append(wx_id, '&Copy to Clipboard', 'Copy image to the clipboard')
-        wx.EVT_MENU(self, wx_id, self.copy_figure)
+        popup.Append(self._NTB2_COPY, '&Copy to Clipboard', 'Copy image to the clipboard')
+        wx.EVT_MENU(self, self._NTB2_COPY, self.copy_figure)
 
         # Show the popup menu relative to the location of the toolbar