support for shared axes

jdh2358 · jdh2358 · commit 102cc69a160c · 2005-01-27T23:02:41.000Z
svn path=/trunk/matplotlib/; revision=892
diff --git a/examples/shared_axis_demo.py b/examples/shared_axis_demo.py
@@ -19,7 +19,7 @@
 If you want to turn off the ticklabels for a given axes (eg on
 subplot(211) or subplot(212), you cannot do the standard trick
 
-   set(ax2, =[])
+   set(ax2, xticklabels=[])
 
 because this changes the tick Formatter, which is shared among all
 axes.  But you can alter the visibility of the labels, which is a
@@ -37,12 +37,11 @@
 s3 = sin(4*pi*t)
 ax1 = subplot(311)
 plot(t,s1)
-plot(t, s2)
 set( ax1.get_xticklabels(), fontsize=6)
 
 ## share x only
 ax2 = subplot(312, sharex=ax1)
-
+plot(t, s2)
 # make these tick labels invisible
 set( ax2.get_xticklabels(), visible=False)
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -12,7 +12,7 @@
 from artist import Artist
 from axis import XAxis, YAxis
 from cbook import iterable, is_string_like, flatten, enumerate, \
-     allequal, dict_delall, strip_math, popd, silent_list
+     allequal, dict_delall, strip_math, popd, popall, silent_list
 from collections import RegularPolyCollection, PolyCollection, LineCollection
 from colors import colorConverter, normalize, Colormap, LinearSegmentedColormap
 import cm
@@ -319,11 +319,15 @@ def __init__(self, fig, rect,
         Artist.__init__(self)
         self._position = map(makeValue, rect)
         # must be set before set_figure
-        self._sharex = sharex # I use sharex's
+        self._sharex = sharex 
         self._sharey = sharey
 
-        
         self.set_figure(fig)
+        
+        self.xaxis = XAxis(self)
+        self.yaxis = YAxis(self)
+        
+
 
         if axisbg is None: axisbg = rcParams['axes.facecolor']
         self._axisbg = axisbg
@@ -600,18 +604,16 @@ def _set_artist_props(self, a):
     def cla(self):
         'Clear the current axes'
 
-
-        # TODO: don't recreate x and y axis instances on cla, simply
-        # clear them
-        self.xaxis = XAxis(self)
-        self.yaxis = YAxis(self)
+        self.xaxis.cla()
+        self.yaxis.cla()
+        
 
         if self._sharex is not None:
-            self.xaxis._major = self._sharex.xaxis._major
-            self.xaxis._minor = self._sharex.xaxis._minor            
+            self.xaxis.major = self._sharex.xaxis.major
+            self.xaxis.minor = self._sharex.xaxis.minor            
         if self._sharey is not None:
-            self.yaxis._major = self._sharey.yaxis._major
-            self.yaxis._minor = self._sharey.yaxis._minor            
+            self.yaxis.major = self._sharey.yaxis.major
+            self.yaxis.minor = self._sharey.yaxis.minor            
 
         self._get_lines = _process_plot_var_args()
         self._get_patches_for_fill = _process_plot_var_args('fill')
@@ -3391,10 +3393,6 @@ def __init__(self, *args, **kwarg):
         self.rgridlines = []        
         Axes.__init__(self, *args, **kwarg)
 
-    def _popall(self, seq):
-        'empty a list'
-        for i in range(len(seq)): seq.pop()
-        
     def _set_lim_and_transforms(self):
         """
         set the dataLim and viewLim BBox attributes and the
@@ -3513,7 +3511,7 @@ def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
 ACCEPTS: sequence of floats
         """
 
-        self._popall(self.rgridlines)
+        popall(self.rgridlines)
         theta = linspace(0,2*math.pi, self.RESOLUTION)
         ls = rcParams['grid.linestyle']
         color = rcParams['grid.color']
@@ -3526,7 +3524,7 @@ def set_rgrids(self, radii, labels=None, angle=22.5, **kwargs):
             self.rgridlines.append(line)
 
 
-        self._popall(self.rgridlabels)
+        popall(self.rgridlabels)
 
         
         color = rcParams['tick.color']
@@ -3572,7 +3570,7 @@ def set_thetagrids(self, angles, labels=None, fmt='%d', frac = 1.1,
 
 ACCEPTS: sequence of floats
         """
-        self._popall(self.thetagridlines)
+        popall(self.thetagridlines)
         ox, oy = 0,0
         ls = rcParams['grid.linestyle']
         color = rcParams['grid.color']
@@ -3585,7 +3583,7 @@ def set_thetagrids(self, angles, labels=None, fmt='%d', frac = 1.1,
             line.set_transform(self.transData)
             self.thetagridlines.append(line)
 
-        self._popall(self.thetagridlabels)
+        popall(self.thetagridlabels)
 
         color = rcParams['tick.color']
 
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -7,7 +7,7 @@
      nonzero, take, Float, log10, logical_and
 
 from artist import Artist
-from cbook import enumerate, silent_list
+from cbook import enumerate, silent_list, popall
 from lines import Line2D, TICKLEFT, TICKRIGHT, TICKUP, TICKDOWN
 from mlab import linspace
 from matplotlib import rcParams
@@ -441,9 +441,17 @@ def __init__(self, axes):
         self.set_figure(axes.figure)
         
         self.axes = axes
+        self.major = Ticker()
+        self.minor = Ticker()
+        self.label = self._get_label()
+        self.majorTicks = []
+        self.minorTicks = []
+        
 
-        self._major = Ticker()
-        self._minor = Ticker()
+        self.cla()
+        
+    def cla(self):
+        'clear the current axis'
         self.set_major_locator(AutoLocator())
         self.set_major_formatter(ScalarFormatter())
         self.set_minor_locator(NullLocator())
@@ -452,15 +460,18 @@ def __init__(self, axes):
         # whether the grids are on
         self._gridOnMajor = rcParams['axes.grid']  
         self._gridOnMinor = False
-
-        self.label = self._get_label()
+        
+        self.label.set_text('')
         self._set_artist_props(self.label)
 
         # build a few default ticks; grow as necessary later; only
         # define 1 so properties set on ticks will be copied as they
         # grow
-        self.majorTicks = [self._get_tick(major=True)  for i in range(1)]
-        self.minorTicks = [self._get_tick(major=False) for i in range(1)]       
+
+        popall(self.majorTicks)
+        popall(self.minorTicks)        
+        self.majorTicks.extend([self._get_tick(major=True)  for i in range(1)])
+        self.minorTicks.extend([self._get_tick(major=False) for i in range(1)])
         
     def get_view_interval(self):
         'return the Interval instance for this axis view limits'
@@ -482,9 +493,9 @@ def draw(self, renderer, *args, **kwargs):
         ticklabelBoxes2 = []
         
         majorTicks = self.get_major_ticks()
-        majorLocs = self._major.locator()
-        self._major.formatter.set_locs(majorLocs)
-        majorLabels = [self._major.formatter(val, i) for i, val in enumerate(majorLocs)]
+        majorLocs = self.major.locator()
+        self.major.formatter.set_locs(majorLocs)
+        majorLabels = [self.major.formatter(val, i) for i, val in enumerate(majorLocs)]
 
 
         seen = {}
@@ -506,9 +517,9 @@ def draw(self, renderer, *args, **kwargs):
                 ticklabelBoxes2.append(extent)
 
         minorTicks = self.get_minor_ticks()
-        minorLocs = self._minor.locator()
-        self._minor.formatter.set_locs(minorLocs)
-        minorLabels = [self._minor.formatter(val, i) for i, val in enumerate(minorLocs)]
+        minorLocs = self.minor.locator()
+        self.minor.formatter.set_locs(minorLocs)
+        minorLabels = [self.minor.formatter(val, i) for i, val in enumerate(minorLocs)]
 
 
         for tick, loc, label in zip(minorTicks, minorLocs, minorLabels):
@@ -575,7 +586,7 @@ def get_ticklines(self):
 
     def get_ticklocs(self):
         "Get the tick locations in data coordinates as a Numeric array"
-        return self._major.locator()
+        return self.major.locator()
 
     def _get_tick(self, major):
         'return the default tick intsance'
@@ -598,24 +609,24 @@ def _copy_tick_props(self, src, dest):
 
     def get_major_locator(self):
         'Get the locator of the major ticker'
-        return self._major.locator 
+        return self.major.locator 
 
     def get_minor_locator(self):
         'Get the locator of the minor ticker'
-        return self._minor.locator 
+        return self.minor.locator 
 
     def get_major_formatter(self):
         'Get the formatter of the major ticker'
-        return self._major.formatter 
+        return self.major.formatter 
 
     def get_minor_formatter(self):
         'Get the formatter of the minor ticker'
-        return self._minor.formatter 
+        return self.minor.formatter 
         
     def get_major_ticks(self):
         'get the tick instances; grow as necessary'
 
-        numticks = len(self._major.locator())
+        numticks = len(self.major.locator())
 
         if len(self.majorTicks)<numticks:
             # update the new tick label properties from the old
@@ -633,7 +644,7 @@ def get_major_ticks(self):
 
     def get_minor_ticks(self):
         'get the minor tick instances; grow as necessary'
-        numticks = len(self._minor.locator())
+        numticks = len(self.minor.locator())
         if len(self.minorTicks)<numticks:
             protoTick = self.minorTicks[0]
             for i in range(numticks-len(self.minorTicks)):
@@ -671,38 +682,38 @@ def set_major_formatter(self, formatter):
 Set the formatter of the major ticker
 
 ACCEPTS: A Formatter instance"""
-        self._major.formatter = formatter
-        self._major.formatter.set_view_interval( self.get_view_interval() )
-        self._major.formatter.set_data_interval( self.get_data_interval() )
+        self.major.formatter = formatter
+        self.major.formatter.set_view_interval( self.get_view_interval() )
+        self.major.formatter.set_data_interval( self.get_data_interval() )
 
     def set_minor_formatter(self, formatter):
         """
 Set the formatter of the minor ticker
 
 ACCEPTS: A Formatter instance"""
-        self._minor.formatter = formatter
-        self._minor.formatter.set_view_interval( self.get_view_interval() )
-        self._minor.formatter.set_data_interval( self.get_data_interval() )
+        self.minor.formatter = formatter
+        self.minor.formatter.set_view_interval( self.get_view_interval() )
+        self.minor.formatter.set_data_interval( self.get_data_interval() )
 
 
     def set_major_locator(self, locator):
         """
 Set the locator of the major ticker
 
 ACCEPTS: a Locator instance"""
-        self._major.locator = locator
-        self._major.locator.set_view_interval( self.get_view_interval() )
-        self._major.locator.set_data_interval( self.get_data_interval() )
+        self.major.locator = locator
+        self.major.locator.set_view_interval( self.get_view_interval() )
+        self.major.locator.set_data_interval( self.get_data_interval() )
 
 
     def set_minor_locator(self, locator):
         """
 Set the locator of the minor ticker
 
 ACCEPTS: a Locator instance"""
-        self._minor.locator = locator
-        self._minor.locator.set_view_interval( self.get_view_interval() )
-        self._minor.locator.set_data_interval( self.get_data_interval() )
+        self.minor.locator = locator
+        self.minor.locator.set_view_interval( self.get_view_interval() )
+        self.minor.locator.set_data_interval( self.get_data_interval() )
                
     def set_ticklabels(self, ticklabels, *args, **kwargs):
         """
@@ -740,11 +751,11 @@ def _update_label_postion(self, bboxes):
 
     def pan(self, numsteps):
         'Pan numticks (can be positive or negative)'
-        self._major.locator.pan(numsteps)
+        self.major.locator.pan(numsteps)
 
     def zoom(self, direction):
         "Zoom in/out on axis; if direction is >0 zoom in, else zoom out"
-        self._major.locator.zoom(direction)
+        self.major.locator.zoom(direction)
         
 class XAxis(Axis):
     __name__ = 'xaxis'
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -528,3 +528,6 @@ def remove(self, o):
             if thiso==o: continue
             else: self.push(thiso)
         
+def popall(seq):
+    'empty a list'
+    for i in xrange(len(seq)): seq.pop()
