NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commit4a0d9c5

authored

Merge pull request#14313 from efiring/masked_to_rgba

Support masked array inputs for to_rgba and to_rgba_array.

2 parents9ed01e9 +4d62e65 commit4a0d9c5Copy full SHA for 4a0d9c5

File tree

2 files changed

+19

-1

lines changed

lib/matplotlib
- colors.py
- tests
  - test_colors.py

2 files changed

+19

-1

lines changed

`‎lib/matplotlib/colors.py`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ def to_rgba(c, alpha=None):`
`152`	`152`
`153`	`153`	`Parameters`
`154`	`154`	`----------`
`155`		`- c : Matplotlib color`
	`155`	+ c : Matplotlib color or ``np.ma.masked``
`156`	`156`
`157`	`157`	`alpha : scalar, optional`
`158`	`158`	If alpha is not ``None``, it forces the alpha value, except if c is
`@@ -189,6 +189,8 @@ def _to_rgba_no_colorcycle(c, alpha=None):`
`189`	`189`	``"none"`` (case-insensitive), which always maps to ``(0, 0, 0, 0)``.
`190`	`190`	`"""`
`191`	`191`	`orig_c=c`
	`192`	`+ifcisnp.ma.masked:`
	`193`	`+return (0.,0.,0.,0.)`
`192`	`194`	`ifisinstance(c,str):`
`193`	`195`	`ifc.lower()=="none":`
`194`	`196`	`return (0.,0.,0.,0.)`
`@@ -260,19 +262,25 @@ def to_rgba_array(c, alpha=None):`
`260`	`262`
`261`	`263`	If alpha is not ``None``, it forces the alpha value. If c is
`262`	`264`	``"none"`` (case-insensitive) or an empty list, an empty array is returned.
	`265`	`+ If c is a masked array, an ndarray is returned with a (0, 0, 0, 0)`
	`266`	`+ row for each masked value or row in c.`
`263`	`267`	`"""`
`264`	`268`	`# Special-case inputs that are already arrays, for performance. (If the`
`265`	`269`	`# array has the wrong kind or shape, raise the error during one-at-a-time`
`266`	`270`	`# conversion.)`
`267`	`271`	`if (isinstance(c,np.ndarray)andc.dtype.kindin"if"`
`268`	`272`	`andc.ndim==2andc.shape[1]in [3,4]):`
	`273`	`+mask=c.mask.any(axis=1)ifnp.ma.is_masked(c)elseNone`
	`274`	`+c=np.ma.getdata(c)`
`269`	`275`	`ifc.shape[1]==3:`
`270`	`276`	`result=np.column_stack([c,np.zeros(len(c))])`
`271`	`277`	`result[:,-1]=alphaifalphaisnotNoneelse1.`
`272`	`278`	`elifc.shape[1]==4:`
`273`	`279`	`result=c.copy()`
`274`	`280`	`ifalphaisnotNone:`
`275`	`281`	`result[:,-1]=alpha`
	`282`	`+ifmaskisnotNone:`
	`283`	`+result[mask]=0`
`276`	`284`	`ifnp.any((result<0)\| (result>1)):`
`277`	`285`	`raiseValueError("RGBA values should be within 0-1 range")`
`278`	`286`	`returnresult`

`‎lib/matplotlib/tests/test_colors.py`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -821,6 +821,16 @@ def test_conversions():`
`821`	`821`	`hex_color`
`822`	`822`
`823`	`823`
	`824`	`+deftest_conversions_masked():`
	`825`	`+x1=np.ma.array(['k','b'],mask=[True,False])`
	`826`	`+x2=np.ma.array([[0,0,0,1], [0,0,1,1]])`
	`827`	`+x2[0]=np.ma.masked`
	`828`	`+assertmcolors.to_rgba(x1[0])== (0,0,0,0)`
	`829`	`+assert_array_equal(mcolors.to_rgba_array(x1),`
	`830`	`+ [[0,0,0,0], [0,0,1,1]])`
	`831`	`+assert_array_equal(mcolors.to_rgba_array(x2),mcolors.to_rgba_array(x1))`
	`832`	`+`
	`833`	`+`
`824`	`834`	`deftest_to_rgba_array_single_str():`
`825`	`835`	`# single color name is valid`
`826`	`836`	`assert_array_equal(mcolors.to_rgba_array("red"), [(1,0,0,1)])`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit4a0d9c5

File tree

2 files changed

2 files changed

`‎lib/matplotlib/colors.py`

`‎lib/matplotlib/tests/test_colors.py`

0 commit comments