Changeset da6c9847 in sasview

Timestamp:

Apr 5, 2014 6:12:17 AM (11 years ago)

Author:

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:

a40a875

Parents:

4d7e5d5

Message:

Support matplotlib 1.2+

Location:

src/sans/plottools

Files:

• PlotPanel.py (modified) (1 diff)
• toolbar.py (modified) (5 diffs)

src/sans/plottools/PlotPanel.py

@@ -1113 +1113 @@
     @property
     def is_zoomed(self):
-        if hasattr(self.toolbar, "wx_ids"):
-            back = self.toolbar.wx_ids['Back']
-        else: # CRUFT
-            back = self.toolbar._NTB2_BACK
-        toolbar_zoomed = self.toolbar.GetToolEnabled(back)
+        toolbar_zoomed = self.toolbar.GetToolEnabled(self.toolbar.wx_ids['Back'])
         return self._is_zoomed or toolbar_zoomed
 

src/sans/plottools/toolbar.py

@@ -24 +24 @@
     def __init__(self, canvas, parent=None):
         NavigationToolbar2WxAgg.__init__(self, canvas)
-        
+
+    # CRUFT: mpl 1.1 uses save rather than save_figure
+    try: save_figure = NavigationToolbar2WxAgg.save
+    except AttributeError: pass
     def _init_toolbar(self):
         self._parent = self.canvas.GetParent()
@@ -35 +38 @@
         _NTB2_PRINT        = wx.NewId()
         _NTB2_RESET        = wx.NewId()
+
+        # for mpl 1.2+ compatibility
+        self.wx_ids = {}
+        self.wx_ids['Back'] = self._NTB2_BACK
+        self.wx_ids['Forward'] = self._NTB2_FORWARD
+        self.wx_ids['Pan'] = self._NTB2_PAN
+        self.wx_ids['Zoom'] = self._NTB2_ZOOM
 
         self.SetToolBitmapSize(wx.Size(24,24))
@@ -72 +82 @@
         bind(self, wx.EVT_TOOL, self.zoom, id=self._NTB2_ZOOM)
         bind(self, wx.EVT_TOOL, self.pan, id=self._NTB2_PAN)
-        bind(self, wx.EVT_TOOL, self.save, id=_NTB2_SAVE)
+        bind(self, wx.EVT_TOOL, self.save_figure, id=_NTB2_SAVE)
         bind(self, wx.EVT_TOOL, self.on_print, id=_NTB2_PRINT)
         bind(self, wx.EVT_TOOL, self.on_reset, id=_NTB2_RESET)
 
         self.Realize()
-        
+
     def on_menu(self, event):
         """
@@ -86 +96 @@
         except:
             logging.error("Plot toolbar could not show menu")
-        
+
     def on_reset(self, event):
         """
@@ -95 +105 @@
         except:
             logging.error("Plot toolbar could not reset plot")
-        
+
     def on_print(self, event):
         """