Revision: 3962
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3962&view=rev
Author: mdboom
Date: 2007-10-18 08:06:49 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Merged revisions 3956-3961 via svnmerge from
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib
........
r3961 | jdh2358 | 2007-10-18 11:02:13 -0400 (Thu, 18 Oct 2007) | 3 lines
Fixed collection.set_facecolor to respect alpha
........
Modified Paths:
--------------
branches/transforms/lib/matplotlib/collections.py
branches/transforms/lib/matplotlib/mlab.py
Property Changed:
----------------
branches/transforms/
Property changes on: branches/transforms
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/matplotlib:1-3955
+ /trunk/matplotlib:1-3961
Modified: branches/transforms/lib/matplotlib/collections.py
===================================================================
--- branches/transforms/lib/matplotlib/collections.py 2007-10-18 15:02:13 UTC
(rev 3961)
+++ branches/transforms/lib/matplotlib/collections.py 2007-10-18 15:06:49 UTC
(rev 3962)
@@ -311,7 +311,8 @@
ACCEPTS: matplotlib color arg or sequence of rgba tuples
"""
- self._facecolors = _colors.colorConverter.to_rgba_list(c)
+ self._facecolors = _colors.colorConverter.to_rgba_list(c, self._alpha)
+
set_facecolors = set_facecolor
def set_edgecolor(self, c):
Modified: branches/transforms/lib/matplotlib/mlab.py
===================================================================
--- branches/transforms/lib/matplotlib/mlab.py 2007-10-18 15:02:13 UTC (rev
3961)
+++ branches/transforms/lib/matplotlib/mlab.py 2007-10-18 15:06:49 UTC (rev
3962)
@@ -1342,9 +1342,15 @@
process_skiprows(reader)
+ def myfloat(x):
+ if x==missing:
+ return npy.nan
+ else:
+ return float(x)
+
def get_func(item, func):
# promote functions in this order
- funcmap = {int:float, float:dateutil.parser.parse,
dateutil.parser.parse:str}
+ funcmap = {int:myfloat, myfloat:dateutil.parser.parse,
dateutil.parser.parse:str}
try: func(item)
except:
if func==str:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
