Commitdc6dee7

committed

change call signature of colorizer._ensure_multivariate_data()

changed from colorizer._ensure_multivariate_data(n_input, A)to colorizer._ensure_multivariate_data(A, n_input)

1 parent15adfc1 commitdc6dee7Copy full SHA for dc6dee7

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6195,8 +6195,8 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,`
`6195`	`6195`	`# If provided, _pcolorargs will check that X, Y and C have the same shape.`
`6196`	`6196`	`# Before this check, we need to convert C from shape (K, N, M), where K is`
`6197`	`6197`	`# the number of variates, to (N, M) with a data type with K fields.`
`6198`		`-data=mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,`
`6199`		`-args[-1])`
	`6198`	`+data=mcolorizer._ensure_multivariate_data(args[-1],`
	`6199`	`+colorizer_obj.norm.n_input)`
`6200`	`6200`	`args= (*args[:-1],data)`
`6201`	`6201`
`6202`	`6202`	`X,Y,C,shading=self._pcolorargs('pcolor',*args,shading=shading,`
`@@ -6474,8 +6474,8 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,`
`6474`	`6474`	`# If provided, _pcolorargs will check that X, Y and C have the same shape.`
`6475`	`6475`	`# Before this check, we need to convert C from shape (K, N, M), where K is`
`6476`	`6476`	`# the number of variates, to (N, M) with a data type with K fields.`
`6477`		`-data=mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,`
`6478`		`-args[-1])`
	`6477`	`+data=mcolorizer._ensure_multivariate_data(args[-1],`
	`6478`	`+colorizer_obj.norm.n_input)`
`6479`	`6479`	`args= (*args[:-1],data)`
`6480`	`6480`
`6481`	`6481`	`X,Y,C,shading=self._pcolorargs('pcolormesh',*args,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ def set_array(self, A):`
`582`	`582`	`self._A=None`
`583`	`583`	`return`
`584`	`584`
`585`		`-A=_ensure_multivariate_data(self.norm.n_input,A)`
	`585`	`+A=_ensure_multivariate_data(A,self.norm.n_input)`
`586`	`586`
`587`	`587`	`A=cbook.safe_masked_invalid(A,copy=True)`
`588`	`588`	`ifnotnp.can_cast(A.dtype,float,"same_kind"):`
`@@ -862,7 +862,7 @@ def _ensure_cmap(cmap, accept_multivariate=False):`
`862`	`862`	`returncm.colormaps[cmap_name]`
`863`	`863`
`864`	`864`
`865`		`-def_ensure_multivariate_data(n_input,data):`
	`865`	`+def_ensure_multivariate_data(data,n_input):`
`866`	`866`	`"""`
`867`	`867`	`Ensure that the data has dtype with n_input.`
`868`	`868`	`Input data of shape (n_input, n, m) is converted to an array of shape`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ def _normalize_image_array(A, n_input=1):`
`643`	`643`	`Check validity of image-like input A and normalize it to a format suitable for`
`644`	`644`	`Image subclasses.`
`645`	`645`	`"""`
`646`		`-A=mcolorizer._ensure_multivariate_data(n_input,A)`
	`646`	`+A=mcolorizer._ensure_multivariate_data(A,n_input)`
`647`	`647`	`A=cbook.safe_masked_invalid(A,copy=True)`
`648`	`648`	`ifn_input==1:`
`649`	`649`	`ifA.dtype!=np.uint8andnotnp.can_cast(A.dtype,float,"same_kind"):`

Comments

(0)