SF.net SVN: matplotlib: [5752] trunk/matplotlib/lib/matplotlib/lines.py

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

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

Log Message:
-----------
Handle markerfacecolor=None etc. consistenty

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/lines.py

Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py	2008-07-12 13:22:55 UTC (rev 5751)
+++ trunk/matplotlib/lib/matplotlib/lines.py	2008-07-12 21:04:09 UTC (rev 5752)
@@ -215,12 +215,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']
@@ -628,6 +622,8 @@
 
         ACCEPTS: any matplotlib color
         """
+        if ec is None :
+            ec = 'auto'
         self._markeredgecolor = ec
 
     def set_markeredgewidth(self, ew):
@@ -636,6 +632,8 @@
 
         ACCEPTS: float value in points
         """
+        if ew is None :
+            ew = rcParams['lines.markeredgewidth']
         self._markeredgewidth = ew
 
     def set_markerfacecolor(self, fc):
@@ -644,6 +642,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.