Fixed code added in 0c20b5c

tacaswell · tacaswell · commit 17fa943221f9 · 2013-01-22T20:11:32.000-06:00
(PR #1505). Tests added is #1663 pass with this patch.
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -267,7 +267,7 @@ def contains(self, mouseevent):
         # the math involved in checking for containment (here and inside of segment_hits) assumes
         # that it is OK to overflow.  In case the application has set the error flags such that
         # an exception is raised on overflow, we temporarily set the appropriate error flags here
-        # and set them back when we are finished. 
+        # and set them back when we are finished.
         olderrflags = np.seterr(all='ignore')
         try:
             # Check for collision
@@ -448,7 +448,7 @@ def recache(self, always=False):
     def _transform_path(self, subslice=None):
         """
         Puts a TransformedPath instance at self._transformed_path,
-        all invalidation of the transform is then handled by the 
+        all invalidation of the transform is then handled by the
         TransformedPath instance.
         """
         # Masked arrays are now handled by the Path class itself
@@ -540,7 +540,7 @@ def draw(self, renderer):
             else:
                 gc.set_foreground(edgecolor)
                 gc.set_linewidth(self._markeredgewidth)
-            gc.set_alpha(self._alpha)
+
             marker = self._marker
             tpath, affine = transformed_path.get_transformed_points_and_affine()
             if len(tpath.vertices):
@@ -970,7 +970,7 @@ def _get_rgba_face(self, alt=False):
         if is_string_like(facecolor) and facecolor.lower() == 'none':
             rgbaFace = None
         else:
-            rgbaFace = colorConverter.to_rgba(facecolor)
+            rgbaFace = colorConverter.to_rgba(facecolor, self._alpha)
         return rgbaFace
 
     # some aliases....
