Partial fix for pcolormesh problems reported by George Nurser.

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

Author: efiring

boilerplate.py

@@ -47,7 +47,7 @@ def %(func)s(*args, **kwargs):
 # these methods are all simple wrappers of Axes methods by the same
 # name.
 _plotcommands = (
-    'arrow', 
+    'arrow',
     'axhline',
     'axhspan',
     'axvline',
@@ -94,13 +94,13 @@ def %(func)s(*args, **kwargs):
     )
 
 cmappable = {
-    #'clabel' : 'if ret.mappable is not None: gci._current = ret.mappable',
     'contour' : 'if ret._A is not None: gci._current = ret',
     'contourf': 'if ret._A is not None: gci._current = ret',
     'scatter' : 'gci._current = ret',
     'pcolor'  : 'gci._current = ret',
+    'pcolormesh'  : 'gci._current = ret',
     'imshow'  : 'gci._current = ret',
-    'spy2'  : 'gci._current = ret',
+    'spy2'    : 'gci._current = ret',
     'specgram'  : 'gci._current = ret[-1]',
 
 }

examples/quadmesh_demo.py

@@ -29,12 +29,12 @@
 ax.set_title('Without masked values')
 
 ax = fig.add_subplot(122)
-cmap = cm.jet
-cmap.set_bad('w', 1.0)
-# We need to specify the norm so we can set clip to False;
-# probably this should be fixed so it would not be necessary.
-norm = colors.normalize(clip = False)
-ax.pcolormesh(Qx,Qz,Zm, cmap=cmap, norm=norm)
+#  You can control the color of the masked region:
+#cmap = cm.jet
+#cmap.set_bad('r', 1.0)
+#ax.pcolormesh(Qx,Qz,Zm, cmap=cmap)
+#  Or use the default, which is transparent:
+ax.pcolormesh(Qx,Qz,Zm)
 ax.set_title('With masked values')
 show()
 

lib/matplotlib/colors.py

@@ -630,9 +630,7 @@ def __init__(self, vmin=None, vmax=None, clip = True):
         minimum and maximum value respectively.  If clip is True and
         the given value falls outside the range, the returned value
         will be 0 or 1, whichever is closer. Returns 0 if vmin==vmax.
-        Works with scalars or arrays, including masked arrays.  If clip
-        is True, masked values on input will be set to 1 on output; if
-        clip is False, the mask will be propagated to the output.
+        Works with scalars or arrays, including masked arrays.
         """
         self.vmin = vmin
         self.vmax = vmax
@@ -655,7 +653,8 @@ def __call__(self, value):
             return 0.*value
         else:
             if self.clip:
-                val = clip(val.filled(vmax), vmin, vmax)
+                val = ma.array(clip(val.filled(vmax), vmin, vmax),
+                                mask=val.mask)
             result = (val-vmin)/float(vmax-vmin)
         if vtype == 'scalar':
             result = result[0]

lib/matplotlib/pylab.py

@@ -1936,7 +1936,7 @@ def pcolormesh(*args, **kwargs):
     except:
         hold(b)
         raise
-
+    gci._current = ret
     hold(b)
     return ret
 if Axes.pcolormesh.__doc__ is not None: