Commitc1a55a4

authored

Merge pull request#27848 from rcomer/rbga-nan

FIX: handle nans in RGBA input with ScalarMappables

2 parentsefcca8d +dd94ac3 commitc1a55a4Copy full SHA for c1a55a4

File tree

+33

-1

lines changed

+33

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ def to_rgba(self, x, alpha=None, bytes=False, norm=True):`
`328`	`328`	`treated as an RGB or RGBA array, and no mapping will be done.`
`329`	`329`	The array can be `~numpy.uint8`, or it can be floats with
`330`	`330`	`values in the 0-1 range; otherwise a ValueError will be raised.`
`331`		`-If it is a masked array, any masked elements will be set to 0 alpha.`
	`331`	`+Any NaNs or masked elements will be set to 0 alpha.`
`332`	`332`	`If the last dimension is 3, the alpha kwarg (defaulting to 1)`
`333`	`333`	`will be used to fill in the transparency. If the last dimension`
`334`	`334`	`is 4, the alpha kwarg is ignored; it does not`
`@@ -360,6 +360,12 @@ def to_rgba(self, x, alpha=None, bytes=False, norm=True):`
`360`	`360`	`else:`
`361`	`361`	`raiseValueError("Third dimension must be 3 or 4")`
`362`	`362`	`ifxx.dtype.kind=='f':`
	`363`	`+# If any of R, G, B, or A is nan, set to 0`
	`364`	`+ifnp.any(nans:=np.isnan(x)):`
	`365`	`+ifxx.shape[2]==4:`
	`366`	`+xx=xx.copy()`
	`367`	`+xx[np.any(nans,axis=2), :]=0`
	`368`	`+`
`363`	`369`	`ifnormand (xx.max()>1orxx.min()<0):`
`364`	`370`	`raiseValueError("Floating point image RGB values "`
`365`	`371`	`"must be in the 0..1 range.")`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1352,6 +1352,32 @@ def test_scalarmappable_to_rgba(bytes):`
`1352`	`1352`	`np.testing.assert_almost_equal(sm.to_rgba(xm[..., :3],bytes=bytes),expected)`
`1353`	`1353`
`1354`	`1354`
	`1355`	`+@pytest.mark.parametrize("bytes", (True,False))`
	`1356`	`+deftest_scalarmappable_nan_to_rgba(bytes):`
	`1357`	`+sm=cm.ScalarMappable()`
	`1358`	`+`
	`1359`	`+# RGBA`
	`1360`	`+x=np.ones((2,3,4),dtype=float)*0.5`
	`1361`	`+x[0,0,0]=np.nan`
	`1362`	`+expected=x.copy()`
	`1363`	`+expected[0,0, :]=0`
	`1364`	`+ifbytes:`
	`1365`	`+expected= (expected*255).astype(np.uint8)`
	`1366`	`+np.testing.assert_almost_equal(sm.to_rgba(x,bytes=bytes),expected)`
	`1367`	`+assertnp.any(np.isnan(x))# Input array should not be changed`
	`1368`	`+`
	`1369`	`+# RGB`
	`1370`	`+expected[...,3]=255ifbyteselse1`
	`1371`	`+expected[0,0,3]=0`
	`1372`	`+np.testing.assert_almost_equal(sm.to_rgba(x[..., :3],bytes=bytes),expected)`
	`1373`	`+assertnp.any(np.isnan(x))# Input array should not be changed`
	`1374`	`+`
	`1375`	`+# Out-of-range fail`
	`1376`	`+x[1,0,0]=42`
	`1377`	`+withpytest.raises(ValueError,match='0..1 range'):`
	`1378`	`+sm.to_rgba(x[..., :3],bytes=bytes)`
	`1379`	`+`
	`1380`	`+`
`1355`	`1381`	`deftest_failed_conversions():`
`1356`	`1382`	`withpytest.raises(ValueError):`
`1357`	`1383`	`mcolors.to_rgba('5')`

Comments

(0)