David,
I am reverting your changes to contour.py; that is, I am taking it back to 5689. The problem is that running contour_demo.py, below, fails. Some index accounting somewhere is getting fouled up. I don't have time to investigate.
When you have it straightened out you can put the changes back, so this is just a brief setback.
We might want to consider, however, whether such extensive changes should be made immediately *before* a "bugfix" release. I think John is trying to get one out. I am already a little nervous about other recent and impending changes in this context. (Your idea of a branch was a good one in concept, but maybe a pain and more trouble than it is worth with svn. Too bad we aren't using something nice like Mercurial. Now, that comment should push a few buttons.)
Eric
In [1]:run contour_demo.py
···
---------------------------------------------------------------------------
IndexError Traceback (most recent call last)
/home/efiring/programs/py/mpl/mpl_trunk/examples/pylab_examples/contour_demo.py in <module>()
82 inline=1,
83 fmt='%1.1f',
---> 84 fontsize=14)
85
86 # make a colorbar for the contour lines
/usr/local/lib/python2.5/site-packages/matplotlib/pyplot.pyc in clabel(*args, **kwargs)
1698 hold(h)
1699 try:
-> 1700 ret = gca().clabel(*args, **kwargs)
1701 draw_if_interactive()
1702 except:
/usr/local/lib/python2.5/site-packages/matplotlib/axes.pyc in clabel(self, CS, *args, **kwargs)
5996
5997 def clabel(self, CS, *args, **kwargs):
-> 5998 return CS.clabel(*args, **kwargs)
5999 clabel.__doc__ = mcontour.ContourSet.clabel.__doc__
6000
/usr/local/lib/python2.5/site-packages/matplotlib/contour.pyc in clabel(self, *args, **kwargs)
150 blocking_contour_labeler(inline)
151 else:
--> 152 self.labels(inline)
153
154 self.label_list = cbook.silent_list('text.Text', self.cl)
/usr/local/lib/python2.5/site-packages/matplotlib/contour.pyc in labels(self, inline)
451 if self.print_label(slc,lw):
452 x,y, rotation, ind = self.locate_label(slc, lw)
--> 453 self.add_label(x,y,rotation,icon)
454
455 if inline:
/usr/local/lib/python2.5/site-packages/matplotlib/contour.pyc in add_label(self, x, y, rotation, icon)
364 verticalalignment='center')
365
--> 366 color = self.label_mappable.to_rgba(self.label_cvalues[icon],
367 alpha=self.alpha)
368
IndexError: index out of bounds
> /usr/local/lib/python2.5/site-packages/matplotlib/contour.py(366)add_label()
365
--> 366 color = self.label_mappable.to_rgba(self.label_cvalues[icon],
367 alpha=self.alpha)
icon
7
self.label_cvalues
array([-1. , -0.6, -0.2, 0.2, 0.6, 1. , 1.4])