Commita18b4bf

authored

Merge pull request#18870 from aitikgupta/scalarmappable-set_array

Expand ScalarMappable.set_array to accept array-like inputs

2 parents4c5eff9 +0ec672f commita18b4bfCopy full SHA for a18b4bf

File tree

+28

-4

lines changed

+28

-4

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,12 +361,21 @@ def to_rgba(self, x, alpha=None, bytes=False, norm=True):`
`361`	`361`
`362`	`362`	`defset_array(self,A):`
`363`	`363`	`"""`
`364`		`- Set the image array fromnumpyarray A.`
	`364`	`+ Set the image array from array-like A.`
`365`	`365`
`366`	`366`	`Parameters`
`367`	`367`	`----------`
`368`		`- A :ndarray or None`
	`368`	`+ A :array-like or None`
`369`	`369`	`"""`
	`370`	`+ifAisNone:`
	`371`	`+self._A=None`
	`372`	`+return`
	`373`	`+`
	`374`	`+A=cbook.safe_masked_invalid(A,copy=True)`
	`375`	`+ifnotnp.can_cast(A.dtype,float,"same_kind"):`
	`376`	`+raiseTypeError(f"Image data of dtype{A.dtype} cannot be "`
	`377`	`+"converted to float")`
	`378`	`+`
`370`	`379`	`self._A=A`
`371`	`380`
`372`	`381`	`defget_array(self):`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1346,8 +1346,7 @@ def make_image(self, renderer, magnification=1.0, unsampled=False):`
`1346`	`1346`
`1347`	`1347`	`defset_data(self,A):`
`1348`	`1348`	`"""Set the image array."""`
`1349`		`-cm.ScalarMappable.set_array(self,`
`1350`		`-cbook.safe_masked_invalid(A,copy=True))`
	`1349`	`+cm.ScalarMappable.set_array(self,A)`
`1351`	`1350`	`self.stale=True`
`1352`	`1351`
`1353`	`1352`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -677,6 +677,22 @@ def test_collection_set_verts_array():`
`677`	`677`	`assertnp.array_equal(ap._codes,atp._codes)`
`678`	`678`
`679`	`679`
	`680`	`+deftest_collection_set_array():`
	`681`	`+vals= [*range(10)]`
	`682`	`+`
	`683`	`+# Test set_array with list`
	`684`	`+c=Collection()`
	`685`	`+c.set_array(vals)`
	`686`	`+`
	`687`	`+# Test set_array with wrong dtype`
	`688`	`+withpytest.raises(TypeError,match="^Image data of dtype"):`
	`689`	`+c.set_array("wrong_input")`
	`690`	`+`
	`691`	`+# Test if array kwarg is copied`
	`692`	`+vals[5]=45`
	`693`	`+assertnp.not_equal(vals,c.get_array()).any()`
	`694`	`+`
	`695`	`+`
`680`	`696`	`deftest_blended_collection_autolim():`
`681`	`697`	`a= [1,2,4]`
`682`	`698`	`height=.2`

Comments

(0)