From: <ef...@us...> - 2009-03-17 19:15:44
|
Revision: 6984 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6984&view=rev Author: efiring Date: 2009-03-17 19:15:01 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Fix bug in alpha handling. The alpha kwarg was multiplying the existing alpha instead of replacing it. Thanks to Jae-Joon Lee. Modified Paths: -------------- branches/v0_98_5_maint/lib/matplotlib/colors.py Modified: branches/v0_98_5_maint/lib/matplotlib/colors.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/colors.py 2009-03-17 11:49:57 UTC (rev 6983) +++ branches/v0_98_5_maint/lib/matplotlib/colors.py 2009-03-17 19:15:01 UTC (rev 6984) @@ -331,7 +331,7 @@ return tuple(arg) if alpha < 0.0 or alpha > 1.0: raise ValueError("alpha must be in range 0-1") - return arg[0], arg[1], arg[2], arg[3] * alpha + return arg[0], arg[1], arg[2], alpha r,g,b = arg[:3] if [x for x in (r,g,b) if (float(x) < 0) or (x > 1)]: raise ValueError('number in rbg sequence outside 0-1 range') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ef...@us...> - 2009-04-05 02:16:46
|
Revision: 7025 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7025&view=rev Author: efiring Date: 2009-04-05 02:16:44 +0000 (Sun, 05 Apr 2009) Log Message: ----------- Fix PatchCollection bug 2732455 by letting to_rgba handle 'none' Modified Paths: -------------- branches/v0_98_5_maint/lib/matplotlib/colors.py Modified: branches/v0_98_5_maint/lib/matplotlib/colors.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/colors.py 2009-04-05 01:37:26 UTC (rev 7024) +++ branches/v0_98_5_maint/lib/matplotlib/colors.py 2009-04-05 02:16:44 UTC (rev 7025) @@ -318,10 +318,18 @@ Returns an *RGBA* tuple of four floats from 0-1. For acceptable values of *arg*, see :meth:`to_rgb`. + In addition, if *arg* is "none" (case-insensitive), + then (0,0,0,0) will be returned. If *arg* is an *RGBA* sequence and *alpha* is not *None*, *alpha* will replace the original *A*. """ try: + if arg.lower() == 'none': + return (0.0, 0.0, 0.0, 0.0) + except AttributeError: + pass + + try: if not cbook.is_string_like(arg) and cbook.iterable(arg): if len(arg) == 4: if [x for x in arg if (float(x) < 0) or (x > 1)]: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jd...@us...> - 2009-04-19 14:26:16
|
Revision: 7054 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7054&view=rev Author: jdh2358 Date: 2009-04-19 14:26:12 +0000 (Sun, 19 Apr 2009) Log Message: ----------- force a copy of the colormap input data Modified Paths: -------------- branches/v0_98_5_maint/lib/matplotlib/colors.py Modified: branches/v0_98_5_maint/lib/matplotlib/colors.py =================================================================== --- branches/v0_98_5_maint/lib/matplotlib/colors.py 2009-04-19 14:25:41 UTC (rev 7053) +++ branches/v0_98_5_maint/lib/matplotlib/colors.py 2009-04-19 14:26:12 UTC (rev 7054) @@ -483,7 +483,9 @@ xa = np.array([X]) else: vtype = 'array' - xma = ma.asarray(X) + # force a copy here -- the ma.array and filled functions + # do force a cop of the data by default - JDH + xma = ma.array(X, copy=True) xa = xma.filled(0) mask_bad = ma.getmask(xma) if xa.dtype.char in np.typecodes['Float']: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |