Fix alpha-handling bug in ColorConverter, duplicate color calculation in contour.

efiring · efiring · commit 54cf23cc21d2 · 2006-08-31T23:56:32.000Z
svn path=/trunk/matplotlib/; revision=2737
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -429,12 +429,16 @@ def to_rgb(self, arg, warn=True):
 
         return color
 
-    def to_rgba(self, arg, alpha=1.0, warn=True):
+    def to_rgba(self, arg, alpha=None, warn=True):
         """
         Returns an RGBA tuple of four floats from 0-1.
 
         For acceptable values of arg, see to_rgb.
         """
+        if not is_string_like(arg) and iterable(arg) and len(arg) == 4:
+            alpha = float(arg[3])
+        elif alpha is None:
+            alpha = 1.0
         r,g,b = self.to_rgb(arg, warn)
         return r,g,b,alpha
 
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -680,7 +680,7 @@ def _process_colors(self):
         if self.extend in ('both', 'max', 'min'):
             self.norm.clip = False
         self.set_array(self.layers)
-        self.tcolors = [ (tuple(rgba),) for rgba in self.to_rgba(self.cvalues)]
+        # self.tcolors will be set by the "changed" method
 
     def _process_linewidths(self):
         linewidths = self.linewidths
