Commit f37729d

author

pelson

committed

Full support for string cmaps.

1 parent 70c2cbb commit f37729dCopy full SHA for f37729d

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ def get_cmap(name=None, lut=None):`
`151`	`151`	`return cmap_d[name]`
`152`	`152`	`elif name in datad:`
`153`	`153`	`return _generate_cmap(name, lut)`
`154`		`-else:`
`155`		`- raise ValueError("Colormap %s is not recognized" % name)`
	`154`	`+`
	`155`	`+ raise ValueError("Colormap %s is not recognized" % name)`
`156`	`156`
`157`	`157`	`class ScalarMappable:`
`158`	`158`	`"""`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,6 @@ def __init__(self, ax, args, *kwargs):`
`766`	`766`	`if self.origin is not None: assert(self.origin in`
`767`	`767`	`['lower', 'upper', 'image'])`
`768`	`768`	`if self.extent is not None: assert(len(self.extent) == 4)`
`769`		`- if cmap is not None: assert(isinstance(cmap, colors.Colormap))`
`770`	`769`	`if self.colors is not None and cmap is not None:`
`771`	`770`	`raise ValueError('Either colors or cmap must be None')`
`772`	`771`	`if self.origin == 'image': self.origin = mpl.rcParams['image.origin']`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`import numpy as np`
`6`	`6`	`import matplotlib`
`7`	`7`	`import matplotlib.patches as patches`
`8`		`-`
	`8`	`+frommatplotlib.cmimportget_cmap`
`9`	`9`
`10`	`10`	`__all__ = ['streamplot']`
`11`	`11`
`@@ -105,7 +105,9 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,`
`105`	`105`	`if norm is None:`
`106`	`106`	`norm = matplotlib.colors.normalize(color.min(), color.max())`
`107`	`107`	`if cmap is None:`
`108`		`- cmap = matplotlib.cm.get_cmap(matplotlib.rcParams['image.cmap'])`
	`108`	`+ cmap = get_cmap(matplotlib.rcParams['image.cmap'])`
	`109`	`+ else:`
	`110`	`+ cmap = get_cmap(cmap)`
`109`	`111`
`110`	`112`	`streamlines = []`
`111`	`113`	`for t in trajectories:`

Comments

(0)