added marks axis scaled patch

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

Author: jdh2358

CHANGELOG

@@ -1,6 +1,9 @@
+2006-1-4 Added Mark's scaled axes patch for shared axis
+
+2005-12-28 Added Chris Barker's build_wxagg patch - JDH
+
 2005-12-27 Altered numerix/scipy to support new scipy package
            structure - TEO
-
 2005-12-20 Fixed Jame's Boyles date tick reversal problem - JDH
 
 2005-12-20 Added Jouni's rc patch to support lists of keys to set on -

TODO

@@ -735,4 +735,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 -- Fix latex texmanager caching bug that is preventing the cache from
    recognizing a font change
 
--- handle lineprops.glade install file
+-- handle lineprops.glade install file
+
+-- support zoom to rect in x or y only

lib/matplotlib/axes.py

@@ -3780,7 +3780,7 @@ def dist(a):
         ds.sort()
         return ds[0][1]
 
-    def set_aspect(self,aspect='normal',fixLimits=False,alignment='center'):
+    def set_aspect(self,aspect='normal',fixLimits=False):
         """
         Set aspect to 'normal' or 'equal'
             'normal' means matplotlib determines aspect ratio
@@ -3791,15 +3791,13 @@ def set_aspect(self,aspect='normal',fixLimits=False,alignment='center'):
         fixLimits: False means data limits will be changed, but height and widths of axes preserved.
                    True means height or width will be changed, but data limits preserved
 
-        alignment is 'center' or 'lowerleft', only used when fixLimits is True
-
-        ACCEPTS: str, boolean, str
+        ACCEPTS: str, boolean
         """
 
         self._aspect = aspect
         if self._aspect == 'normal':
             self.set_position( self._originalPosition )
-        elif self._aspect == 'equal':
+        elif self._aspect == 'equal' or self._aspect == 'scaled':
             figW,figH = self.get_figure().get_size_inches()
             xmin,xmax = self.get_xlim()
             ymin,ymax = self.get_ylim()
@@ -3808,17 +3806,17 @@ def set_aspect(self,aspect='normal',fixLimits=False,alignment='center'):
                 axW = w * figW; axH = h * figH
                 if (xmax-xmin) / axW > (ymax-ymin) / axH:  # y axis too long
                     axH = axW * (ymax-ymin) / (xmax-xmin)
-                    if alignment == 'center':
+                    if self._aspect == 'equal':
                         axc = b + 0.5 * h
                         h = axH / figH; b = axc - 0.5 * h
-                    elif alignment == 'lowerleft':
+                    elif self._aspect == 'scaled':
                         h = axH / figH
                 else:  # x axis too long
                     axW = axH * (xmax-xmin) / (ymax-ymin)
-                    if alignment == 'center':
+                    if self._aspect == 'equal':
                         axc = l + 0.5 * w
                         w = axW / figW; l = axc - 0.5 * w
-                    elif alignment == 'lowerleft':
+                    elif self._aspect == 'scaled':
                         w = axW / figW
                 self.set_position( (l,b,w,h) )
             else:  # Change limits on axes

lib/matplotlib/backend_bases.py

@@ -1376,14 +1376,39 @@ def release_zoom(self, event):
             a.set_xlim((x1, x2))
             a.set_ylim((y1, y2))
 
-        if a.get_aspect() == 'equal': a.set_aspect('equal',True)
+        # 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)
+                
         self.draw()
         self._xypress = None
         self._button_pressed == None
 
         self.push_current()
         self.release(event)
 
+    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)
+        l,b,w,h = a.get_position()
+        if w != wold:  # width of axes was changed
+            ratio = w / wold
+            for ax in a.get_figure().axes:  # see if any subplot shares this axis
+                if ax._sharex == a:
+                    lax,bax,wax,hax = ax.get_position()
+                    wnew = ratio * wax
+                    lnew = lax
+                    if aspect == 'equal': lnew = lax - 0.5 * ( wnew - wax )
+                    ax.set_position( [lnew, bax, wnew, hax] )
+
     def draw(self):
         'redraw the canvases, update the locators'
         for a in self.canvas.figure.get_axes():

lib/matplotlib/pylab.py

@@ -565,12 +565,12 @@ def axis(*v, **kwargs):
 
         axis('scaled') makes scale equal, changes lengths of axes while
           keeping limits of x and y axes fixed. Keeps lower left hand corner
-          in original position
+          in original position. Fixes axis limits.
 
         axis('tight') changes limits x and y axis such that all data is
           shown. If all data is already shown, it will move it to the center
           of the figure without modifying (xmax-xmin) or (ymax-ymin). Note
-          this is slightly different than in matlab.
+          this is slightly different than in matlab. Fixes axis limits.
 
         axis('normal') sets the axis to normal, i.e. turns equal scale off
 
@@ -591,13 +591,14 @@ def axis(*v, **kwargs):
             draw_if_interactive()
         elif s.lower()=='tight':
             ax.autoscale_view()
-            if ax.get_aspect() == 'equal':
-                ax.set_aspect('equal',True)
+            ax.set_autoscale_on(False)
             draw_if_interactive()
         elif s.lower()=='scaled':
-            ax.set_aspect('equal',True,'lowerleft')
+            ax.set_autoscale_on(False)
+            ax.set_aspect('scaled',True)
             draw_if_interactive()
         elif s.lower()=='normal':
+            ax.set_autoscale_on(True)
             ax.set_aspect('normal')
         else:
             raise ValueError('Unrecognized string %s to axis; try on or off' % s)

setupext.py

@@ -486,55 +486,59 @@ def build_tkagg(ext_modules, packages, numerix):
 
 
 def build_wxagg(ext_modules, packages, numerix, abortOnFailure):
-    global BUILT_WXAGG
-    if BUILT_WXAGG:
-        return
+     global BUILT_WXAGG
+     if BUILT_WXAGG:
+         return
 
-    wxconfig = find_wx_config()
+     wxconfig = find_wx_config()
 
-    # Avoid aborting the whole build process if `wx-config' can't be found and
-    # BUILD_WXAGG in setup.py is set to "auto"
-    if wxconfig is None:
-        print 'WXAgg\'s accelerator requires `wx-config\'.'
+     # Avoid aborting the whole build process if `wx-config' can't be found and
+     # BUILD_WXAGG in setup.py is set to "auto"
+     if wxconfig is None:
+         print """
+WXAgg's accelerator requires `wx-config'.
 
-        if not abortOnFailure:
-            BUILT_WXAGG = True
-            return
-        else:
-            print '''\n\
-The `wx-config\' executable could not be located in any directory of the PATH
-environment variable.  If it is in some other location or has some other name,
-set the WX_CONFIG environment variable to the full path of the execuatable.'''
-            sys.exit(1)
-    elif not check_wxpython_headers(wxconfig):
-        print 'WXAgg\'s accelerator requires the wxPython headers.'
-
-        if not abortOnFailure:
-            BUILT_WXAGG = True
-            return
-        else:
-            print '''\n\
-The wxPython header files could not be located in any of the standard include
-directories or include directories reported by `wx-config --cppflags'.'''
-            sys.exit(1)
+The `wx-config\' executable could not be located in any directory of the
+PATH environment variable. If you want to build WXAgg, and wx-config is
+in some other location or has some other name, set the WX_CONFIG
+environment variable to the full path of the executable like so:
 
-    deps = ['src/_wxagg.cpp', 'src/mplutils.cpp']#, 'src/_transforms.cpp']
-    deps.extend(glob.glob('CXX/*.cxx'))
-    deps.extend(glob.glob('CXX/*.c'))
+export WX_CONFIG=/usr/lib/wxPython-2.6.1.0-gtk2-unicode/bin/wx-config
+"""
+         if not abortOnFailure:
+             print """Building MPL without wxAgg"""
+             BUILT_WXAGG = True
+             return
+         else:
+             sys.exit(1)
+     elif not check_wxpython_headers(wxconfig):
+         print 'WXAgg\'s accelerator requires the wxPython headers.'
 
-    module = Extension('matplotlib.backends._wxagg', deps)
+         if not abortOnFailure:
+             BUILT_WXAGG = True
+             return
+         else:
+             print """
+The wxPython header files could not be located in any of the standard
+include
+directories or include directories reported by `wx-config --cppflags'."""
+             sys.exit(1)
 
-    # wxagg implicitly needs the scipy flags when targetting
-    # scipy because of src/_transforms.c
-    if 'scipy' in numerix:
-        add_scipy_flags(module)
 
-    add_agg_flags(module)  
-    add_ft2font_flags(module)
-    add_wx_flags(module, wxconfig)
+     deps = ['src/_wxagg.cpp', 'src/mplutils.cpp']
+     deps.extend(glob.glob('CXX/*.cxx'))
+     deps.extend(glob.glob('CXX/*.c'))
+
+     module = Extension('matplotlib.backends._wxagg', deps)
+
+     add_agg_flags(module)
+     add_ft2font_flags(module)
+     add_wx_flags(module, wxconfig)
+
+     ext_modules.append(module)
+     BUILT_WXAGG = True
+
 
-    ext_modules.append(module)    
-    BUILT_WXAGG = True
 
 
 def build_agg(ext_modules, packages, numerix):