SF.net SVN: matplotlib: [5753] branches/v0_91_maint/lib/matplotlib/lines.py

[<ef...@us...>]

Revision: 5753
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5753&view=rev
Author:   efiring
Date:     2008-07-12 14:15:00 -0700 (Sat, 12 Jul 2008)

Log Message:
-----------
Handle markeredgecolor=None etc. consistently

Modified Paths:
--------------
    branches/v0_91_maint/lib/matplotlib/lines.py

Modified: branches/v0_91_maint/lib/matplotlib/lines.py
===================================================================
--- branches/v0_91_maint/lib/matplotlib/lines.py	2008-07-12 21:04:09 UTC (rev 5752)
+++ branches/v0_91_maint/lib/matplotlib/lines.py	2008-07-12 21:15:00 UTC (rev 5753)
@@ -238,12 +238,6 @@
         if linestyle is None   : linestyle=rcParams['lines.linestyle']
         if marker is None      : marker=rcParams['lines.marker']
         if color is None       : color=rcParams['lines.color']
-        if markeredgecolor is None :
-            markeredgecolor='auto'
-        if markerfacecolor is None :
-            markerfacecolor='auto'
-        if markeredgewidth is None :
-            markeredgewidth=rcParams['lines.markeredgewidth']
 
         if markersize is None  : markersize=rcParams['lines.markersize']
         if antialiased is None : antialiased=rcParams['lines.antialiased']
@@ -654,6 +648,8 @@
 
         ACCEPTS: any matplotlib color
         """
+        if ec is None:
+            ec = 'auto'
         self._markeredgecolor = ec
 
     def set_markeredgewidth(self, ew):
@@ -662,6 +658,8 @@
 
         ACCEPTS: float value in points
         """
+        if ew is None:
+            ew = rcParams['lines.markeredgewidth']
         self._markeredgewidth = ew
 
     def set_markerfacecolor(self, fc):
@@ -670,6 +668,8 @@
 
         ACCEPTS: any matplotlib color
         """
+        if fc is None:
+            fc = 'auto'
         self._markerfacecolor = fc
 
     def set_markersize(self, sz):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.