added Erics contourf patch

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

Author: jdh2358

CHANGELOG

@@ -1,6 +1,6 @@
 New entries should be added at the top
 
-
+2005-03-01 Added Eric's contourf routines
 
 2005-03-01 Added start of proper agg SWIG wrapper.  I would like to
            expose agg functionality directly a the user level and this

boilerplate.py

@@ -26,7 +26,7 @@ def %(func)s(*args, **kwargs):
     return ret
 %(func)s.__doc__ = Axes.%(func)s.__doc__ + \"\"\"
 Addition kwargs: hold = [True|False] overrides default hold state\"\"\"
-""" 
+"""
 
 _fmtmisc = """\
 # This function was autogenerated by boilerplate.py.  Do not edit as
@@ -37,10 +37,10 @@ def %(func)s(*args, **kwargs):
     draw_if_interactive()
     return ret
 %(func)s.__doc__ = Axes.%(func)s.__doc__
-""" 
+"""
 
 # these methods are all simple wrappers of Axes methods by the same
-# name.  
+# name.
 _plotcommands = (
     'axhline',
     'axhspan',
@@ -49,7 +49,8 @@ def %(func)s(*args, **kwargs):
     'bar',
     'barh',
     'cohere',
-    'contour', 
+    'contour',
+    'contourf',
     'csd',
     'errorbar',
     'fill',
@@ -59,7 +60,7 @@ def %(func)s(*args, **kwargs):
     'loglog',
     'pcolor',
     'pcolor_classic',
-    'pie', 
+    'pie',
     'plot',
     'plot_date',
     'psd',
@@ -84,10 +85,11 @@ def %(func)s(*args, **kwargs):
 
 cmappable = {
     'contour' : 'if ret[1].mappable is not None: gci._current = ret[1].mappable',
+    'contourf': 'if ret[1].mappable is not None: gci._current = ret[1].mappable',
     'scatter' : 'gci._current = ret',
     'pcolor'  : 'gci._current = ret',
     'imshow'  : 'gci._current = ret',
-    'spy2'  : 'gci._current = ret',    
+    'spy2'  : 'gci._current = ret',
     'specgram'  : 'gci._current = ret[-1]',
 
 }

examples/backend_driver.py

@@ -106,7 +106,7 @@ def drive(backend, python='python2.3'):
 #backends = ['Agg', 'Cairo', 'GDK', 'PS', 'SVG', 'Template']
 backends = ['Agg', 'PS', 'SVG', 'Template']
 #backends = [ 'GTK', 'WX', 'TkAgg']
-backends = ['PS']
+#backends = ['PS']
 python = 'python2.3'
 for backend in backends:
     print 'testing %s' % backend

examples/contourf_demo.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+from pylab import *
+
+origin = 'lower'
+#origin = 'upper'
+
+delta = 0.5 #0.025
+x = y = arange(-3.0, 3.01, delta)
+X, Y = meshgrid(x, y)
+Z1 = bivariate_normal(X, Y, 1.0, 1.0, 0.0, 0.0)
+Z2 = bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
+Z = Z1 - Z2
+
+if 0:
+    badmask = zeros(shape(Z))
+
+    badmask[5,5] = 1
+    badmask[5,6] = 1
+    Z[5,5] = 0
+    Z[5,6] = 0
+
+    badmask[0,0] = 1
+    Z[0,0] = 0
+
+levels, colls = contourf(X, Y, Z, 10, # [-1, -0.1, 0, 0.1],
+#                        badmask=badmask,
+                        #alpha=0.5,
+                        cmap=bone(),
+                        origin=origin)
+
+levs2, colls2 = contour(X, Y, Z, levels,
+#                        badmask=badmask,
+                        colors = 'r',
+                        origin=origin,
+                        hold='on')
+savefig('test')
+show()
+