fixed contour to handle changes in cmap, etc

jdh2358 · jdh2358 · commit 7d2b5e19659f · 2005-01-24T17:07:50.000Z
svn path=/trunk/matplotlib/; revision=884
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,11 @@
 New entries should be added at the top
 
+
+2005-01-24 Fixed contour wto work w/ interactive changes in colormaps,
+           clim, etc - JDH
+
+===============================================================
+
 2005-01-21 matplotlib-0.71 released
 
 2005-01-21 Refactored numerix to solve vexing namespace issues - JDH
diff --git a/examples/contour_demo2.py b/examples/contour_demo2.py
@@ -11,6 +11,7 @@
 im = imshow(Z2-Z1, interpolation='bilinear', cmap=cm.gray)
 levels, colls = contour(Z2-Z1, linewidths=2)
 colorbar()
+hot()
 savefig('test')
 show()
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -985,6 +985,22 @@ def contour(self, z,
 used for colorbar functionality
 """
 
+        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):
+                ScalarMappable.__init__(self, norm, cmap)
+                self.levels = levels
+                self.collections = collections    
+
+            def changed(self):
+                colors = [ (tuple(rgba),) for rgba in self.to_rgba(self.levels)]
+                for color, collection in zip(colors, self.collections):
+                    collection.set_color(color)
+                ScalarMappable.changed(self)
+
+            
         if colors is not None and cmap is not None:
             raise RuntimeError('Either colors or cmap must be None')
         if origin is None: origin = rcParams['image.origin']
@@ -1049,7 +1065,8 @@ def autolev(N):
         
         
         Nlev = len(lev)
-
+        collections = []
+        
         if colors is not None:
 
             if is_string_like(colors):
@@ -1064,7 +1081,7 @@ def autolev(N):
             tcolors = [(colorConverter.to_rgba(c, alpha),) for c in colors]
             mappable = None
         else:
-            mappable = ScalarMappable(cmap=cmap)
+            mappable = ContourMappable(lev, collections, cmap=cmap)
             mappable.set_array(z)
             mappable.autoscale()
             tcolors = [ (tuple(rgba),) for rgba in mappable.to_rgba(lev)]
@@ -1082,15 +1099,14 @@ def autolev(N):
                                       
         args = zip(lev, tcolors, tlinewidths)
 
-        levels = []
-        collections = []
 
         region = 0  
+        levels = []
         for level, color, width  in args:
             ntotal, nparts  = _contour.GcInit1(x, y, reg, triangle, region, z, level)
-            np = zeros((nparts,), Int)
-            xp = zeros((ntotal, ), Float64)
-            yp = zeros((ntotal,), Float64)
+            np = zeros((nparts,), 'l')
+            xp = zeros((ntotal, ), 'd')
+            yp = zeros((ntotal,), 'd')
             nlist = _contour.GcTrace(np, xp, yp)
             #print min(ravel(triangle)), max(ravel(triangle))
             col = LineCollection(nlist, colors=color, linewidths = width)
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -447,7 +447,7 @@ def set_cmap(self, cmap):
         self.changed()
         
     def set_norm(self, norm):
-        'set the colormap for luminance data'
+        'set the normalization instance'
         if norm is None: norm = colors.normalize()
         self.norm = norm
         self.changed()
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -327,7 +327,7 @@ def set_linestyle(self, ls):
         
         self._ls = dashes
 
-    def color(self, c):
+    def set_color(self, c):
         """
 Set the color(s) of the line collection.  c can be a matplotlib color arg
 (all patches have same color), or a a sequence or rgba tuples; if it
