Commite1ee7dc

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 parentcbb1979 commite1ee7dcCopy full SHA for e1ee7dc

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6208,8 +6208,8 @@ def pcolor(self, *args, shading=None, alpha=None, norm=None, cmap=None,`
`6208`	`6208`	`# If provided, _pcolorargs will check that X, Y and C have the same shape.`
`6209`	`6209`	`# Before this check, we need to convert C from shape (K, N, M), where K is`
`6210`	`6210`	`# the number of variates, to (N, M) with a data type with K fields.`
`6211`		`-data=mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,`
`6212`		`-args[-1])`
	`6211`	`+data=mcolorizer._ensure_multivariate_data(args[-1],`
	`6212`	`+colorizer_obj.norm.n_input)`
`6213`	`6213`	`args= (*args[:-1],data)`
`6214`	`6214`
`6215`	`6215`	`X,Y,C,shading=self._pcolorargs('pcolor',*args,shading=shading,`
`@@ -6465,8 +6465,8 @@ def pcolormesh(self, *args, alpha=None, norm=None, cmap=None, vmin=None,`
`6465`	`6465`	`# If provided, _pcolorargs will check that X, Y and C have the same shape.`
`6466`	`6466`	`# Before this check, we need to convert C from shape (K, N, M), where K is`
`6467`	`6467`	`# the number of variates, to (N, M) with a data type with K fields.`
`6468`		`-data=mcolorizer._ensure_multivariate_data(colorizer_obj.norm.n_input,`
`6469`		`-args[-1])`
	`6468`	`+data=mcolorizer._ensure_multivariate_data(args[-1],`
	`6469`	`+colorizer_obj.norm.n_input)`
`6470`	`6470`	`args= (*args[:-1],data)`
`6471`	`6471`
`6472`	`6472`	`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
`@@ -646,7 +646,7 @@ def _normalize_image_array(A, n_input=1):`
`646`	`646`	`Check validity of image-like input A and normalize it to a format suitable for`
`647`	`647`	`Image subclasses.`
`648`	`648`	`"""`
`649`		`-A=mcolorizer._ensure_multivariate_data(n_input,A)`
	`649`	`+A=mcolorizer._ensure_multivariate_data(A,n_input)`
`650`	`650`	`A=cbook.safe_masked_invalid(A,copy=True)`
`651`	`651`	`ifn_input==1:`
`652`	`652`	`ifA.dtype!=np.uint8andnotnp.can_cast(A.dtype,float,"same_kind"):`

Comments

(0)