diff --git a/doc/users/plotting/colormaps/grayscale.py b/doc/users/plotting/colormaps/grayscale.py index 605aced8e593..bc4f7c2ef55a 100644 --- a/doc/users/plotting/colormaps/grayscale.py +++ b/doc/users/plotting/colormaps/grayscale.py @@ -22,21 +22,23 @@ # Have colormaps separated into categories: http://matplotlib.org/examples/color/colormaps_reference.html -cmaps = [('Sequential', ['binary', 'Blues', 'BuGn', 'BuPu', 'gist_yarg', +cmaps = [('Sequential', ['Blues', 'BuGn', 'BuPu', 'GnBu', 'Greens', 'Greys', 'Oranges', 'OrRd', 'PuBu', 'PuBuGn', 'PuRd', 'Purples', 'RdPu', 'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd']), - ('Sequential2', ['afmhot', 'autumn', 'bone', 'cool', 'copper', - 'gist_gray', 'gist_heat', 'gray', 'hot', 'pink', + ('Sequential (2)', ['afmhot', 'autumn', 'bone', 'cool', 'copper', + 'gist_heat', 'gray', 'hot', 'pink', 'spring', 'summer', 'winter']), ('Diverging', ['BrBG', 'bwr', 'coolwarm', 'PiYG', 'PRGn', 'PuOr', - 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'seismic']), - ('Qualitative', ['Accent', 'Dark2', 'hsv', 'Paired', 'Pastel1', - 'Pastel2', 'Set1', 'Set2', 'Set3', 'spectral']), - ('Miscellaneous', ['gist_earth', 'gist_ncar', 'gist_rainbow', - 'gist_stern', 'jet', 'brg', 'CMRmap', 'cubehelix', - 'gnuplot', 'gnuplot2', 'ocean', 'rainbow', - 'terrain', 'flag', 'prism'])] + 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'Spectral', + 'seismic']), + ('Qualitative', ['Accent', 'Dark2', 'Paired', 'Pastel1', + 'Pastel2', 'Set1', 'Set2', 'Set3']), + ('Miscellaneous', ['gist_earth', 'terrain', 'ocean', 'gist_stern', + 'brg', 'CMRmap', 'cubehelix', + 'gnuplot', 'gnuplot2', 'gist_ncar', + 'nipy_spectral', 'jet', 'rainbow', + 'gist_rainbow', 'hsv', 'flag', 'prism'])] # indices to step through colormap x = np.linspace(0.0, 1.0, 100) diff --git a/doc/users/plotting/colormaps/lightness.py b/doc/users/plotting/colormaps/lightness.py index e34fb1642271..b3da52a564ec 100644 --- a/doc/users/plotting/colormaps/lightness.py +++ b/doc/users/plotting/colormaps/lightness.py @@ -1,5 +1,7 @@ ''' -For each colormap, plot the lightness parameter L* from CIELAB colorspace along the y axis vs index through the colormap. Colormaps are examined in categories as in the original matplotlib gallery of colormaps. +For each colormap, plot the lightness parameter L* from CIELAB colorspace +along the y axis vs index through the colormap. Colormaps are examined in +categories as in the original matplotlib gallery of colormaps. ''' from skimage import color @@ -21,21 +23,23 @@ # Have colormaps separated into categories: http://matplotlib.org/examples/color/colormaps_reference.html -cmaps = [('Sequential', ['binary', 'Blues', 'BuGn', 'BuPu', 'gist_yarg', +cmaps = [('Sequential', ['Blues', 'BuGn', 'BuPu', 'GnBu', 'Greens', 'Greys', 'Oranges', 'OrRd', 'PuBu', 'PuBuGn', 'PuRd', 'Purples', 'RdPu', 'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd']), - ('Sequential2', ['afmhot', 'autumn', 'bone', 'cool', 'copper', - 'gist_gray', 'gist_heat', 'gray', 'hot', 'pink', + ('Sequential (2)', ['afmhot', 'autumn', 'bone', 'cool', 'copper', + 'gist_heat', 'gray', 'hot', 'pink', 'spring', 'summer', 'winter']), ('Diverging', ['BrBG', 'bwr', 'coolwarm', 'PiYG', 'PRGn', 'PuOr', - 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'seismic']), - ('Qualitative', ['Accent', 'Dark2', 'hsv', 'Paired', 'Pastel1', - 'Pastel2', 'Set1', 'Set2', 'Set3', 'spectral']), - ('Miscellaneous', ['gist_earth', 'gist_ncar', 'gist_rainbow', - 'gist_stern', 'jet', 'brg', 'CMRmap', 'cubehelix', - 'gnuplot', 'gnuplot2', 'ocean', 'rainbow', - 'terrain', 'flag', 'prism'])] + 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'Spectral', + 'seismic']), + ('Qualitative', ['Accent', 'Dark2', 'Paired', 'Pastel1', + 'Pastel2', 'Set1', 'Set2', 'Set3']), + ('Miscellaneous', ['gist_earth', 'terrain', 'ocean', 'gist_stern', + 'brg', 'CMRmap', 'cubehelix', + 'gnuplot', 'gnuplot2', 'gist_ncar', + 'nipy_spectral', 'jet', 'rainbow', + 'gist_rainbow', 'hsv', 'flag', 'prism'])] # indices to step through colormap x = np.linspace(0.0, 1.0, 100) @@ -45,10 +49,10 @@ # Do subplots so that colormaps have enough space. 5 per subplot? dsub = 5 # number of colormaps per subplot - if cmap_category == 'Diverging': # because has 13 colormaps + if cmap_category == 'Diverging': # because has 12 colormaps + dsub = 6 + elif cmap_category == 'Sequential (2)': dsub = 6 - elif cmap_category == 'Sequential2': - dsub = 7 elif cmap_category == 'Sequential': dsub = 7 nsubplots = int(np.ceil(len(cmap_list)/float(dsub))) @@ -82,22 +86,16 @@ ax.axis([-0.1,4.7,0,100]) locs.append(x[-1]+j*dc) # store locations for colormap labels - elif cmap_category=='Sequential2': + elif cmap_category=='Sequential (2)': dc = 1.15 ax.scatter(x+j*dc, lab[0,:,0], c=x, cmap=cmap, s=300, linewidths=0.) - if i==0: - ax.axis([-0.1,8.1,0,100]) - else: - ax.axis([-0.1,7.0,0,100]) + ax.axis([-0.1,7.0,0,100]) locs.append(x[-1]+j*dc) # store locations for colormap labels elif cmap_category=='Diverging': dc = 1.2 ax.scatter(x+j*dc, lab[0,:,0], c=x, cmap=cmap, s=300, linewidths=0.) - if i==0: - ax.axis([-0.1,7.1,0,100]) - else: - ax.axis([-0.1,6,0,100]) + ax.axis([-0.1,7.1,0,100]) locs.append(x[int(x.size/2.)]+j*dc) # store locations for colormap labels elif cmap_category=='Qualitative':