Commit 2b4ab26

committed

Merge pull request matplotlib#951 from pelson/cmap_strings

Contour and streamplot support for cmaps passed by name.

2 parents a2d44d5 + 715fb43 commit 2b4ab26Copy full SHA for 2b4ab26

File tree

+10

-7

lines changed

+10

-7

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: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@`
`4`	`4`	`"""`
`5`	`5`	`import numpy as np`
`6`	`6`	`import matplotlib`
	`7`	`+import matplotlib.cm as cm`
	`8`	`+import matplotlib.colors as mcolors`
	`9`	`+import matplotlib.collections as mcollections`
`7`	`10`	`import matplotlib.patches as patches`
`8`	`11`
`9`		`-`
`10`	`12`	`__all__ = ['streamplot']`
`11`	`13`
`12`	`14`
`@@ -103,9 +105,11 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,`
`103`	`105`
`104`	`106`	`if use_multicolor_lines:`
`105`	`107`	`if norm is None:`
`106`		`- norm = matplotlib.colors.normalize(color.min(), color.max())`
	`108`	`+ norm = mcolors.normalize(color.min(), color.max())`
`107`	`109`	`if cmap is None:`
`108`		`- cmap = matplotlib.cm.get_cmap(matplotlib.rcParams['image.cmap'])`
	`110`	`+ cmap = cm.get_cmap(matplotlib.rcParams['image.cmap'])`
	`111`	`+ else:`
	`112`	`+ cmap = cm.get_cmap(cmap)`
`109`	`113`
`110`	`114`	`streamlines = []`
`111`	`115`	`for t in trajectories:`
`@@ -137,7 +141,7 @@ def streamplot(axes, x, y, u, v, density=1, linewidth=None, color=None,`
`137`	`141`	`p = patches.FancyArrowPatch(arrow_tail, arrow_head, **arrow_kw)`
`138`	`142`	`axes.add_patch(p)`
`139`	`143`
`140`		`- lc = matplotlib.collections.LineCollection(streamlines, **line_kw)`
	`144`	`+ lc = mcollections.LineCollection(streamlines, **line_kw)`
`141`	`145`	`if use_multicolor_lines:`
`142`	`146`	`lc.set_array(np.asarray(line_colors))`
`143`	`147`	`lc.set_cmap(cmap)`

Comments

(0)