Commit8ddf3ea

committed

Adding 2d support to quadmesh set_array

1 parentef9fc20 commit8ddf3eaCopy full SHA for 8ddf3ea

File tree

+24

-3

lines changed

+24

-3

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,8 @@ def update_scalarmappable(self):`
`782`	`782`	`"""Update colors from the scalar mappable array, if it is not None."""`
`783`	`783`	`ifself._AisNone:`
`784`	`784`	`return`
`785`		`-ifself._A.ndim>1:`
	`785`	`+# QuadMesh can map 2d arrays`
	`786`	`+ifself._A.ndim>1andnotisinstance(self,QuadMesh):`
`786`	`787`	`raiseValueError('Collections can only map rank 1 arrays')`
`787`	`788`	`ifnotself.check_update("array"):`
`788`	`789`	`return`
`@@ -2071,8 +2072,10 @@ def draw(self, renderer):`
`2071`	`2072`	`else:`
`2072`	`2073`	`renderer.draw_quad_mesh(`
`2073`	`2074`	`gc,transform.frozen(),self._meshWidth,self._meshHeight,`
`2074`		`-coordinates,offsets,transOffset,self.get_facecolor(),`
`2075`		`-self._antialiased,self.get_edgecolors())`
	`2075`	`+coordinates,offsets,transOffset,`
	`2076`	`+# Backends expect flattened rgba arrays (n*m, 4) for fc and ec`
	`2077`	`+self.get_facecolor().reshape((-1,4)),`
	`2078`	`+self._antialiased,self.get_edgecolors().reshape((-1,4)))`
`2076`	`2079`	`gc.restore()`
`2077`	`2080`	`renderer.close_group(self.__class__.__name__)`
`2078`	`2081`	`self.stale=False`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -623,3 +623,21 @@ def test_collection_set_verts_array():`
`623`	`623`	`forap,lpinzip(col_arr._paths,col_list._paths):`
`624`	`624`	`assertnp.array_equal(ap._vertices,lp._vertices)`
`625`	`625`	`assertnp.array_equal(ap._codes,lp._codes)`
	`626`	`+`
	`627`	`+`
	`628`	`+deftest_quadmesh_set_array():`
	`629`	`+x=np.arange(4)`
	`630`	`+y=np.arange(4)`
	`631`	`+z=np.arange(9).reshape((3,3))`
	`632`	`+fig,ax=plt.subplots()`
	`633`	`+coll=ax.pcolormesh(x,y,np.ones(z.shape))`
	`634`	`+# Make sure that the collection was able to update the array based on`
	`635`	`+# 2d input and that it is stored internally as a 1d array`
	`636`	`+coll.set_array(z)`
	`637`	`+fig.canvas.draw()`
	`638`	`+assertnp.array_equal(coll.get_array(),z)`
	`639`	`+`
	`640`	`+# If someone is already passing a 1d array in, make sure that works too`
	`641`	`+coll.set_array(np.ones(9))`
	`642`	`+fig.canvas.draw()`
	`643`	`+assertnp.array_equal(coll.get_array(),np.ones(9))`

Comments

(0)