Commit9b30845

committed

ENH: Accept ('color', alpha) tuple to define a color

1 parentf10d0d1 commit9b30845Copy full SHA for 9b30845

File tree

+27

-0

lines changed

+27

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -286,6 +286,11 @@ def to_rgba(c, alpha=None):`
`286`	`286`	Tuple of floats ``(r, g, b, a)``, where each channel (red, green, blue,
`287`	`287`	`alpha) can assume values between 0 and 1.`
`288`	`288`	`"""`
	`289`	`+ifisinstance(c,tuple)andlen(c)==2andisinstance(c[0],str):`
	`290`	`+if0<=c[1]<=1:`
	`291`	`+c,alpha=c[0],c[1]`
	`292`	`+else:`
	`293`	`+raiseValueError('Alpha must be between 0 and 1, inclusive.')`
`289`	`294`	`# Special-case nth color syntax because it should not be cached.`
`290`	`295`	`if_is_nth_color(c):`
`291`	`296`	`prop_cycler=mpl.rcParams['axes.prop_cycle']`
`@@ -428,6 +433,11 @@ def to_rgba_array(c, alpha=None):`
`428`	`433`	`# Special-case inputs that are already arrays, for performance. (If the`
`429`	`434`	`# array has the wrong kind or shape, raise the error during one-at-a-time`
`430`	`435`	`# conversion.)`
	`436`	`+ifisinstance(c,tuple)andlen(c)==2andisinstance(c[0],str):`
	`437`	`+if0<=c[1]<=1:`
	`438`	`+c,alpha=c[0],c[1]`
	`439`	`+else:`
	`440`	`+raiseValueError('Alpha must be between 0 and 1, inclusive.')`
`431`	`441`	`ifnp.iterable(alpha):`
`432`	`442`	`alpha=np.asarray(alpha).ravel()`
`433`	`443`	`if (isinstance(c,np.ndarray)andc.dtype.kindin"if"`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1301,6 +1301,21 @@ def test_to_rgba_array_alpha_array():`
`1301`	`1301`	`assert_array_equal(c[:,3],alpha)`
`1302`	`1302`
`1303`	`1303`
	`1304`	`+deftest_to_rgba_array_color_alpha_tuple():`
	`1305`	`+booleans=mcolors.to_rgba_array(('red',0.1)) \`
	`1306`	`+==mcolors.to_rgba_array('red',alpha=0.1)`
	`1307`	`+assertbooleans.all()`
	`1308`	`+`
	`1309`	`+`
	`1310`	`+deftest_to_rgba_array_raises_error():`
	`1311`	`+withpytest.raises(ValueError,match='Alpha must be between 0 and 1,'):`
	`1312`	`+mcolors.to_rgba_array(('blue',2))`
	`1313`	`+`
	`1314`	`+`
	`1315`	`+deftest_to_rgba_color_alpha_tuple():`
	`1316`	`+assertmcolors.to_rgba(('red',0.1))==mcolors.to_rgba('red',alpha=0.1)`
	`1317`	`+`
	`1318`	`+`
`1304`	`1319`	`deftest_failed_conversions():`
`1305`	`1320`	`withpytest.raises(ValueError):`
`1306`	`1321`	`mcolors.to_rgba('5')`
`@@ -1313,6 +1328,8 @@ def test_failed_conversions():`
`1313`	`1328`	`withpytest.raises(ValueError):`
`1314`	`1329`	`# Gray must be a string to distinguish 3-4 grays from RGB or RGBA.`
`1315`	`1330`	`mcolors.to_rgba(0.4)`
	`1331`	`+withpytest.raises(ValueError,match='Alpha must be between 0 and 1,'):`
	`1332`	`+mcolors.to_rgba(('blue',2))`
`1316`	`1333`
`1317`	`1334`
`1318`	`1335`	`deftest_grey_gray():`

Comments

(0)