added tim leslies 3d patch

jdh2358 · jdh2358 · commit d10588e89c6f · 2007-04-09T14:13:14.000Z
svn path=/trunk/matplotlib/; revision=3194
diff --git a/examples/units/evans_test2.py b/examples/units/evans_test2.py
@@ -1,7 +1,7 @@
 """
 Plot with radians from the basic_units mockup example package
 This example shows how the unit class can determine the tick locating,
-formatting and axis labeling
+formatting and axis labeling.
 """
 from basic_units import radians, degrees
 from pylab import figure, show, nx
diff --git a/examples/units/units_sample.py b/examples/units/units_sample.py
@@ -2,7 +2,9 @@
 plot using a variety of cm vs inches conversions.  The example shows
 how default unit instrospection works (ax1), how various keywords can
 be used to set the x and y units to override the defaults (ax2, ax3,
-ax4) and how one can set the xlimits
+ax4) and how one can set the xlimits using scalars (ax3, current units
+assumed) or units (conversions applied to get the numbers to current
+units)
 
 """
 from basic_units import cm, inch
diff --git a/lib/matplotlib/art3d.py b/lib/matplotlib/art3d.py
@@ -369,7 +369,7 @@ def zalpha(colors, zs):
     """Modify the alphas of the color list according to depth"""
     colors = get_colors(colors,len(zs))
     norm = Normalize(min(zs),max(zs))
-    sats = nx.array([1-norm(z)*0.7 for z in zs])
+    sats = 1 - norm(zs)*0.7 
     colors = [(c[0],c[1],c[2],c[3]*s) for c,s in zip(colors,sats)]
     return colors
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -16,7 +16,7 @@
 from artist import Artist, setp
 from axis import XAxis, YAxis
 from cbook import iterable, is_string_like, flatten, enumerate, \
-     allequal, dict_delall, popall, silent_list, is_numlike, dedent
+     allequal, dict_delall, popd, popall, silent_list, is_numlike, dedent
 from collections import RegularPolyCollection, PolyCollection, LineCollection, \
      QuadMesh, StarPolygonCollection, BrokenBarHCollection
 from colors import colorConverter, Normalize, Colormap, \
@@ -203,15 +203,16 @@ def _get_next_cycle_color(self):
         return color
 
     def __call__(self, *args, **kwargs):
+        kwargs = kwargs.copy()
 
         if self.axes.xaxis is not None and self.axes.xaxis is not None:
-            xunits = kwargs.pop('xunits', self.axes.xaxis.units)
-            yunits = kwargs.pop('yunits', self.axes.yaxis.units)
+            xunits = popd(kwargs, 'xunits', self.axes.xaxis.units)
+            yunits = popd(kwargs, 'yunits', self.axes.yaxis.units)        
             if xunits!=self.axes.xaxis.units:
                 self.axes.xaxis.set_units(xunits)
             if yunits!=self.axes.yaxis.units:
                 self.axes.yaxis.set_units(yunits)
-
+        
         ret =  self._grab_next_args(*args, **kwargs)
         return ret
 
@@ -237,7 +238,7 @@ def _xy_from_y(self, y):
         if self.axes.yaxis is not None:
             b = self.axes.yaxis.update_units(y)
             if b: return arange(len(y)), y, False
-
+            
         y = ma.asarray(y)
         if len(y.shape) == 1:
             y = y[:,newaxis]
@@ -248,12 +249,12 @@ def _xy_from_y(self, y):
         return x,y, True
 
     def _xy_from_xy(self, x, y):
-        if self.axes.xaxis is not None and self.axes.yaxis is not None:
+        if self.axes.xaxis is not None and self.axes.yaxis is not None:        
             bx = self.axes.xaxis.update_units(x)
             by = self.axes.yaxis.update_units(y)
             # right now multicol is not supported if either x or y are
             # unit enabled but this can be fixed..
-            if bx or by: return x, y, False
+            if bx or by: return x, y, False 
 
         x = ma.asarray(x)
         y = ma.asarray(y)
@@ -365,6 +366,7 @@ def makefill(x, y):
             return ret
 
     def _plot_3_args(self, tup3, **kwargs):
+        kwargs = kwargs.copy()
         ret = []
 
         x, y, fmt = tup3
@@ -1046,7 +1048,7 @@ def add_collection(self, collection, autolim=False):
         if autolim:
             self.update_datalim(collection.get_verts(self.transData))
 
-
+        
     def add_line(self, line):
         'Add a line to the list of plot lines'
         self._set_artist_props(line)
@@ -1068,7 +1070,7 @@ def _update_line_limits(self, line):
             ydata = array([y for x,y in xys])
 
         self.update_datalim_numerix( xdata, ydata )
-
+        
 
     def add_patch(self, p):
         """
@@ -1081,7 +1083,7 @@ def add_patch(self, p):
         p.set_clip_box(self.bbox)
         self._update_patch_limits(p)
         self.patches.append(p)
-
+        
     def _update_patch_limits(self, p):
         'update the datalimits for patch p'
         xys = self._get_verts_in_data_coords(
@@ -1102,7 +1104,7 @@ def relim(self):
 
         for p in self.patches:
             self._update_patch_limits(p)
-
+            
     def update_datalim(self, xys):
         'Update the data lim bbox with seq of xy tups or equiv. 2-D array'
         # if no data is set currently, the bbox will ignore its
@@ -1135,25 +1137,25 @@ def _get_verts_in_data_coords(self, trans, xys):
     def _process_unit_info(self, xdata=None, ydata=None, kwargs=None):
         'look for unit kwargs and update the axis instances as necessary'
 
-        if self.xaxis is None or self.xaxis is None: return
+        if self.xaxis is None or self.xaxis is None: return 
 
 
         if xdata is not None:
             self.xaxis.update_units(xdata)
             #print '_process updated xdata: units=%s, converter=%s'%(self.xaxis.units, self.xaxis.converter)
 
         if ydata is not None:
-            self.yaxis.update_units(ydata)
-            #print '_process updated ydata: units=%s, converter=%s'%(self.yaxis.units, self.yaxis.converter)
+            self.yaxis.update_units(ydata)        
+            #print '_process updated ydata: units=%s, converter=%s'%(self.yaxis.units, self.yaxis.converter)            
 
         # process kwargs 2nd since these will override default units
         if kwargs is not None:
-            xunits = kwargs.pop('xunits', self.xaxis.units)
+            xunits = popd(kwargs, 'xunits', self.xaxis.units)
             if xunits!=self.xaxis.units:
                 self.xaxis.set_units(xunits)
                 #print '_process updated xunits kws: units=%s, converter=%s'%(self.xaxis.units, self.xaxis.converter)
 
-            yunits = kwargs.pop('yunits', self.yaxis.units)
+            yunits = popd(kwargs, 'yunits', self.yaxis.units)
             if yunits!=self.yaxis.units:
                 self.yaxis.set_units(yunits)
                 #print '_process updated yunits kws: units=%s, converter=%s'%(self.yaxis.units, self.yaxis.converter)
@@ -2241,6 +2243,7 @@ def axhspan(self, ymin, ymax, xmin=0, xmax=1, **kwargs):
         %(Polygon)s
         """
         # convert y axis units
+        kwargs = kwargs.copy()
 
         trans = blend_xy_sep_transform( self.transAxes, self.transData  )
         verts = (xmin, ymin), (xmin, ymax), (xmax, ymax), (xmax, ymin)
@@ -2282,6 +2285,7 @@ def axvspan(self, xmin, xmax, ymin=0, ymax=1, **kwargs):
         %(Polygon)s
         """
         # convert x axis units
+        kwargs = kwargs.copy()
         trans = blend_xy_sep_transform( self.transData, self.transAxes   )
         verts = [(xmin, ymin), (xmin, ymax), (xmax, ymax), (xmax, ymin)]
         p = Polygon(verts, **kwargs)
@@ -2515,16 +2519,17 @@ def plot(self, *args, **kwargs):
         information
         """
 
-        scalex = kwargs.pop('scalex', True)
-        scaley = kwargs.pop('scaley', True)
+        kwargs = kwargs.copy()
+        scalex = popd(kwargs, 'scalex', True)
+        scaley = popd(kwargs, 'scaley', True)
 
         if not self._hold: self.cla()
         lines = []
 
         for line in self._get_lines(*args, **kwargs):
             self.add_line(line)
             lines.append(line)
-
+            
 
         self.autoscale_view(scalex=scalex, scaley=scaley)
         return lines
@@ -2612,11 +2617,12 @@ def loglog(self, *args, **kwargs):
         %(Line2D)s
         """
         if not self._hold: self.cla()
-        dx = {'basex': kwargs.pop('basex', 10),
-              'subsx': kwargs.pop('subsx', None),
+        kwargs = kwargs.copy()
+        dx = {'basex': popd(kwargs,'basex', 10),
+              'subsx': popd(kwargs,'subsx', None),
               }
-        dy = {'basey': kwargs.pop('basey', 10),
-              'subsy': kwargs.pop('subsy', None),
+        dy = {'basey': popd(kwargs,'basey', 10),
+              'subsy': popd(kwargs,'subsy', None),
               }
 
         self.set_xscale('log', **dx)
@@ -2651,8 +2657,9 @@ def semilogx(self, *args, **kwargs):
         %(Line2D)s
         """
         if not self._hold: self.cla()
-        d = {'basex': kwargs.pop('basex', 10),
-             'subsx': kwargs.pop('subsx', None),
+        kwargs = kwargs.copy()
+        d = {'basex': popd(kwargs, 'basex', 10),
+             'subsx': popd(kwargs, 'subsx', None),
              }
 
         self.set_xscale('log', **d)
@@ -2685,8 +2692,9 @@ def semilogy(self, *args, **kwargs):
 
         """
         if not self._hold: self.cla()
-        d = {'basey': kwargs.pop('basey', 10),
-             'subsy': kwargs.pop('subsy', None),
+        kwargs = kwargs.copy()
+        d = {'basey': popd(kwargs,'basey', 10),
+             'subsy': popd(kwargs,'subsy', None),
              }
         self.set_yscale('log', **d)
         b =  self._hold
@@ -2791,6 +2799,7 @@ def xcorr(self, x, y, normed=False, detrend=detrend_none, usevlines=False,
             a = self.vlines(lags, [0], c, **kwargs)
             b = self.axhline(**kwargs)
         else:
+            kwargs = kwargs.copy()
             kwargs.setdefault('marker', 'o')
             kwargs.setdefault('linestyle', 'None')
             a, = self.plot(lags, c, **kwargs)
@@ -2862,6 +2871,7 @@ def legend(self, *args, **kwargs):
         handletextsep = 0.02 # the space between the legend line and legend text
         axespad = 0.02       # the border between the axes and legend edge
         """
+        kwargs = kwargs.copy()
         def get_handles():
             handles = self.lines
             handles.extend(self.patches)
@@ -2878,13 +2888,13 @@ def get_handles():
                 if label != '_nolegend_':
                     handles.append(line)
                     labels.append(label)
-            loc = kwargs.pop('loc', 1)
+            loc = popd(kwargs, 'loc', 1)
 
         elif len(args)==1:
             # LABELS
             labels = args[0]
             handles = [h for h, label in zip(get_handles(), labels)]
-            loc = kwargs.pop('loc', 1)
+            loc = popd(kwargs, 'loc', 1)
 
         elif len(args)==2:
             if is_string_like(args[1]) or isinstance(args[1], int):
@@ -2894,7 +2904,7 @@ def get_handles():
             else:
                 # LINES, LABELS
                 handles, labels = args
-                loc = kwargs.pop('loc', 1)
+                loc = popd(kwargs, 'loc', 1)
 
         elif len(args)==3:
             # LINES, LABELS, LOC
@@ -3783,6 +3793,7 @@ def scatter(self, x, y, s=20, c='b', marker='o', cmap=None, norm=None,
             '8' : (8,0),             # octagon
             }
 
+        kwargs = kwargs.copy()
         self._process_unit_info(xdata=x, ydata=y, kwargs=kwargs)
 
         x, y, s, c = delete_masked_points(x, y, s, c)
@@ -4076,14 +4087,15 @@ def quiver_classic(self, U, V, *args, **kwargs ):
             V = V*(S/Nmax)
             N = N*Nmax
 
-        alpha = kwargs.pop('alpha', 1.0)
-        width = kwargs.pop('width', .5)
-        norm = kwargs.pop('norm', None)
-        cmap = kwargs.pop('cmap', None)
-        vmin = kwargs.pop('vmin', None)
-        vmax = kwargs.pop('vmax', None)
-        color = kwargs.pop('color', None)
-        shading = kwargs.pop('shading', 'faceted')
+        kwargs = kwargs.copy()
+        alpha = popd(kwargs,'alpha', 1.0)
+        width = popd(kwargs,'width', .5)
+        norm = popd(kwargs,'norm', None)
+        cmap = popd(kwargs,'cmap', None)
+        vmin = popd(kwargs,'vmin', None)
+        vmax = popd(kwargs,'vmax', None)
+        color = popd(kwargs,'color', None)
+        shading = popd(kwargs,'shading', 'faceted')
 
         if len(kwargs):
             raise TypeError, "quiver() got an unexpected keyword argument '%s'"%kwargs.keys()[0]
@@ -4158,6 +4170,8 @@ def fill(self, *args, **kwargs):
         kwargs control the Polygon properties:
         %(Polygon)s
         """
+        kwargs = kwargs.copy()
+
         if not self._hold: self.cla()
 
         patches = []
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -26,7 +26,7 @@
 #### CONFIGURATION BEGINS HERE
 # the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
 #     Agg Cairo GD GDK Paint PS PDF SVG Template
-backend      : WXAgg
+backend      : TkAgg
 numerix      : numpy  # numpy, Numeric or numarray
 units        : True
 #interactive  : False      # see http://matplotlib.sourceforge.net/interactive.html
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -480,7 +480,7 @@ def __init__(self, xy, **kwargs):
 
 
     def get_verts(self):
-        xs, ys = zip(*self.xy)
+        xs, ys = zip(*self.xy)[:2]
         xs = self.convert_xunits(xs)
         ys = self.convert_yunits(ys)
         return zip(xs, ys)
diff --git a/unit/memleak_gui.py b/unit/memleak_gui.py
@@ -13,8 +13,8 @@
 import matplotlib
 
 #matplotlib.use('TkAgg') # or TkAgg or WxAgg or QtAgg or Gtk
-matplotlib.rcParams['toolbar'] = 'toolbar2'   # None, classic, toolbar2
-#matplotlib.rcParams['toolbar'] = None   # None, classic, toolbar2
+#matplotlib.rcParams['toolbar'] = 'toolbar2'   # None, classic, toolbar2
+matplotlib.rcParams['toolbar'] = None   # None, classic, toolbar2
 
 import pylab
 from matplotlib import _pylab_helpers as ph
