Another increment of aspect handling; still not finished, but

axes.set_position() now works again.

svn path=/trunk/matplotlib/; revision=2186

Author: efiring

lib/matplotlib/axes.py

@@ -341,6 +341,7 @@ def __init__(self, fig, rect,
                  ):
         Artist.__init__(self)
         self._position = map(makeValue, rect)
+        self._originalPosition = rect
         # must be set before set_figure
         self._sharex = sharex
         self._sharey = sharey
@@ -372,7 +373,6 @@ def __init__(self, fig, rect,
         # aspect ratio atribute, and original position
         self.set_aspect('auto')
         self.set_aspect_adjusts('position')
-        self._originalPosition = self.get_position()
 
         if len(kwargs): setp(self, **kwargs)
 
@@ -1403,8 +1403,8 @@ def draw(self, renderer=None, inframe=False):
             raise RuntimeError('No renderer defined')
         if not self.get_visible(): return
         renderer.open_group('axes')
-
         self.apply_aspect()
+
         try: self.transData.freeze()  # eval the lazy objects
         except ValueError:
             print >> sys.stderr, 'data freeze value error', self.get_position(), self.dataLim.get_bounds(), self.viewLim.get_bounds()
@@ -1477,7 +1477,6 @@ def draw(self, renderer=None, inframe=False):
 
         self._cachedRenderer = renderer
 
-
     def __draw_animate(self):
         # ignore for now; broken
         if self._lastRenderer is None:
@@ -2438,7 +2437,7 @@ def pcolormesh(self, *args, **kwargs):
         coords[:, 1] = Y.astype(Float32)
         #print coords
 
- 	if shading == 'faceted':
+        if shading == 'faceted':
             showedges = 1
         else:
             showedges = 0
@@ -2910,15 +2909,27 @@ def get_position(self):
         'Return the axes rectangle left, bottom, width, height'
         return [val.get() for val in self._position]
 
-    def set_position(self, pos):
+    def set_position(self, pos, which='both'):
         """
         Set the axes position with pos = [left, bottom, width, height]
         in relative 0,1 coords
 
+        There are two position variables: one which is ultimately
+        used, but which may be modified by apply_aspect, and a second
+        which is the starting point for apply_aspect.
+
+        which = 'active' to change the first;
+                'original' to change the second;
+                'both' to change both
+
         ACCEPTS: len(4) sequence of floats
         """
-        for num,val in zip(pos, self._position):
-            val.set(num)
+        if which in ('both', 'active'):
+            # Change values within self._position--don't replace it.
+            for num,val in zip(pos, self._position):
+                val.set(num)
+        if which in ('both', 'original'):
+            self._originalPosition = pos
 
     def stem(self, x, y, linefmt='b-', markerfmt='bo', basefmt='r-'):
         """
@@ -3948,25 +3959,24 @@ def dist(a):
         ds.sort()
         return ds[0][1]
 
-    def set_aspect(self, aspect='auto', fixLimits=None,
-                            aspect_adjusts='position'):
+    def set_aspect(self, aspect='auto', adjusts='position'):
         """
         aspect:
             'auto'   -  automatic; fill position rectangle with data
             'normal' -  same as 'auto'; deprecated
             'equal'  -  same scaling from data to plot units for x and y
-             A       -  a circle will be stretched such that the height
-                        is A times the width. aspect=1 is the same as
+             num     -  a circle will be stretched such that the height
+                        is num times the width. aspect=1 is the same as
                         aspect='equal'.
 
-        aspect_adjusts:
+        adjusts:
              'position' - change width or height of bounding rectangle;
                           keep it centered.
              'box_size' - as above, but anchored to lower left
              'datalim'  - change xlim or ylim
 
-        fixLimits: deprecated; False is aspect_adjusts='datalim';
-                   True is aspect_adjusts='position'
+        Note: the 'adjusts' argument is a convenience; it can be set
+        independently by set_aspect_adjusts.
 
         ACCEPTS: ['auto' | 'equal' | aspect_ratio]
         """
@@ -3977,22 +3987,20 @@ def set_aspect(self, aspect='auto', fixLimits=None,
         else:
             self._aspect = float(aspect) # raise ValueError if necessary
 
-        if fixLimits is not None:
-            if not fixLimits: aspect_adjusts = 'datalim'
-        if aspect_adjusts in ('position', 'box_size', 'datalim'):
-            self._aspect_adjusts = aspect_adjusts
+        if adjusts in ('position', 'box_size', 'datalim'):
+            self._aspect_adjusts = adjusts
         else:
             raise ValueError(
-                'aspect_adjusts must be "position", "box_size", or "datalim"')
+                'adjusts must be "position", "box_size", or "datalim"')
 
-    def set_aspect_adjusts(self, aspect_adjusts = 'position'):
+    def set_aspect_adjusts(self, adjusts = 'position'):
         """
         Must be called after set_aspect.
 
         ACCEPTS: ['position' | 'box_size' | 'datalim']
         """
-        if aspect_adjusts in ('position', 'box_size', 'datalim'):
-            self._aspect_adjusts = aspect_adjusts
+        if adjusts in ('position', 'box_size', 'datalim'):
+            self._aspect_adjusts = adjusts
         else:
             raise ValueError(
                 'argument must be "position", "box_size", or "datalim"')
@@ -4005,7 +4013,7 @@ def apply_aspect(self):
         '''
 
         if self._aspect == 'auto':
-            self.set_position( self._originalPosition )
+            self.set_position( self._originalPosition , 'active')
             return
 
         if self._aspect == 'equal':
@@ -4034,10 +4042,9 @@ def apply_aspect(self):
                 B = b + 0.5 * (h-H)
             else:
                 L,B = l,b
-            self.set_position((L,B,W,H))
+            self.set_position((L,B,W,H), 'active')
             return
 
-        self.autoscale_view()
         xmin,xmax = self.get_xlim()
         xsize = math.fabs(xmax-xmin)
         ymin,ymax = self.get_ylim()

lib/matplotlib/backend_bases.py

@@ -1333,7 +1333,7 @@ def format_deltas(event,dx,dy):
                 else:
                     ymin = lasty+alphay*(ymin-lasty)
                     ymax = lasty+alphay*(ymax-lasty)
-    
+
             a.set_xlim((xmin, xmax))
             a.set_ylim((ymin, ymax))
 
@@ -1354,15 +1354,15 @@ def release_zoom(self, event):
                 self.release(event)
                 self.draw()
                 return
-    
+
             xmin, ymin, xmax, ymax = lim
-    
+
             # zoom to rect
             lastx, lasty = a.transData.inverse_xy_tup( (lastx, lasty) )
             x, y = a.transData.inverse_xy_tup( (x, y) )
             Xmin,Xmax=a.get_xlim()
             Ymin,Ymax=a.get_ylim()
-    
+
             if Xmin < Xmax:
                 if x<lastx:  xmin, xmax = x, lastx
                 else: xmin, xmax = lastx, x
@@ -1373,7 +1373,7 @@ def release_zoom(self, event):
                 else: xmin, xmax = lastx, x
                 if xmin > Xmin: xmin=Xmin
                 if xmax < Xmax: xmax=Xmax
-    
+
             if Ymin < Ymax:
                 if y<lasty:  ymin, ymax = y, lasty
                 else: ymin, ymax = lasty, y
@@ -1384,7 +1384,7 @@ def release_zoom(self, event):
                 else: ymin, ymax = lasty, y
                 if ymin > Ymin: ymin=Ymin
                 if ymax < Ymax: ymax=Ymax
-    
+
             if self._button_pressed == 1:
                 a.set_xlim((xmin, xmax))
                 a.set_ylim((ymin, ymax))
@@ -1409,14 +1409,15 @@ def release_zoom(self, event):
                 a.set_ylim((y1, y2))
 
         # Zoom with fixed aspect; modified for shared x-axes
-        aspect = a.get_aspect()
-        if aspect == 'equal' or aspect == 'scaled':
-            self.fix_aspect_after_zoom(a)
-        else:
-            aspect_shared = ''
-            if a._sharex != None: aspect_shared = a._sharex.get_aspect()
-            if aspect_shared == 'equal' or aspect_shared == 'scaled':
-                self.fix_aspect_after_zoom(a._sharex)
+        if 0:
+            aspect = a.get_aspect()
+            if aspect == 'equal' or aspect == 'scaled':
+                self.fix_aspect_after_zoom(a)
+            else:
+                aspect_shared = ''
+                if a._sharex != None: aspect_shared = a._sharex.get_aspect()
+                if aspect_shared == 'equal' or aspect_shared == 'scaled':
+                    self.fix_aspect_after_zoom(a._sharex)
 
         self.draw()
         self._xypress = None
@@ -1429,7 +1430,7 @@ def fix_aspect_after_zoom(self,a):
         'Fix the aspect ratio after zooming in case of aspect equal or scaled'
         lold,bold,wold,hold = a.get_position()
         aspect = a.get_aspect()
-        a.set_aspect(aspect,True)
+        a.set_aspect_adjusts('datalim')
         l,b,w,h = a.get_position()
         if w != wold:  # width of axes was changed
             ratio = w / wold
@@ -1461,7 +1462,9 @@ def draw(self):
 
 
     def _update_view(self):
-        'update the viewlim and position from the view and position stack for each axes'
+        '''update the viewlim and position from the view and
+        position stack for each axes
+        '''
 
         lims = self._views()
         if lims is None:  return

lib/matplotlib/figure.py

@@ -717,11 +717,11 @@ def colorbar(self, mappable,  cax=None,
             l,b,w,h = ax.get_position()
             if orientation=='vertical':
                 neww = 0.8*w
-                ax.set_position((l,b,neww,h))
+                ax.set_position((l,b,neww,h), 'both')
                 cax = self.add_axes([l + 0.9*w, b, 0.1*w, h])
             else:
                 newh = 0.8*h
-                ax.set_position((l,b+0.2*h,w,newh))
+                ax.set_position((l,b+0.2*h,w,newh), 'both')
                 cax = self.add_axes([l, b, w, 0.1*h])
 
         else: