In collections draw methods, use get_facecolor and get_edgecolor.

The logic for edgecolors='face' is moved into get_edgecolor so
that it will return the color(s) that will actually be used.
Using the getters means that a derived class can override
them to add more logic to the choice of colors.

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

Author: efiring

lib/matplotlib/collections.py

@@ -184,16 +184,12 @@ def draw(self, renderer):
             offsets = transOffset.transform_non_affine(offsets)
             transOffset = transOffset.get_affine()
 
-        if self._edgecolors == 'face':
-            edgecolors = self._facecolors
-        else:
-            edgecolors = self._edgecolors
 
         renderer.draw_path_collection(
             transform.frozen(), self.clipbox, clippath, clippath_trans,
             paths, self.get_transforms(),
             offsets, transOffset,
-            self._facecolors, edgecolors, self._linewidths,
+            self.get_facecolor(), self.get_edgecolor(), self._linewidths,
             self._linestyles, self._antialiaseds)
         renderer.close_group(self.__class__.__name__)
 
@@ -315,7 +311,10 @@ def get_facecolor(self):
     get_facecolors = get_facecolor
 
     def get_edgecolor(self):
-        return self._edgecolors
+        if self._edgecolors == 'face':
+            return self.get_facecolors()
+        else:
+            return self._edgecolors
     get_edgecolors = get_edgecolor
 
     def set_edgecolor(self, c):
@@ -534,7 +533,7 @@ def draw(self, renderer):
         renderer.draw_quad_mesh(
             transform.frozen(), self.clipbox, clippath, clippath_trans,
             self._meshWidth, self._meshHeight, coordinates,
-            offsets, transOffset, self._facecolors, self._antialiased,
+            offsets, transOffset, self.get_facecolor(), self._antialiased,
             self._showedges)
         renderer.close_group(self.__class__.__name__)