SF.net SVN: matplotlib: [4999] trunk/matplotlib

[<md...@us...>]

Revision: 4999
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4999&view=rev
Author:   mdboom
Date:     2008-03-10 08:18:49 -0700 (Mon, 10 Mar 2008)

Log Message:
-----------
Merged revisions 4989-4998 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint

........
  r4991 | mdboom | 2008-02-29 09:04:48 -0500 (Fri, 29 Feb 2008) | 2 lines
  
  Fix classic Wx toolbar pan and zoom functions (Thanks Jeff Peery)
........
  r4997 | mdboom | 2008-03-10 11:05:30 -0400 (Mon, 10 Mar 2008) | 1 line
  
  Fix bug where Wx figures were getting shortened by the height of the status bar (Thanks, Gary Ruben)
........
  r4998 | mdboom | 2008-03-10 11:06:25 -0400 (Mon, 10 Mar 2008) | 4 lines
  
  Correcting range of subfigure values.  This is a backport of 4913 from
  the trunk: "fixed a bug where annotations w/ arrows were not getting
  the figure instance set properly"
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/backends/backend_wx.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/v0_91_maint:1-4988
   + /branches/v0_91_maint:1-4998

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-03-10 15:06:25 UTC (rev 4998)
+++ trunk/matplotlib/CHANGELOG	2008-03-10 15:18:49 UTC (rev 4999)
@@ -2,6 +2,9 @@
            buffer width/bbox width mismatch in _backend_agg's
            copy_from_bbox - DSD
 
+2008-02-29 Fix class Wx toolbar pan and zoom functions (Thanks Jeff
+           Peery) - MGD
+
 2008-02-16 Added some new rec array functionality to mlab
            (rec_summarize, rec2txt and rec_groupby).  See
            examples/rec_groupby_demo.py.  Thanks to Tim M for rec2txt.

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-03-10 15:06:25 UTC (rev 4998)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py	2008-03-10 15:18:49 UTC (rev 4999)
@@ -938,7 +938,7 @@
 
     def print_bmp(self, filename, *args, **kwargs):
         return self._print_image(filename, wx.BITMAP_TYPE_BMP, *args, **kwargs)
-    
+
     def print_jpeg(self, filename, *args, **kwargs):
         return self._print_image(filename, wx.BITMAP_TYPE_JPEG, *args, **kwargs)
     print_jpg = print_jpeg
@@ -948,14 +948,14 @@
 
     def print_png(self, filename, *args, **kwargs):
         return self._print_image(filename, wx.BITMAP_TYPE_PNG, *args, **kwargs)
-    
+
     def print_tiff(self, filename, *args, **kwargs):
         return self._print_image(filename, wx.BITMAP_TYPE_TIF, *args, **kwargs)
     print_tif = print_tiff
 
     def print_xpm(self, filename, *args, **kwargs):
         return self._print_image(filename, wx.BITMAP_TYPE_XPM, *args, **kwargs)
-    
+
     def _print_image(self, filename, filetype, *args, **kwargs):
         origBitmap   = self.bitmap
 
@@ -994,7 +994,7 @@
 
     def get_default_filetype(self):
         return 'png'
-        
+
     def realize(self):
         """
         This method will be called when the system is ready to draw,
@@ -1230,9 +1230,9 @@
         DEBUG_MSG("__init__()", 1, self)
         self.num = num
 
-        self.canvas = self.get_canvas(fig)
         statbar = StatusBarWx(self)
         self.SetStatusBar(statbar)
+        self.canvas = self.get_canvas(fig)
         self.sizer =wx.BoxSizer(wx.VERTICAL)
         self.sizer.Add(self.canvas, 1, wx.TOP | wx.LEFT | wx.EXPAND)
         # By adding toolbar in sizer, we are able to put it at the bottom
@@ -1829,28 +1829,28 @@
 
         DEBUG_MSG("panx()", 1, self)
         for a in self._active:
-            a.panx(direction)
+            a.xaxis.pan(direction)
         self.canvas.draw()
         self.canvas.Refresh(eraseBackground=False)
 
     def pany(self, direction):
         DEBUG_MSG("pany()", 1, self)
         for a in self._active:
-            a.pany(direction)
+            a.yaxis.pan(direction)
         self.canvas.draw()
         self.canvas.Refresh(eraseBackground=False)
 
     def zoomx(self, in_out):
         DEBUG_MSG("zoomx()", 1, self)
         for a in self._active:
-            a.zoomx(in_out)
+            a.xaxis.zoom(in_out)
         self.canvas.draw()
         self.canvas.Refresh(eraseBackground=False)
 
     def zoomy(self, in_out):
         DEBUG_MSG("zoomy()", 1, self)
         for a in self._active:
-            a.zoomy(in_out)
+            a.yaxis.zoom(in_out)
         self.canvas.draw()
         self.canvas.Refresh(eraseBackground=False)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.