added colormap support to labels

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

Author: jdh2358

MANIFEST

@@ -267,6 +267,7 @@ examples/color_demo.py
 examples/colours.py
 examples/contour_demo.py
 examples/contour_demo2.py
+examples/contour_image.py
 examples/contourf_demo.py
 examples/coords_demo.py
 examples/coords_report.py
@@ -528,6 +529,8 @@ lib/matplotlib/cm.py
 lib/matplotlib/collections.py
 lib/matplotlib/collections.py.~1.15.~
 lib/matplotlib/colors.py
+lib/matplotlib/contour.py
+lib/matplotlib/contour.py~
 lib/matplotlib/dates.py
 lib/matplotlib/figure.py
 lib/matplotlib/figure.py.~1.16.~

boilerplate.py

@@ -85,6 +85,7 @@ def %(func)s(*args, **kwargs):
     )
 
 cmappable = {
+    'clabel' : 'if ret.mappable is not None: gci._current = ret.mappable',
     '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',

examples/backend_driver.py

@@ -13,6 +13,9 @@
     'bar_stacked.py',
     'barchart_demo.py',
     'color_demo.py',
+    'contour_demo.py',
+    'contour_demo2.py',
+    'contourf_demo.py',
     'csd_demo.py',
     'custom_ticker1.py',
     'customize_rc.py',

examples/contourf_demo.py

@@ -4,7 +4,7 @@
 origin = 'lower'
 #origin = 'upper'
 
-delta = 0.5 #0.025
+delta = 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)

lib/matplotlib/cm.py

@@ -421,6 +421,10 @@ def set_array(self, A):
         'Set the image array from numeric/numarray A'
         self._A = A.astype(nx.Float32)
 
+    def get_array(self):
+        'Return the array'
+        return self._A 
+
     def set_clim(self, vmin=None, vmax=None):
         'set the norm limits for image scaling'
         self.norm.vmin = vmin

lib/matplotlib/contour.py

@@ -28,15 +28,29 @@ class ContourMappable(ScalarMappable):
     """
     a class to allow contours to respond properly to change in cmaps, etc
     """
-    def __init__(self, levels, collections, norm=None, cmap=None):
+    def __init__(self, levels, collections, norm=None, cmap=None, labeld=None):
+        """
+        See comment on labeld in the ContourLabeler class
+        
+        """
         ScalarMappable.__init__(self, norm, cmap)
         self.levels = levels
         self.collections = collections
+        if labeld is None: labeld = {}
+        self.labeld = labeld
 
     def changed(self):
         colors = [ (tuple(rgba),) for rgba in self.to_rgba(self.levels)]
+        contourNum = 0
         for color, collection in zip(colors, self.collections):
             collection.set_color(color)
+            Ncolor = len(color) # collections could have more than 1 in principle
+            for segNum, segment in enumerate(collection._segments):
+                key = contourNum, segNum
+                t = self.labeld.get(key)
+                if t is not None: t.set_color(color[segNum%Ncolor])
+            contourNum += 1
+            
         ScalarMappable.changed(self)
 
 class ContourLabeler:
@@ -128,6 +142,13 @@ def clabel(self, *args, **kwargs):
         self.cl = []
         self.cl_xy = []
 
+        # we have a list of contours and each contour has a list of
+        # segments.  We want changes in the contour color to be
+        # reflected in changes in the label color.  This is a good use
+        # for traits observers, but in the interim, until traits are
+        # utilized, we'll create a dict mapping i,j to text instances.
+        # i is the contour level index, j is the sement index
+        self.labeld = {}
         if inline == 1:
             toremove, toadd = self.inline_labels(levels, contours, colors, fslist, fmt)
             for r in toremove:
@@ -139,7 +160,19 @@ def clabel(self, *args, **kwargs):
 
         for label in self.cl:
             self.ax.add_artist(label)
-        return silent_list('Text', self.cl)
+
+
+        if hasattr(contours, 'mappable'):
+            old = getattr(contours, 'mappable')
+            mappable = ContourMappable(old.get_array(), toadd, cmap=old.cmap, labeld=self.labeld)            
+            mappable.set_array(old.get_array())
+            mappable.autoscale()
+        else:
+            mappable = None
+
+        ret =  silent_list('Text', self.cl)
+        ret.mappable = mappable
+        return ret
 
 
 
@@ -316,10 +349,12 @@ def inline_labels(self, levels, contours, colors, fslist, fmt):
         toremove = []
         toadd = []
         trans = self.ax.transData
+        contourNum = 0
         for lev, con, color, fsize in zip(levels, contours, colors, fslist):
             col = []
             lw = self.get_label_width(lev, fmt, fsize)
-            for linecontour in con._segments:
+            for segNum, linecontour in enumerate(con._segments):
+                key = contourNum, segNum
                 # for closed contours add one more point to
                 # avoid division by zero
                 if linecontour[0] == linecontour[-1]:
@@ -332,15 +367,18 @@ def inline_labels(self, levels, contours, colors, fslist, fmt):
                     # data coordinates
                     dx,dy = trans.inverse_xy_tup((x,y))
                     t = Text(dx, dy, rotation = rotation, horizontalalignment='center', verticalalignment='center')
+                    self.labeld[key] = t
                     text = self.get_text(lev,fmt)
                     self.set_label_props(t, text, color)
                     self.cl.append(t)
 
                     new  =  self.break_linecontour(linecontour, rotation, lw, ind)
                     for c in new: col.append(c)
-                else: col.append(linecontour)
+                else:
+                    col.append(linecontour)
             toremove.append(con)
             toadd.append(LineCollection(col, colors=con._colors, linewidths = con._lw))
+            contourNum += 1
 
         return toremove, toadd
 

lib/matplotlib/pylab.py

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