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

[<jd...@us...>]

Revision: 6776
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6776&view=rev
Author:   jdh2358
Date:     2009-01-10 20:52:16 +0000 (Sat, 10 Jan 2009)

Log Message:
-----------
Merged revisions 6761,6773-6774 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6774 | jdh2358 | 2009-01-10 14:44:07 -0600 (Sat, 10 Jan 2009) | 1 line
  
  fixed unit and autoscaling behavior of the ax line/span funcs
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/axes.py

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


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6773
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6774

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-01-10 20:48:49 UTC (rev 6775)
+++ trunk/matplotlib/CHANGELOG	2009-01-10 20:52:16 UTC (rev 6776)
@@ -4,6 +4,8 @@
            draw_idle patch for qt.  Closes sf patched 2497785 and
            2468809 - JDH
 
+2009-01-10 Fix bug in pan/zoom with log coordinates. - EF
+
 2009-01-06 Fix bug in setting of dashed negative contours. - EF
 
 2009-01-06 Be fault tolerant when len(linestyles)>NLev in contour. - MM

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-01-10 20:48:49 UTC (rev 6775)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-01-10 20:52:16 UTC (rev 6776)
@@ -2830,6 +2830,7 @@
 
         # We need to strip away the units for comparison with
         # non-unitized bounds
+        self._process_unit_info( ydata=y, kwargs=kwargs )
         yy = self.convert_yunits( y )
         scaley = (yy<ymin) or (yy>ymax)
 
@@ -2890,6 +2891,7 @@
 
         # We need to strip away the units for comparison with
         # non-unitized bounds
+        self._process_unit_info( xdata=x, kwargs=kwargs )
         xx = self.convert_xunits( x )
         scalex = (xx<xmin) or (xx>xmax)
 
@@ -2956,6 +2958,7 @@
         p.set_transform(trans)
         p.x_isdata = False
         self.add_patch(p)
+        self.autoscale_view(scalex=False)
         return p
     axhspan.__doc__ = cbook.dedent(axhspan.__doc__) % martist.kwdocd
 
@@ -3012,6 +3015,7 @@
         p.set_transform(trans)
         p.y_isdata = False
         self.add_patch(p)
+        self.autoscale_view(scaley=False)
         return p
     axvspan.__doc__ = cbook.dedent(axvspan.__doc__) % martist.kwdocd
 
@@ -3057,9 +3061,11 @@
                                      'list of Line2D to draw; see API_CHANGES')
 
         # We do the conversion first since not all unitized data is uniform
+        # process the unit information
+        self._process_unit_info( [xmin, xmax], y, kwargs=kwargs )
         y = self.convert_yunits( y )
-        xmin = self.convert_xunits( xmin )
-        xmax = self.convert_xunits( xmax )
+        xmin = self.convert_xunits(xmin)
+        xmax = self.convert_xunits(xmax)
 
         if not iterable(y): y = [y]
         if not iterable(xmin): xmin = [xmin]
@@ -3133,7 +3139,7 @@
                                      'collections.LineCollection and not a '
                                      'list of Line2D to draw; see API_CHANGES')
 
-        self._process_unit_info(xdata=x, ydata=ymin, kwargs=kwargs)
+        self._process_unit_info(xdata=x, ydata=[ymin, ymax], kwargs=kwargs)
 
         # We do the conversion first since not all unitized data is uniform
         x = self.convert_xunits( x )


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