Commiteeb895c

committed

Changes to colorizer to prepare for multivariate plotting

1 parent6985111 commiteeb895cCopy full SHA for eeb895c

File tree

+288

-74

lines changed

+288

-74

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,17 @@ def safe_masked_invalid(x, copy=False):`
`690`	`690`	`try:`
`691`	`691`	`xm=np.ma.masked_where(~(np.isfinite(x)),x,copy=False)`
`692`	`692`	`exceptTypeError:`
`693`		`-returnx`
	`693`	`+iflen(x.dtype.descr)==1:`
	`694`	`+returnx`
	`695`	`+else:`
	`696`	`+# in case of a dtype with multiple fields:`
	`697`	`+try:`
	`698`	`+mask=np.empty(x.shape,dtype=np.dtype('bool, '*len(x.dtype.descr)))`
	`699`	`+fordd,dminzip(x.dtype.descr,mask.dtype.descr):`
	`700`	`+mask[dm[0]]=~(np.isfinite(x[dd[0]]))`
	`701`	`+xm=np.ma.array(x,mask=mask,copy=False)`
	`702`	`+exceptTypeError:`
	`703`	`+returnx`
`694`	`704`	`returnxm`
`695`	`705`
`696`	`706`

Lines changed: 0 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,32 +278,3 @@ def get_cmap(name=None, lut=None):`
`278`	`278`	`return_colormaps[name]`
`279`	`279`	`else:`
`280`	`280`	`return_colormaps[name].resampled(lut)`
`281`		`-`
`282`		`-`
`283`		`-def_ensure_cmap(cmap):`
`284`		`-"""`
`285`		- Ensure that we have a `.Colormap` object.
`286`		`-`
`287`		`- For internal use to preserve type stability of errors.`
`288`		`-`
`289`		`- Parameters`
`290`		`- ----------`
`291`		`- cmap : None, str, Colormap`
`292`		`-`
`293`		- - if a `Colormap`, return it
`294`		`- - if a string, look it up in mpl.colormaps`
`295`		`- - if None, look up the default color map in mpl.colormaps`
`296`		`-`
`297`		`- Returns`
`298`		`- -------`
`299`		`- Colormap`
`300`		`-`
`301`		`- """`
`302`		`-ifisinstance(cmap,colors.Colormap):`
`303`		`-returncmap`
`304`		`-cmap_name=mpl._val_or_rc(cmap,"image.cmap")`
`305`		`-# use check_in_list to ensure type stability of the exception raised by`
`306`		`-# the internal usage of this (ValueError vs KeyError)`
`307`		`-ifcmap_namenotin_colormaps:`
`308`		`-_api.check_in_list(sorted(_colormaps),cmap=cmap_name)`
`309`		`-returnmpl.colormaps[cmap_name]`

Comments

(0)