Added norm support to contour and colorbar.

efiring · efiring · commit 0953a5097513 · 2006-01-16T02:04:45.000Z
svn path=/trunk/matplotlib/; revision=1956
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -394,6 +394,7 @@ def __init__(self, ax, *args, **kwargs):
         self.extent = kwargs.get('extent', None)
         cmap = kwargs.get('cmap', None)
         self.colors = kwargs.get('colors', None)
+        norm = kwargs.get('norm', None)
         self.clip_ends = kwargs.get('clip_ends', True)
         self.antialiased = kwargs.get('antialiased', True)
         self.nchunk = kwargs.get('nchunk', 0)
@@ -417,11 +418,12 @@ def __init__(self, ax, *args, **kwargs):
         self.cl = []
         self.cl_cvalues = []
 
-        ScalarMappable.__init__(self, cmap = cmap) # sets self.cmap;
-                                                   # default norm for now
+        kw = {'cmap': cmap}
+        if norm is not None:
+            kw['norm'] = norm
+        ScalarMappable.__init__(self, **kw) # sets self.cmap;
         self._process_colors()
 
-
         if self.filled:
             if self.linewidths is None:
                 self.linewidths = 0.05 # Good default for Postscript.
@@ -453,7 +455,6 @@ def __init__(self, ax, *args, **kwargs):
 
                 if level < 0.0 and self.monochrome:
                     col.set_linestyle((0, (6.,6.)),)
-                    #print "setting dashed"
                 col.set_label(str(level))         # only for self-documentation
                 self.ax.add_collection(col)
                 self.collections.append(col)
@@ -687,6 +688,11 @@ def _process_linewidths(self):
             * cmap = None: a cm Colormap instance from matplotlib.cm.
               - if cmap == None and colors == None, a default Colormap is used.
 
+            * norm = None: a matplotlib.colors.normalize instance for
+              scaling data values to colors.
+              - if norm == None, and colors == None, the default
+                linear scaling is used.
+
             * origin = None: 'upper'|'lower'|'image'|None.
               If 'image', the rc value for image.origin will be used.
               If None (default), the first value of Z will correspond
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -656,8 +656,8 @@ def colorbar(self, mappable,  cax=None,
         """
         Create a colorbar for mappable image
 
-        mappable is the cm.ScalarMappable instance that you want to
-        colorbar to apply to, eg an Image as returned by imshow or a
+        mappable is the cm.ScalarMappable instance that you want the
+        colorbar to apply to, e.g. an Image as returned by imshow or a
         PatchCollection as returned by scatter or pcolor.
 
         tickfmt is a format string to format the colorbar ticks
@@ -750,7 +750,13 @@ def colorbar(self, mappable,  cax=None,
             args = (transpose(Y), transpose(C), transpose(X), clevs)
         else:
             args = (C, Y, X, clevs)
-        kw = {'cmap':cmap}
+        #If colors were listed in the original mappable, then
+        # let contour handle them the same way.
+        colors = getattr(mappable, 'colors', None)
+        if colors is not None:
+            kw = {'colors': colors}
+        else:
+            kw = {'cmap':cmap, 'norm':norm}
         if isContourSet and not mappable.filled:
             CS = cax.contour(*args, **kw)
             colls = mappable.collections
@@ -826,7 +832,7 @@ def figaspect(arg):
     Create a figure with specified aspect ratio.  If arg is a number,
     use that aspect ratio.  If arg is an array, figaspect will
     determine the width and height for a figure that would fit array
-    preserving aspcect ratio.  The figure width, height in inches are
+    preserving aspect ratio.  The figure width, height in inches are
     returned.  Be sure to create an axes with equal with and height,
     eg
 
