more contour patches applied

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

Author: jdh2358

CHANGELOG

@@ -1,7 +1,10 @@
 New entries should be added at the top
 
+2005-03-09 Added Eric's contourf updates and Nadia's clabel functionality
+           - TODO, factor clabel into a dedicated class
+
 2005-03-09 Moved colorbar to figure.Figure to expose it for API developers
-           - JDH
+          - JDH
 
 2005-03-09 backend_cairo.py: implemented draw_markers() - SC
 

MANIFEST

@@ -10,6 +10,7 @@ NUMARRAY_ISSUES
 README
 TODO
 __init__.py
+makeswig.py
 setup.py
 setupext.py
 CXX/Config.hxx
@@ -247,6 +248,7 @@ agg22/svg/win32_api/svg_test.dsp
 agg22/svg/win32_api/svg_test.dsw
 examples/README
 examples/__init__.py
+examples/_tmp_simple_plot.py
 examples/accented_text.py
 examples/agg_oo.py
 examples/alignment_test.py
@@ -266,6 +268,7 @@ examples/color_demo.py
 examples/colours.py
 examples/contour_demo.py
 examples/contour_demo2.py
+examples/contourf_demo.py
 examples/coords_demo.py
 examples/coords_report.py
 examples/csd_demo.py
@@ -381,6 +384,7 @@ examples/data/ct.raw
 examples/data/eeg.dat
 examples/data/embedding_in_wx3.xrc
 examples/data/intc.csv
+examples/data/lena.jpg
 examples/data/membrane.dat
 examples/data/msft.csv
 examples/data/s1045.ima
@@ -506,12 +510,14 @@ lib/dateutil/rrule.py
 lib/dateutil/tz.py
 lib/matplotlib/.cvsignore
 lib/matplotlib/__init__.py
+lib/matplotlib/__init__.py.~1.41.~
 lib/matplotlib/_contour.py
 lib/matplotlib/_image.py
 lib/matplotlib/_mathtext_data.py
 lib/matplotlib/_pylab_helpers.py
 lib/matplotlib/_transforms.py
 lib/matplotlib/afm.py
+lib/matplotlib/agg.py
 lib/matplotlib/artist.py
 lib/matplotlib/axes.py
 lib/matplotlib/axis.py
@@ -522,16 +528,19 @@ lib/matplotlib/collections.py
 lib/matplotlib/colors.py
 lib/matplotlib/dates.py
 lib/matplotlib/figure.py
+lib/matplotlib/figure.py.~1.16.~
 lib/matplotlib/finance.py
 lib/matplotlib/font_manager.py
 lib/matplotlib/image.py
 lib/matplotlib/legend.py
 lib/matplotlib/lines.py
+lib/matplotlib/lines.py.~1.23.~
 lib/matplotlib/mathtext.py
 lib/matplotlib/mlab.py
 lib/matplotlib/patches.py
 lib/matplotlib/path.py
 lib/matplotlib/pylab.py
+lib/matplotlib/pylab.py.~1.45.~
 lib/matplotlib/pyparsing.py
 lib/matplotlib/table.py
 lib/matplotlib/text.py
@@ -606,11 +615,13 @@ lib/matplotlib/enthought/traits/ui/null/rgba_color_trait.py
 lib/matplotlib/enthought/traits/ui/null/toolkit.py
 lib/matplotlib/enthought/util/__init__.py
 lib/matplotlib/enthought/util/resource.py
+lib/matplotlib/numerix/.cvsignore
 lib/matplotlib/numerix/__init__.py
 lib/matplotlib/numerix/_na_imports.py
 lib/matplotlib/numerix/_nc_imports.py
 lib/matplotlib/numerix/fft/__init__.py
 lib/matplotlib/numerix/linear_algebra/__init__.py
+lib/matplotlib/numerix/ma/__init__.py
 lib/matplotlib/numerix/mlab/__init__.py
 lib/matplotlib/numerix/random_array/__init__.py
 lib/pytz/__init__.py
@@ -1189,6 +1200,7 @@ license/DATEUTIL_LICENSE.txt
 license/LICENSE
 license/LICENSE_PAINT
 license/LICENSE_PIL
+license/LICENSE_enthought.txt
 license/PYTZ_LICENSE.txt
 src/_backend_agg.cpp
 src/_backend_agg.h
@@ -1208,8 +1220,15 @@ src/_tkagg.cpp
 src/_transforms.cpp
 src/_transforms.h
 src/_windowing.cpp
+src/agg.cxx
 src/ft2font.cpp
 src/ft2font.h
 src/gcntr.c
 src/mplutils.cpp
 src/mplutils.h
+src/swig_runtime.h
+swig/agg.i
+swig/agg_basics.i
+swig/agg_path_storage.i
+swig/agg_trans_affine.i
+swig/agg_typemaps.i

TODO

@@ -661,3 +661,6 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
    the backend, eg ps symbol formatting
 
 -- add gc warning to oo agg and FAQ
+
+-- check why lowest contour is not labeled in contour_demo2 and why
+   the colormap is still not applying to the contour.

boilerplate.py

@@ -24,7 +24,7 @@ def %(func)s(*args, **kwargs):
     %(mappable)s
     hold(b)
     return ret
-%(func)s.__doc__ = Axes.%(func)s.__doc__ + \"\"\"
+%(func)s.__doc__ = _shift_string(Axes.%(func)s.__doc__) + \"\"\"
 Addition kwargs: hold = [True|False] overrides default hold state\"\"\"
 """
 
@@ -36,7 +36,7 @@ def %(func)s(*args, **kwargs):
     ret =  gca().%(func)s(*args, **kwargs)
     draw_if_interactive()
     return ret
-%(func)s.__doc__ = Axes.%(func)s.__doc__
+%(func)s.__doc__ = _shift_string(Axes.%(func)s.__doc__)
 """
 
 # these methods are all simple wrappers of Axes methods by the same
@@ -49,6 +49,7 @@ def %(func)s(*args, **kwargs):
     'bar',
     'barh',
     'cohere',
+    'clabel',
     'contour',
     'contourf',
     'csd',

examples/contour_demo.py

@@ -16,7 +16,9 @@
                         linewidths=arange(.5, 4, .5),
                         colors=('r', 'green', 'blue', (1,1,0), '#afeeee', 0.5),
                         origin='lower')
-legend(loc='lower left')
+clabel(colls,levels,fontsize=7, inline=1)
+#clabel(colls)
+
 savefig('test')
 show()
 

examples/contour_demo2.py

@@ -12,6 +12,7 @@
 # difference of Gaussians
 im = imshow(Z2-Z1, interpolation='bilinear', cmap=cm.gray, extent=(-3,3,-2,2))
 levels, colls = contour(X, Y, Z2-Z1, linewidths=2)
+clabel(colls, inline=1,fontsize=8)
 colorbar()
 hot()
 savefig('test')

examples/fill_between_posneg.py

@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+"""
+From: James Boyle <boyle5@llnl.gov>
+Subject: possible candidate for examples directory using fill
+To: John Hunter <jdhunter@nitace.bsd.uchicago.edu>
+Date: Tue, 8 Mar 2005 15:44:11 -0800
+
+I often compare the output from two sensors and I am interested in the
+sign of the differences.
+
+I wrote the enclosed code for find the polygons of the positive and
+negative regions of the difference of two curves. It is written for
+simple-minded straightforwardness rather than speed or elegance.
+It is easy to fill in the two sets of polygons with contrasting colors.
+For efficiency one could use collections but my curves are such that
+fill is quick enough.
+
+The code uses a simple linear technique to find the crossover point,
+this too could be made more sophisticated if one desired.
+
+I have found this code to be very handy for the comparisons I perform
+-
+maybe someone else would find it useful.
+
+--Jim
+"""
+
+#!/usr/bin/env python
+
+from pylab import *
+
+x1 = arange(0, 2, 0.01)
+y1 = sin(2*pi*x1)
+y2 = sin(4*pi*x1)
+
+# find positive and negative polygons of difference
+pos,neg =  posNegFill(x1,y1,y2)
+# positive y2 > y1 is blue
+for x,y  in pos:
+     p = fill(x,y,'b')
+
+# negative Y2 < y1 is red
+for x,y in neg:
+     p = fill(x,y,'r')
+
+
+
+def posNegFill(x,y1,y2):
+      diff = y2 - y1
+      pos = []
+      neg = []
+      xx1 = [x[0]]
+      xx2 = [x[0]]
+      yy1 = [y1[0]]
+      yy2 = [y2[0]]
+      oldSign = (diff[0] < 0 )
+      npts = x.shape[0]
+      for i in range(1,npts):
+          newSign = (diff[i] < 0)
+          if newSign != oldSign:
+              xz,yz = findZero(i,x,y1,y2)
+              xx1.append(xz)
+              yy1.append(yz)
+              xx2.reverse()
+              xx1.extend(xx2)
+              yy2.reverse()
+              yy1.extend(yy2)
+              if oldSign:
+                  neg.append( (xx1,yy1) )
+              else:
+                  pos.append( (xx1,yy1) )
+              xx1 = [xz,x[i]]
+              xx2 = [xz,x[i]]
+              yy1 = [yz,y1[i]]
+              yy2 = [yz,y2[i]]
+              oldSign = newSign
+          else:
+              xx1.append( x[i])
+              xx2.append( x[i])
+              yy1.append(y1[i])
+              yy2.append(y2[i])
+              if i == npts-1:
+                  xx2.reverse()
+                  xx1.extend(xx2)
+                  yy2.reverse()
+                  yy1.extend(yy2)
+                  if oldSign :
+                      neg.append( (xx1,yy1) )
+                  else:
+                      pos.append( (xx1,yy1) )
+      return pos,neg
+
+def findZero(i,x,y1,y2):
+     im1 = i-1
+     m1 = (y1[i] - y1[im1])/(x[i] - x[im1])
+     m2 = (y2[i] - y2[im1])/(x[i] - x[im1])
+     b1 = y1[im1] - m1*x[im1]
+     b2 = y2[im1] - m2*x[im1]
+     xZero = (b1 - b2)/(m2 - m1)
+     yZero = m1*xZero + b1
+     return (xZero, yZero)
+
+show()

lib/matplotlib/__init__.py

@@ -141,7 +141,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.73'
+__version__  = '0.73rc1'
 __revision__ = '$Revision$'
 __date__     = '$Date$'