syncing for 82

jdh2358 · jdh2358 · commit 4e97a1c0668f · 2005-06-15T20:24:58.000Z
svn path=/trunk/matplotlib/; revision=1471
diff --git a/LICENSE/LICENSE b/LICENSE/LICENSE
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.81
+LICENSE AGREEMENT FOR MATPLOTLIB 0.82
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
 2. Subject to the terms and conditions of this License Agreement, JDH
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
 to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 0.81
+derivative works, distribute, and otherwise use matplotlib 0.82
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002-2005 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.81 alone or in any derivative version prepared by
+matplotlib 0.82 alone or in any derivative version prepared by
 Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 0.81 or any part thereof, and wants to
+incorporates matplotlib 0.82 or any part thereof, and wants to
 make the derivative work available to others as provided herein, then
 Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.81.
+the changes made to matplotlib 0.82.
 
-4. JDH is making matplotlib 0.81 available to Licensee on an "AS
+4. JDH is making matplotlib 0.82 available to Licensee on an "AS
 IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.81
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.82
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-0.81 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+0.82 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.81, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 0.82, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
 THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee.  This License Agreement does not grant permission to use JDH
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using matplotlib 0.81,
+8. By copying, installing or otherwise using matplotlib 0.82,
 Licensee agrees to be bound by the terms and conditions of this License
 Agreement.
diff --git a/examples/dynamic_demo_wx.py b/examples/dynamic_demo_wx.py
@@ -20,6 +20,9 @@
 
 Modification History:
 $Log$
+Revision 1.7  2005/06/15 20:24:56  jdh2358
+syncing for 82
+
 Revision 1.6  2004/10/26 18:08:13  astraw
 Converted to use new NavigationToolbar2 (from old Toolbar).
 
@@ -95,7 +98,7 @@ def __init__(self):
         EVT_TIMER(self, TIMER_ID, self.onTimer)
         
     def init_plot_data(self):
-        a = self.figmgr.add_subplot(111)
+        a = self.fig.add_subplot(111)
         self.ind = numpy.arange(60)
         tmp = []
         for i in range(60):
diff --git a/examples/ganged_plots.py b/examples/ganged_plots.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 """
-To create plots that share a common axes (visually) you need to set
-the axes locations manually by supplying the appropriate axes
-rectangles.  Normally you'll want to turn off the tick labels on all
-but one of the axes.
+To create plots that share a common axes (visually) you can set the
+hspace bewtween the subplots close to zero (do not use zero itself).
+Normally you'll want to turn off the tick labels on all but one of the
+axes.
 
 In this example the plots share a common xaxis but you can follow the
 same logic to supply a common y axis.
@@ -18,15 +18,28 @@
 
 # axes rect in relative 0,1 coords left, bottom, width, height.  Turn
 # off xtick labels on all but the lower plot
-ax1 = axes([0.1, 0.1,  0.8, 0.25])  # lower 
-ax2 = axes([0.1, 0.35, 0.8, 0.25], sharex=ax1)  # middle
-setp(ax2.get_xticklabels(), visible=False)
-ax3 = axes([0.1, 0.6,  0.8, 0.25], sharex=ax1)  # upper
-setp(ax3.get_xticklabels(), visible=False)
 
 
+f = figure()
+subplots_adjust(hspace=0.001)
+
+
+ax1 = subplot(311)
 ax1.plot(t,s1)
+yticks(arange(-0.9, 1.0, 0.4))
+ylim(-1,1)
+
+ax2 = subplot(312, sharex=ax1)
 ax2.plot(t,s2)
+yticks(arange(0.1, 1.0,  0.2))
+ylim(0,1)
+
+ax3 = subplot(313, sharex=ax1)
 ax3.plot(t,s3)
+yticks(arange(-0.9, 1.0, 0.4))
+ylim(-1,1)
+
+xticklabels = ax1.get_xticklabels()+ax2.get_xticklabels()
+setp(xticklabels, visible=False)
 
 show()
diff --git a/examples/histogram_demo_canvasagg.py b/examples/histogram_demo_canvasagg.py
@@ -13,7 +13,7 @@
 from matplotlib.figure import Figure
 from matplotlib.axes import Subplot
 from matplotlib.mlab import normpdf
-from matplotlib.numerix import randn
+from matplotlib.numerix.mlab import randn
 
 fig = Figure(figsize=(5,4), dpi=100)
 ax = fig.add_subplot(111)
diff --git a/examples/widgets/sliders.py b/examples/widgets/sliders.py
@@ -23,7 +23,7 @@ def update(val):
 sfreq.on_changed(update)
 samp.on_changed(update)
 
-resetax = axes([0.8, 0.01, 0.1, 0.05])
+resetax = axes([0.8, 0.025, 0.1, 0.04])
 button = Button(resetax, 'Reset')
 
 def reset(event):
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -3641,11 +3641,13 @@ def dist(a):
             return dist_x_y(xywin, asarray(xt), asarray(yt))
 
         artists = self.lines + self.patches + self.texts
-        if among is not None and callable(among):
+        if callable(among):
             artists = filter(test, artists)
         elif iterable(among):
             amongd = dict([(k,1) for k in among])
             artists = [a for a in artists if a in amongd]
+        elif among is None:
+            pass
         else:
             raise ValueError('among mut be callable or iterable')
         if not len(artists): return None
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -327,6 +327,25 @@ def delaxes(self, a):
         for func in self._axobservers: func(self)        
             
 
+
+    def _make_key(self, *args, **kwargs):
+        'make a hashable key out of args and kwargs'
+
+        def fixitems(items):
+            #items may have arrays and lists in them, so convert them
+            # to tuples for the kyey
+            ret = []
+            for k, v in items:
+                if iterable(v): v = tuple(v)                
+                ret.append((k,v))
+            return ret
+
+        if iterable(args[0]):
+            key = tuple(args[0]), tuple( fixitems(kwargs.items()))
+        else:		
+            key = args[0], tuple(fixitems( kwargs.items()))
+        return key
+        
     def add_axes(self, *args, **kwargs):
         """
 Add an a axes with axes rect [left, bottom, width, height] where all
@@ -353,10 +372,7 @@ def add_axes(self, *args, **kwargs):
 The Axes instance will be returned
         """
 
-        if iterable(args[0]):
-            key = tuple(args[0]), tuple(kwargs.items())
-        else:
-            key = args[0], tuple(kwargs.items())            
+	key = self._make_key(*args, **kwargs)
 
         if self._seen.has_key(key):
             ax = self._seen[key]
@@ -398,8 +414,9 @@ def add_subplot(self, *args, **kwargs):
 If the figure already has a subplot with key *args, *kwargs then it will
 simply make that subplot current and return it
         """
-        
-        key = args, tuple(kwargs.items())
+
+	key = self._make_key(*args, **kwargs)        
+
         if self._seen.has_key(key):
             ax = self._seen[key]
             self.sca(ax)
