+ {title}¶ +

""" + +link_template = """\ +

+""" + +toc_template = """\ +

""" + + +custom_titles = {'pylab_examples' : 'pylab examples'} -multiimage = re.compile('(.*?)(_\d\d){1,2}') def make_thumbnail(args): image.thumbnail(args[0], args[1], 0.3) + def out_of_date(original, derived): return (not os.path.exists(derived) or os.stat(derived).st_mtime < os.stat(original).st_mtime) + def gen_gallery(app, doctree): if app.builder.name != 'html': return @@ -52,22 +77,12 @@ def gen_gallery(app, doctree): thumbnails = {} rows = [] toc_rows = [] - - link_template = """\ -

- """ - - header_template = """

\ -

%s¶

""" - - toc_template = """\ -

""" - dirs = ('api', 'pylab_examples', 'mplot3d', 'widgets', 'axes_grid' ) for subdir in dirs : - rows.append(header_template % (subdir, subdir, subdir)) - toc_rows.append(toc_template % (subdir, subdir)) + title = custom_titles.get(subdir, subdir) + rows.append(header_template.format(title=title, section=subdir)) + toc_rows.append(toc_template.format(section=subdir)) origdir = os.path.join('build', rootdir, subdir) thumbdir = os.path.join(outdir, rootdir, subdir, 'thumbnails') @@ -99,13 +114,12 @@ def gen_gallery(app, doctree): data.append((subdir, basename, os.path.join(rootdir, subdir, 'thumbnails', filename))) - - - for (subdir, basename, thumbfile) in data: if thumbfile is not None: link = 'examples/%s/%s.html'%(subdir, basename) - rows.append(link_template%(link, thumbfile, basename)) + rows.append(link_template.format(link=link, + thumb=thumbfile, + basename=basename)) if len(data) == 0: warnings.warn("No thumbnails were found in %s" % subdir) @@ -113,19 +127,21 @@ def gen_gallery(app, doctree): # Close out the

opened up at the top of this loop rows.append("

{section}

""" - - -custom_titles = {'pylab_examples' : 'pylab examples'} +

{title}

""" def make_thumbnail(args): @@ -89,7 +98,7 @@ def gen_gallery(app, doctree): for subdir in example_sections: title = custom_titles.get(subdir, subdir) rows.append(header_template.format(title=title, section=subdir)) - toc_rows.append(toc_template.format(section=subdir)) + toc_rows.append(toc_template.format(title=title, section=subdir)) origdir = os.path.join('build', rootdir, subdir) thumbdir = os.path.join(outdir, rootdir, subdir, 'thumbnails') From 402b3014885054ce67b86e834807d0480093ef60 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Fri, 21 Dec 2012 12:11:42 -0800 Subject: [PATCH 14/35] Cleanup and move unicode_demo --- examples/pylab_examples/unicode_demo.py | 15 --------------- examples/tests/backend_driver.py | 6 ++++-- .../text_labels_and_annotations/unicode_demo.py | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 17 deletions(-) delete mode 100755 examples/pylab_examples/unicode_demo.py create mode 100644 examples/text_labels_and_annotations/unicode_demo.py diff --git a/examples/pylab_examples/unicode_demo.py b/examples/pylab_examples/unicode_demo.py deleted file mode 100755 index bba623482a26..000000000000 --- a/examples/pylab_examples/unicode_demo.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- - -from __future__ import unicode_literals - -import pylab - -pylab.plot([1, 2, 4]) -pylab.title('Développés et fabriqués') -pylab.xlabel("réactivité nous permettent d'être sélectionnés et adoptés") -pylab.ylabel('André was here!') -pylab.text( 0.5, 2.5, 'Institut für Festkörperphysik', rotation=45) -pylab.text( 1, 1.5, 'AVA (check kerning)') - -pylab.show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index bc48262f0dd2..4e31c7a43426 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -42,7 +42,6 @@ subplots=os.path.join('..', 'subplots_axes_and_figures'), specialty=os.path.join('..', 'specialty_plots'), showcase=os.path.join('..', 'showcase'), - reference=os.path.join('..', 'reference'), pylab = os.path.join('..', 'pylab_examples'), api = os.path.join('..', 'api'), units = os.path.join('..', 'units'), @@ -76,6 +75,10 @@ 'pie_demo.py', ] +files['text_labels_and_annotations'] = [ + 'unicode_demo.py', + ] + files['subplots_axes_and_figures'] = [ 'subplot_demo.py', ] @@ -234,7 +237,6 @@ 'text_rotation_relative_to_line.py', 'text_themes.py', 'transoffset.py', - 'unicode_demo.py', 'vertical_ticklabels.py', 'vline_demo.py', 'xcorr_demo.py', diff --git a/examples/text_labels_and_annotations/unicode_demo.py b/examples/text_labels_and_annotations/unicode_demo.py new file mode 100644 index 000000000000..295b3c4aa5fd --- /dev/null +++ b/examples/text_labels_and_annotations/unicode_demo.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +""" +Demo of unicode support in text and labels. +""" +from __future__ import unicode_literals + +import matplotlib.pyplot as plt + + +plt.title('Développés et fabriqués') +plt.xlabel("réactivité nous permettent d'être sélectionnés et adoptés") +plt.ylabel('André was here!') +plt.text( 0.2, 0.8, 'Institut für Festkörperphysik', rotation=45) +plt.text( 0.4, 0.2, 'AVA (check kerning)') + +plt.show() From 529d9f787ca21c99469e0f64b38a91a0c3173d02 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Fri, 21 Dec 2012 23:13:56 -0800 Subject: [PATCH 15/35] Consolidate histogram examples --- examples/api/histogram_demo.py | 34 ------------------- .../statistics/histogram_demo_features.py | 3 ++ examples/tests/backend_driver.py | 1 - 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 examples/api/histogram_demo.py diff --git a/examples/api/histogram_demo.py b/examples/api/histogram_demo.py deleted file mode 100644 index 11c4b0adaba1..000000000000 --- a/examples/api/histogram_demo.py +++ /dev/null @@ -1,34 +0,0 @@ -""" -Make a histogram of normally distributed random numbers and plot the -analytic PDF over it -""" -import numpy as np -import matplotlib.pyplot as plt -import matplotlib.mlab as mlab - -mu, sigma = 100, 15 -x = mu + sigma * np.random.randn(10000) - -fig = plt.figure() -ax = fig.add_subplot(111) - -# the histogram of the data -n, bins, patches = ax.hist(x, 50, normed=1, facecolor='green', alpha=0.75) - -# hist uses np.histogram under the hood to create 'n' and 'bins'. -# np.histogram returns the bin edges, so there will be 50 probability -# density values in n, 51 bin edges in bins and 50 patches. To get -# everything lined up, we'll compute the bin centers -bincenters = 0.5*(bins[1:]+bins[:-1]) -# add a 'best fit' line for the normal PDF -y = mlab.normpdf( bincenters, mu, sigma) -l = ax.plot(bincenters, y, 'r--', linewidth=1) - -ax.set_xlabel('Smarts') -ax.set_ylabel('Probability') -#ax.set_title(r'$\mathrm{Histogram\ of\ IQ:}\ \mu=100,\ \sigma=15$') -ax.set_xlim(40, 160) -ax.set_ylim(0, 0.03) -ax.grid(True) - -plt.show() diff --git a/examples/statistics/histogram_demo_features.py b/examples/statistics/histogram_demo_features.py index 566e7ed69aa2..d81278fcc9ae 100644 --- a/examples/statistics/histogram_demo_features.py +++ b/examples/statistics/histogram_demo_features.py @@ -26,5 +26,8 @@ # add a 'best fit' line y = mlab.normpdf(bins, mu, sigma) plt.plot(bins, y, 'r--') +plt.xlabel('Smarts') +plt.ylabel('Probability') +plt.title(r'Histogram of IQ: $\mu=100$, $\sigma=15$') plt.show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 4e31c7a43426..a7a7ba1773d7 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -257,7 +257,6 @@ 'date_index_formatter.py', 'donut_demo.py', 'font_family_rc.py', - 'histogram_demo.py', 'image_zcoord.py', 'joinstyle.py', 'legend_demo.py', From 6acc43ae043ccef385021f5f6526085d852c5516 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 10:28:51 -0800 Subject: [PATCH 16/35] Cleanup and move vertical_ticklabels demo --- examples/pylab_examples/vertical_ticklabels.py | 7 ------- examples/tests/backend_driver.py | 5 ++++- .../ticks_and_spines/ticklabels_demo_rotation.py | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) delete mode 100644 examples/pylab_examples/vertical_ticklabels.py create mode 100644 examples/ticks_and_spines/ticklabels_demo_rotation.py diff --git a/examples/pylab_examples/vertical_ticklabels.py b/examples/pylab_examples/vertical_ticklabels.py deleted file mode 100644 index 2416a785bfc1..000000000000 --- a/examples/pylab_examples/vertical_ticklabels.py +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env python -from pylab import * - -plot([1,2,3,4], [1,4,9,16]) -locs, labels = xticks([1,2,3,4], ['Frogs', 'Hogs', 'Bogs', 'Slogs']) -setp(labels, 'rotation', 'vertical') -show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index a7a7ba1773d7..cca0a3f08cc0 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -79,6 +79,10 @@ 'unicode_demo.py', ] +files['ticks_and_spines'] = [ + 'ticklabels_demo_rotation.py', + ] + files['subplots_axes_and_figures'] = [ 'subplot_demo.py', ] @@ -237,7 +241,6 @@ 'text_rotation_relative_to_line.py', 'text_themes.py', 'transoffset.py', - 'vertical_ticklabels.py', 'vline_demo.py', 'xcorr_demo.py', 'zorder_demo.py', diff --git a/examples/ticks_and_spines/ticklabels_demo_rotation.py b/examples/ticks_and_spines/ticklabels_demo_rotation.py new file mode 100644 index 000000000000..0f926fe79c4a --- /dev/null +++ b/examples/ticks_and_spines/ticklabels_demo_rotation.py @@ -0,0 +1,16 @@ +""" +Demo of custom tick-labels with user-defined rotation. +""" +import matplotlib.pyplot as plt + + +x = [1, 2, 3, 4] +y = [1, 4, 9, 6] +labels = ['Frogs', 'Hogs', 'Bogs', 'Slogs'] + +plt.plot(x, y, 'ro') +# You can specify a rotation for the tick labels in degrees or with keywords. +plt.xticks(x, labels, rotation='vertical') +# Pad margins so that markers don't get clipped by the axes +plt.margins(0.2) +plt.show() From 7f7c01345b4c43828796c5d205a56f315943bd9b Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 16:39:34 -0800 Subject: [PATCH 17/35] Cleanup and move clippath_demo --- examples/api/clippath_demo.py | 19 ------------------- .../image_demo_clip_path.py | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 examples/api/clippath_demo.py create mode 100644 examples/images_contours_and_fields/image_demo_clip_path.py diff --git a/examples/api/clippath_demo.py b/examples/api/clippath_demo.py deleted file mode 100644 index 7a07467524ba..000000000000 --- a/examples/api/clippath_demo.py +++ /dev/null @@ -1,19 +0,0 @@ -""" -Clipping to arbitrary patches and paths -""" -import numpy as np -import matplotlib.pyplot as plt -import matplotlib.patches as patches - - -fig = plt.figure() -ax = fig.add_subplot(111, frameon=False, xticks=[], yticks=[]) - -im = ax.imshow(np.random.rand(10,10)) - -patch = patches.Circle((300,300), radius=100) -im.set_clip_path(patch) - -plt.show() - - diff --git a/examples/images_contours_and_fields/image_demo_clip_path.py b/examples/images_contours_and_fields/image_demo_clip_path.py new file mode 100644 index 000000000000..ac61d4f0b8cd --- /dev/null +++ b/examples/images_contours_and_fields/image_demo_clip_path.py @@ -0,0 +1,19 @@ +""" +Demo of image that's been clipped by a circular patch. +""" +import numpy as np +import matplotlib.pyplot as plt +import matplotlib.patches as patches +import matplotlib.cbook as cbook + + +image_file = cbook.get_sample_data('lena.npy') +image = np.load(image_file) + +fig, ax = plt.subplots() +im = ax.imshow(image) +patch = patches.Circle((130, 130), radius=100, transform=ax.transData) +im.set_clip_path(patch) + +plt.axis('off') +plt.show() From ab417eb4045a55abcf9432b4e1951218776e5236 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 16:40:42 -0800 Subject: [PATCH 18/35] Rename imshow_demo to image_demo --- .../images_contours_and_fields/{imshow_demo.py => image_demo.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename examples/images_contours_and_fields/{imshow_demo.py => image_demo.py} (100%) diff --git a/examples/images_contours_and_fields/imshow_demo.py b/examples/images_contours_and_fields/image_demo.py similarity index 100% rename from examples/images_contours_and_fields/imshow_demo.py rename to examples/images_contours_and_fields/image_demo.py From 5a77ad87ae2ff6ccc488b4af5e3efb74b0663cfa Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 17:05:28 -0800 Subject: [PATCH 19/35] Cleanup and move polar_bar demo --- .../pie_and_polar_charts/polar_bar_demo.py | 21 +++++++++++++++++++ examples/pylab_examples/polar_bar.py | 21 ------------------- examples/tests/backend_driver.py | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 examples/pie_and_polar_charts/polar_bar_demo.py delete mode 100644 examples/pylab_examples/polar_bar.py diff --git a/examples/pie_and_polar_charts/polar_bar_demo.py b/examples/pie_and_polar_charts/polar_bar_demo.py new file mode 100644 index 000000000000..459dd6f958f1 --- /dev/null +++ b/examples/pie_and_polar_charts/polar_bar_demo.py @@ -0,0 +1,21 @@ +""" +Demo of bar plot on a polar axis. +""" +import numpy as np +import matplotlib.pyplot as plt + + +N = 20 +theta = np.linspace(0.0, 2 * np.pi, N, endpoint=False) +radii = 10 * np.random.rand(N) +width = np.pi / 4 * np.random.rand(N) + +ax = plt.subplot(111, polar=True) +bars = ax.bar(theta, radii, width=width, bottom=0.0) + +# Use custom colors and opacity +for r, bar in zip(radii, bars): + bar.set_facecolor(plt.cm.jet(r / 10.)) + bar.set_alpha(0.5) + +plt.show() diff --git a/examples/pylab_examples/polar_bar.py b/examples/pylab_examples/polar_bar.py deleted file mode 100644 index 14d8d7de0b43..000000000000 --- a/examples/pylab_examples/polar_bar.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -import numpy as np -import matplotlib.cm as cm -from matplotlib.pyplot import figure, show, rc - - -# force square figure and square axes looks better for polar, IMO -fig = figure(figsize=(8,8)) -ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True) - -N = 20 -theta = np.arange(0.0, 2*np.pi, 2*np.pi/N) -radii = 10*np.random.rand(N) -width = np.pi/4*np.random.rand(N) -bars = ax.bar(theta, radii, width=width, bottom=0.0) -for r,bar in zip(radii, bars): - bar.set_facecolor( cm.jet(r/10.)) - bar.set_alpha(0.5) - -show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index cca0a3f08cc0..09e8e607b8bc 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -73,6 +73,7 @@ files['pie'] = [ 'pie_demo.py', + 'polar_bar_demo.py', ] files['text_labels_and_annotations'] = [ @@ -207,7 +208,6 @@ 'pcolor_small.py', 'pie_demo2.py', 'plotfile_demo.py', - 'polar_bar.py', 'polar_demo.py', 'polar_legend.py', 'polar_scatter.py', From e4dce4e46fe7c63b60b39b08e6d3f60b08d06f47 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 17:13:44 -0800 Subject: [PATCH 20/35] Cleanup and move polar scatter demo --- .../polar_scatter_demo.py | 21 +++++++++++++++++++ examples/pylab_examples/polar_scatter.py | 17 --------------- examples/tests/backend_driver.py | 2 +- lib/matplotlib/pyplot.py | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 examples/pie_and_polar_charts/polar_scatter_demo.py delete mode 100644 examples/pylab_examples/polar_scatter.py diff --git a/examples/pie_and_polar_charts/polar_scatter_demo.py b/examples/pie_and_polar_charts/polar_scatter_demo.py new file mode 100644 index 000000000000..90eea4e2b3a8 --- /dev/null +++ b/examples/pie_and_polar_charts/polar_scatter_demo.py @@ -0,0 +1,21 @@ +""" +Demo of scatter plot on a polar axis. + +Size increases radially in this example and color increases with angle (just to +verify the symbols are being scattered correctly). +""" +import numpy as np +import matplotlib.pyplot as plt + + +N = 150 +r = 2 * np.random.rand(N) +theta = 2 * np.pi * np.random.rand(N) +area = 200 * r**2 * np.random.rand(N) +colors = theta + +ax = plt.subplot(111, polar=True) +c = plt.scatter(theta, r, c=colors, s=area, cmap=plt.cm.hsv) +c.set_alpha(0.75) + +plt.show() diff --git a/examples/pylab_examples/polar_scatter.py b/examples/pylab_examples/polar_scatter.py deleted file mode 100644 index 196f6e847290..000000000000 --- a/examples/pylab_examples/polar_scatter.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python -# a polar scatter plot; size increases radially in this example and -# color increases with angle (just to verify the symbols are being -# scattered correctly). In a real example, this would be wasting -# dimensionality of the plot -from pylab import * - -N = 150 -r = 2*rand(N) -theta = 2*pi*rand(N) -area = 200*r**2*rand(N) -colors = theta -ax = subplot(111, polar=True) -c = scatter(theta, r, c=colors, s=area, cmap=cm.hsv) -c.set_alpha(0.75) - -show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 09e8e607b8bc..9ae60d0691af 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -74,6 +74,7 @@ files['pie'] = [ 'pie_demo.py', 'polar_bar_demo.py', + 'polar_scatter_demo.py', ] files['text_labels_and_annotations'] = [ @@ -210,7 +211,6 @@ 'plotfile_demo.py', 'polar_demo.py', 'polar_legend.py', - 'polar_scatter.py', 'poormans_contour.py', 'psd_demo.py', 'psd_demo2.py', diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index 49754f4606a5..20e6d2eb2d60 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -763,7 +763,7 @@ def subplot(*args, **kwargs): For additional information on :func:`axes` and :func:`subplot` keyword arguments. - :file:`examples/pylab_examples/polar_scatter.py` + :file:`examples/pie_and_polar_charts/polar_scatter_demo.py` For an example **Example:** From cc1850142d2b0bd0412dc882735fe4c917d6981f Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 17:45:44 -0800 Subject: [PATCH 21/35] Cleanup and move text themes demo --- examples/pylab_examples/text_themes.py | 24 ------------------- examples/tests/backend_driver.py | 2 +- .../text_demo_fontdict.py | 23 ++++++++++++++++++ 3 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 examples/pylab_examples/text_themes.py create mode 100644 examples/text_labels_and_annotations/text_demo_fontdict.py diff --git a/examples/pylab_examples/text_themes.py b/examples/pylab_examples/text_themes.py deleted file mode 100644 index 43dfc39064f8..000000000000 --- a/examples/pylab_examples/text_themes.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -from pylab import * - -font = {'family' : 'serif', - 'color' : 'r', - 'weight' : 'normal', - 'size' : 12, - } - -def f(t): - s1 = cos(2*pi*t) - e1 = exp(-t) - return multiply(s1,e1) - -t1 = arange(0.0, 5.0, 0.1) -t2 = arange(0.0, 5.0, 0.02) - -plot(t1, f(t1), 'bo', t2, f(t2), 'k') -title('Damped exponential decay', font, size='large', color='r') -text(2, 0.65, r'$\cos(2 \pi t) \exp(-t)$', color='k') -xlabel('time (s)', font, style='italic') -ylabel('voltage (mV)', font) - -show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 9ae60d0691af..ac91b85354e6 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -78,6 +78,7 @@ ] files['text_labels_and_annotations'] = [ + 'text_demo_fontdict.py', 'unicode_demo.py', ] @@ -239,7 +240,6 @@ 'text_handles.py', 'text_rotation.py', 'text_rotation_relative_to_line.py', - 'text_themes.py', 'transoffset.py', 'vline_demo.py', 'xcorr_demo.py', diff --git a/examples/text_labels_and_annotations/text_demo_fontdict.py b/examples/text_labels_and_annotations/text_demo_fontdict.py new file mode 100644 index 000000000000..7924c4cefb0e --- /dev/null +++ b/examples/text_labels_and_annotations/text_demo_fontdict.py @@ -0,0 +1,23 @@ +""" +Demo using fontdict to control style of text and labels. +""" +import numpy as np +import matplotlib.pyplot as plt + + +font = {'family' : 'serif', + 'color' : 'darkred', + 'weight' : 'normal', + 'size' : 16, + } + +x = np.linspace(0.0, 5.0, 100) +y = np.cos(2 * np.pi * x) * np.exp(-x) + +plt.plot(x, y, 'k') +plt.title('Damped exponential decay', fontdict=font) +plt.text(2, 0.65, r'$\cos(2 \pi t) \exp(-t)$', fontdict=font) +plt.xlabel('time (s)', fontdict=font) +plt.ylabel('voltage (mV)', fontdict=font) + +plt.show() From d02d560fdf9b98591d99cd03e51034af9a2d6931 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 20:21:07 -0800 Subject: [PATCH 22/35] Cleanup and move path_patch demo --- doc/users/screenshots.rst | 2 +- .../path_patch_demo.py | 24 +++++++++---------- examples/tests/backend_driver.py | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) rename examples/{api => shapes_and_collections}/path_patch_demo.py (68%) diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst index 0a9145d60a8d..e56f31d656ee 100644 --- a/doc/users/screenshots.rst +++ b/doc/users/screenshots.rst @@ -43,7 +43,7 @@ Path demo You can add arbitrary paths in matplotlib as of release 0.98. See the :mod:`matplotlib.path`. -.. plot:: mpl_examples/api/path_patch_demo.py +.. plot:: mpl_examples/shapes_and_collections/path_patch_demo.py .. _screenshots_mplot3d_surface: diff --git a/examples/api/path_patch_demo.py b/examples/shapes_and_collections/path_patch_demo.py similarity index 68% rename from examples/api/path_patch_demo.py rename to examples/shapes_and_collections/path_patch_demo.py index d28fa2c37015..fb0c8aa47592 100644 --- a/examples/api/path_patch_demo.py +++ b/examples/shapes_and_collections/path_patch_demo.py @@ -1,14 +1,15 @@ -import numpy as np +""" +Demo of a PathPatch object. +""" import matplotlib.path as mpath import matplotlib.patches as mpatches import matplotlib.pyplot as plt -Path = mpath.Path -fig = plt.figure() -ax = fig.add_subplot(111) +fig, ax = plt.subplots() -pathdata = [ +Path = mpath.Path +path_data = [ (Path.MOVETO, (1.58, -2.57)), (Path.CURVE4, (0.35, -1.1)), (Path.CURVE4, (-1.75, 2.0)), @@ -19,18 +20,15 @@ (Path.CURVE4, (2.0, -0.5)), (Path.CLOSEPOLY, (1.58, -2.57)), ] - -codes, verts = zip(*pathdata) +codes, verts = zip(*path_data) path = mpath.Path(verts, codes) -patch = mpatches.PathPatch(path, facecolor='red', edgecolor='yellow', alpha=0.5) +patch = mpatches.PathPatch(path, facecolor='r', alpha=0.5) ax.add_patch(patch) +# plot control points and connecting lines x, y = zip(*path.vertices) line, = ax.plot(x, y, 'go-') + ax.grid() -ax.set_xlim(-3,4) -ax.set_ylim(-3,4) -ax.set_title('spline paths') +ax.axis('equal') plt.show() - - diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index ac91b85354e6..7a76ceee3f0b 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -57,6 +57,7 @@ ] files['shapes'] = [ + 'path_patch_demo.py', 'scatter_demo.py', ] @@ -267,7 +268,6 @@ 'logo2.py', 'mathtext_asarray.py', 'patch_collection.py', - 'path_patch_demo.py', 'quad_bezier.py', 'scatter_piecharts.py', 'span_regions.py', From ec8a4875ebbddab3d93a9d1355259d5b52e6f861 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 20:38:01 -0800 Subject: [PATCH 23/35] Clean up and move integral demo --- examples/pylab_examples/integral_demo.py | 34 --------------------- examples/showcase/integral_demo.py | 39 ++++++++++++++++++++++++ examples/tests/backend_driver.py | 5 ++- 3 files changed, 43 insertions(+), 35 deletions(-) delete mode 100644 examples/pylab_examples/integral_demo.py create mode 100644 examples/showcase/integral_demo.py diff --git a/examples/pylab_examples/integral_demo.py b/examples/pylab_examples/integral_demo.py deleted file mode 100644 index 436482ce189a..000000000000 --- a/examples/pylab_examples/integral_demo.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python - -# implement the example graphs/integral from pyx -from pylab import * -from matplotlib.patches import Polygon - -def func(x): - return (x-3)*(x-5)*(x-7)+85 - -ax = subplot(111) - -a, b = 2, 9 # integral area -x = arange(0, 10, 0.01) -y = func(x) -plot(x, y, linewidth=1) - -# make the shaded region -ix = arange(a, b, 0.01) -iy = func(ix) -verts = [(a,0)] + list(zip(ix,iy)) + [(b,0)] -poly = Polygon(verts, facecolor='0.8', edgecolor='k') -ax.add_patch(poly) - -text(0.5 * (a + b), 30, - r"$\int_a^b f(x)\mathrm{d}x$", horizontalalignment='center', - fontsize=20) - -axis([0,10, 0, 180]) -figtext(0.9, 0.05, 'x') -figtext(0.1, 0.9, 'y') -ax.set_xticks((a,b)) -ax.set_xticklabels(('a','b')) -ax.set_yticks([]) -show() diff --git a/examples/showcase/integral_demo.py b/examples/showcase/integral_demo.py new file mode 100644 index 000000000000..9549b132b61e --- /dev/null +++ b/examples/showcase/integral_demo.py @@ -0,0 +1,39 @@ +""" +Plot demonstrating the integral as the area under a curve. +""" +import numpy as np +import matplotlib.pyplot as plt +from matplotlib.patches import Polygon + +def func(x): + return (x-3)*(x-5)*(x-7)+85 + +fig, ax = plt.subplots() + +a, b = 2, 9 # integral area +x = np.linspace(0, 10) +y = func(x) +plt.plot(x, y, 'r', linewidth=2) + +# make the shaded region +ix = np.linspace(a, b) +iy = func(ix) +verts = [(a,0)] + list(zip(ix,iy)) + [(b,0)] +poly = Polygon(verts, facecolor='0.9', edgecolor='0.5') +ax.add_patch(poly) + +plt.text(0.5 * (a + b), 30, + r"$\int_a^b f(x)\mathrm{d}x$", horizontalalignment='center', + fontsize=20) + +plt.axis([0,10, 0, 180]) +plt.figtext(0.9, 0.05, '$x$') +plt.figtext(0.1, 0.9, '$y$') + +ax.spines['right'].set_visible(False) +ax.spines['top'].set_visible(False) +ax.set_xticks((a,b)) +ax.set_xticklabels(('$a$','$b$')) +ax.set_yticks([]) + +plt.show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 7a76ceee3f0b..497408a70405 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -91,6 +91,10 @@ 'subplot_demo.py', ] +files['showcase'] = [ + 'integral_demo.py', + ] + files['pylab'] = [ 'accented_text.py', 'alignment_test.py', @@ -175,7 +179,6 @@ 'image_nonuniform.py', 'image_origin.py', 'image_slices_viewer.py', - 'integral_demo.py', 'interp_demo.py', 'invert_axes.py', 'layer_images.py', From acc69cced1a0cd25bd11020ed25fc1d4aa5215d3 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 21:47:52 -0800 Subject: [PATCH 24/35] Extract spines_demo_bounds from spine_placement_demo --- .../pylab_examples/spine_placement_demo.py | 37 ------------------- examples/tests/backend_driver.py | 1 + .../ticks_and_spines/spines_demo_bounds.py | 32 ++++++++++++++++ 3 files changed, 33 insertions(+), 37 deletions(-) create mode 100644 examples/ticks_and_spines/spines_demo_bounds.py diff --git a/examples/pylab_examples/spine_placement_demo.py b/examples/pylab_examples/spine_placement_demo.py index 2e80f68f7601..cac90f10278e 100644 --- a/examples/pylab_examples/spine_placement_demo.py +++ b/examples/pylab_examples/spine_placement_demo.py @@ -1,4 +1,3 @@ -import sys import matplotlib.pyplot as plt import numpy as np from matplotlib.pyplot import show @@ -122,40 +121,4 @@ def adjust_spines(ax,spines): ax.plot(x,y) adjust_spines(ax,['bottom']) -# ---------------------------------------------------- - -fig = plt.figure() - -x = np.linspace(0,2*np.pi,50) -y = np.sin(x) -y2 = y + 0.1*np.random.normal( size=x.shape ) - -# plot data -ax = fig.add_subplot(1,1,1) -line1,=ax.plot(x,y,'--') -line2,=ax.plot(x,y2,'bo') - -# adjust the spines -adjust_spines(ax,['left','bottom']) - -# set ticks and tick labels -# x -ax.set_xlim((0,2*np.pi)) -ax.set_xticks([0,np.pi,2*np.pi]) -if sys.version_info[0] < 3: - pichr = unichr(0x03C0) -else: - pichr = chr(0x03C0) -ax.set_xticklabels(['0',pichr,'2 '+pichr]) - -# y -ax.set_yticks([-1,0,1]) - -# disable clipping of data points by axes range -for artist in (line1,line2): - artist.set_clip_on(False) - -# adjust spine to be within ticks -ax.spines['left'].set_bounds( -1, 1 ) - show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 497408a70405..07afc5bff165 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -84,6 +84,7 @@ ] files['ticks_and_spines'] = [ + 'spines_demo_bounds.py', 'ticklabels_demo_rotation.py', ] diff --git a/examples/ticks_and_spines/spines_demo_bounds.py b/examples/ticks_and_spines/spines_demo_bounds.py new file mode 100644 index 000000000000..9db2591abcae --- /dev/null +++ b/examples/ticks_and_spines/spines_demo_bounds.py @@ -0,0 +1,32 @@ +""" +Demo of spines using custom bounds to limit the extent of the spine. +""" +import numpy as np +import matplotlib.pyplot as plt + + +x = np.linspace(0, 2*np.pi, 50) +y = np.sin(x) +y2 = y + 0.1 * np.random.normal(size=x.shape) + +fig, ax = plt.subplots() +ax.plot(x, y, 'k--') +ax.plot(x, y2, 'ro') + +# set ticks and tick labels +ax.set_xlim((0, 2*np.pi)) +ax.set_xticks([0, np.pi, 2*np.pi]) +ax.set_xticklabels(['0', '$\pi$','2$\pi$']) +ax.set_ylim((-1.5, 1.5)) +ax.set_yticks([-1, 0, 1]) + +# Only draw spine between the y-ticks +ax.spines['left'].set_bounds(-1, 1) +# Hide the right and top spines +ax.spines['right'].set_visible(False) +ax.spines['top'].set_visible(False) +# Only show ticks on the left and bottom spines +ax.yaxis.set_ticks_position('left') +ax.xaxis.set_ticks_position('bottom') + +plt.show() From 800deb4baa13102208dd31c1a9055c2b35a46d34 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 22:07:55 -0800 Subject: [PATCH 25/35] Extract spines_demo from spine_placement_demo --- .../pylab_examples/spine_placement_demo.py | 28 ++---------------- examples/ticks_and_spines/spines_demo.py | 29 +++++++++++++++++++ .../ticks_and_spines/spines_demo_dropped.py | 24 +++++++++++++++ 3 files changed, 55 insertions(+), 26 deletions(-) create mode 100644 examples/ticks_and_spines/spines_demo.py create mode 100644 examples/ticks_and_spines/spines_demo_dropped.py diff --git a/examples/pylab_examples/spine_placement_demo.py b/examples/pylab_examples/spine_placement_demo.py index cac90f10278e..42f925371c43 100644 --- a/examples/pylab_examples/spine_placement_demo.py +++ b/examples/pylab_examples/spine_placement_demo.py @@ -1,30 +1,6 @@ -import matplotlib.pyplot as plt import numpy as np -from matplotlib.pyplot import show - -fig = plt.figure() -x = np.linspace(0,2*np.pi,100) -y = 2*np.sin(x) -ax = fig.add_subplot(1,2,1) -ax.set_title('dropped spines') -ax.plot(x,y) -for loc, spine in ax.spines.items(): - if loc in ['left','bottom']: - spine.set_position(('outward',10)) # outward by 10 points - elif loc in ['right','top']: - spine.set_color('none') # don't draw spine - else: - raise ValueError('unknown spine location: %s'%loc) - -# turn off ticks where there is no spine -ax.xaxis.set_ticks_position('bottom') -ax.yaxis.set_ticks_position('left') - -ax = fig.add_subplot(1,2,2,sharex=ax) -ax.plot(x,y) -ax.set_title('normal spines') +import matplotlib.pyplot as plt -# ---------------------------------------------------- fig = plt.figure() x = np.linspace(-np.pi,np.pi,100) @@ -121,4 +97,4 @@ def adjust_spines(ax,spines): ax.plot(x,y) adjust_spines(ax,['bottom']) -show() +plt.show() diff --git a/examples/ticks_and_spines/spines_demo.py b/examples/ticks_and_spines/spines_demo.py new file mode 100644 index 000000000000..b7b8ad193a89 --- /dev/null +++ b/examples/ticks_and_spines/spines_demo.py @@ -0,0 +1,29 @@ +""" +Basic demo of axis spines. + +This demo compares a normal axes, with spines on all four sides, and an axes +with spines only on the left and bottom. +""" +import numpy as np +import matplotlib.pyplot as plt + + +x = np.linspace(0, 2 * np.pi, 100) +y = 2 * np.sin(x) + +fig, (ax0, ax1) = plt.subplots(ncols=2) + +ax0.plot(x, y) +ax0.set_title('normal spines') + +ax1.plot(x, y) +ax1.set_title('bottom-left spines') + +# Hide the right and top spines +ax1.spines['right'].set_visible(False) +ax1.spines['top'].set_visible(False) +# Only show ticks on the left and bottom spines +ax1.yaxis.set_ticks_position('left') +ax1.xaxis.set_ticks_position('bottom') + +plt.show() diff --git a/examples/ticks_and_spines/spines_demo_dropped.py b/examples/ticks_and_spines/spines_demo_dropped.py new file mode 100644 index 000000000000..1a11e8f58f59 --- /dev/null +++ b/examples/ticks_and_spines/spines_demo_dropped.py @@ -0,0 +1,24 @@ +""" +Demo of spines offset from the axes (a.k.a. "dropped spines"). +""" +import numpy as np +import matplotlib.pyplot as plt + + +fig, ax = plt.subplots() + +image = np.random.uniform(size=(10, 10)) +ax.imshow(image, cmap=plt.cm.gray, interpolation='nearest') +ax.set_title('dropped spines') + +# Move left and bottom spines outward by 10 points +ax.spines['left'].set_position(('outward', 10)) +ax.spines['bottom'].set_position(('outward', 10)) +# Hide the right and top spines +ax.spines['right'].set_visible(False) +ax.spines['top'].set_visible(False) +# Only show ticks on the left and bottom spines +ax.yaxis.set_ticks_position('left') +ax.xaxis.set_ticks_position('bottom') + +plt.show() From edce62b97de206607a40bb9cb3682456ce7c984c Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 22:51:02 -0800 Subject: [PATCH 26/35] Cleanup integral_demo --- examples/showcase/integral_demo.py | 34 ++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/examples/showcase/integral_demo.py b/examples/showcase/integral_demo.py index 9549b132b61e..d55f551fab80 100644 --- a/examples/showcase/integral_demo.py +++ b/examples/showcase/integral_demo.py @@ -1,39 +1,51 @@ """ Plot demonstrating the integral as the area under a curve. + +Although this is a simple example, it demonstrates some important tweaks: + + * A simple line plot with custom color and line width. + * A shaded region created using a Polygon patch. + * A text label with mathtext rendering. + * figtext calls to label the x- and y-axes. + * Use of axis spines to hide the top and right spines. + * Custom tick placement and labels. """ import numpy as np import matplotlib.pyplot as plt from matplotlib.patches import Polygon + def func(x): - return (x-3)*(x-5)*(x-7)+85 + return (x - 3) * (x - 5) * (x - 7) + 85 -fig, ax = plt.subplots() -a, b = 2, 9 # integral area +a, b = 2, 9 # integral limits x = np.linspace(0, 10) y = func(x) + +fig, ax = plt.subplots() plt.plot(x, y, 'r', linewidth=2) +plt.ylim(ymin=0) -# make the shaded region +# Make the shaded region ix = np.linspace(a, b) iy = func(ix) -verts = [(a,0)] + list(zip(ix,iy)) + [(b,0)] +verts = [(a, 0)] + list(zip(ix, iy)) + [(b, 0)] poly = Polygon(verts, facecolor='0.9', edgecolor='0.5') ax.add_patch(poly) -plt.text(0.5 * (a + b), 30, - r"$\int_a^b f(x)\mathrm{d}x$", horizontalalignment='center', - fontsize=20) +plt.text(0.5 * (a + b), 30, r"$\int_a^b f(x)\mathrm{d}x$", + horizontalalignment='center', fontsize=20) -plt.axis([0,10, 0, 180]) plt.figtext(0.9, 0.05, '$x$') plt.figtext(0.1, 0.9, '$y$') ax.spines['right'].set_visible(False) ax.spines['top'].set_visible(False) -ax.set_xticks((a,b)) -ax.set_xticklabels(('$a$','$b$')) +ax.xaxis.set_ticks_position('bottom') + +ax.set_xticks((a, b)) +ax.set_xticklabels(('$a$', '$b$')) ax.set_yticks([]) plt.show() From 405cbc5e6fb92d9c0bcfbca4a5ee2f9352da18fe Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 22 Dec 2012 23:20:56 -0800 Subject: [PATCH 27/35] Cleanup and move dash_control demo --- .../line_demo_dash_control.py | 17 +++++++++++++++++ examples/pylab_examples/dash_control.py | 14 -------------- examples/tests/backend_driver.py | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 examples/lines_bars_and_markers/line_demo_dash_control.py delete mode 100644 examples/pylab_examples/dash_control.py diff --git a/examples/lines_bars_and_markers/line_demo_dash_control.py b/examples/lines_bars_and_markers/line_demo_dash_control.py new file mode 100644 index 000000000000..b884c7e28675 --- /dev/null +++ b/examples/lines_bars_and_markers/line_demo_dash_control.py @@ -0,0 +1,17 @@ +""" +Demo of a simple plot with a custom dashed line. + +A Line object's ``set_dashes`` method allows you to specify dashes with +a series of on/off lengths (in points). +""" +import numpy as np +import matplotlib.pyplot as plt + + +x = np.linspace(0, 10) +line, = plt.plot(x, np.sin(x), '--', linewidth=2) + +dashes = [10, 5, 100, 5] # 10 points on, 5 off, 100 on, 5 off +line.set_dashes(dashes) + +plt.show() diff --git a/examples/pylab_examples/dash_control.py b/examples/pylab_examples/dash_control.py deleted file mode 100644 index 1100882b8873..000000000000 --- a/examples/pylab_examples/dash_control.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python - -""" -You can precisely specify dashes with an on/off ink rect sequence in -points. -""" -from pylab import * - -dashes = [5,2,10,5] # 5 points on, 2 off, 3 on, 1 off - -l, = plot(arange(20), '--') -l.set_dashes(dashes) - -show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 07afc5bff165..73b2c195d780 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -54,6 +54,7 @@ files['lines'] = [ 'fill_demo.py', 'fill_demo_features.py', + 'line_demo_dash_control.py', ] files['shapes'] = [ @@ -135,7 +136,6 @@ 'custom_figure_class.py', 'custom_ticker1.py', 'customize_rc.py', - 'dash_control.py', 'dashpointlabel.py', 'date_demo1.py', 'date_demo2.py', From 30a85ba22246884573f572b758fca25c367bc55c Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 23 Dec 2012 18:25:21 -0800 Subject: [PATCH 28/35] Clean up and move color_cycle demo --- doc/conf.py | 1 + doc/sphinxext/gen_gallery.py | 1 + examples/api/color_cycle.py | 28 ------------------------ examples/color/color_cycle_demo.py | 34 ++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 examples/api/color_cycle.py create mode 100644 examples/color/color_cycle_demo.py diff --git a/doc/conf.py b/doc/conf.py index 57da9709f3c0..414bddd81812 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -88,6 +88,7 @@ 'statistics', 'images_contours_and_fields', 'pie_and_polar_charts', + 'color', 'text_labels_and_annotations', 'ticks_and_spines', 'subplots_axes_and_figures', diff --git a/doc/sphinxext/gen_gallery.py b/doc/sphinxext/gen_gallery.py index 4311dd745418..967cd8f9b8f6 100644 --- a/doc/sphinxext/gen_gallery.py +++ b/doc/sphinxext/gen_gallery.py @@ -22,6 +22,7 @@ 'subplots_axes_and_figures': 'Subplots, axes, and figures', 'specialty_plots': 'Specialty plots', 'showcase': 'Showcase', + 'color': 'Color', 'api': 'API', } diff --git a/examples/api/color_cycle.py b/examples/api/color_cycle.py deleted file mode 100644 index 6b2abe873cd2..000000000000 --- a/examples/api/color_cycle.py +++ /dev/null @@ -1,28 +0,0 @@ -""" -Illustrate the API for changing the cycle of colors used -when plotting multiple lines on a single Axes. -""" - -import numpy as np -import matplotlib.pyplot as plt -import matplotlib as mpl - -yy = np.arange(24) -yy.shape = 6,4 - -mpl.rc('lines', linewidth=4) - -fig = plt.figure() -mpl.rcParams['axes.color_cycle'] = ['r', 'g', 'b', 'c'] -ax = fig.add_subplot(2,1,1) -ax.plot(yy) -ax.set_title('Changed default color cycle to rgbc') - -ax = fig.add_subplot(2,1,2) -ax.set_color_cycle(['c', 'm', 'y', 'k']) -ax.plot(yy) -ax.set_title('This axes only, cycle is cmyk') - -plt.show() - - diff --git a/examples/color/color_cycle_demo.py b/examples/color/color_cycle_demo.py new file mode 100644 index 000000000000..b453de4c1aed --- /dev/null +++ b/examples/color/color_cycle_demo.py @@ -0,0 +1,34 @@ +""" +Demo of custom color-cycle settings to control colors for multi-line plots. + +This example demonstrates two different APIs: + + 1. Setting the default rc-parameter specifying the color cycle. + This affects all subsequent plots. + 2. Setting the color cycle for a specific axes. This only affects a single + axes. +""" +import numpy as np +import matplotlib.pyplot as plt + +x = np.linspace(0, 2 * np.pi) +offsets = np.linspace(0, 2*np.pi, 4, endpoint=False) +# Create array with shifted-sine curve along each column +yy = np.transpose([np.sin(x + phi) for phi in offsets]) + +plt.rc('lines', linewidth=4) +fig, (ax0, ax1) = plt.subplots(nrows=2) + +plt.rc('axes', color_cycle=['r', 'g', 'b', 'y']) +ax0.plot(yy) +ax0.set_title('Set default color cycle to rgby') + +ax1.set_color_cycle(['c', 'm', 'y', 'k']) +ax1.plot(yy) +ax1.set_title('Set axes color cycle to cmyk') + +# Tweak spacing between subplots to prevent labels from overlapping +plt.subplots_adjust(hspace=0.3) +plt.show() + + From 7175e061cd5f98ca2a0e9097fa456224f59d3397 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 23 Dec 2012 19:56:25 -0800 Subject: [PATCH 29/35] Tweak subplot layout to prevent label clipping --- examples/statistics/histogram_demo_features.py | 2 ++ examples/text_labels_and_annotations/text_demo_fontdict.py | 2 ++ examples/ticks_and_spines/spines_demo.py | 4 +++- examples/ticks_and_spines/ticklabels_demo_rotation.py | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/statistics/histogram_demo_features.py b/examples/statistics/histogram_demo_features.py index d81278fcc9ae..299f9bfeb70c 100644 --- a/examples/statistics/histogram_demo_features.py +++ b/examples/statistics/histogram_demo_features.py @@ -30,4 +30,6 @@ plt.ylabel('Probability') plt.title(r'Histogram of IQ: $\mu=100$, $\sigma=15$') +# Tweak spacing to prevent clipping of ylabel +plt.subplots_adjust(left=0.15) plt.show() diff --git a/examples/text_labels_and_annotations/text_demo_fontdict.py b/examples/text_labels_and_annotations/text_demo_fontdict.py index 7924c4cefb0e..a0dcf3f48d3a 100644 --- a/examples/text_labels_and_annotations/text_demo_fontdict.py +++ b/examples/text_labels_and_annotations/text_demo_fontdict.py @@ -20,4 +20,6 @@ plt.xlabel('time (s)', fontdict=font) plt.ylabel('voltage (mV)', fontdict=font) +# Tweak spacing to prevent clipping of ylabel +plt.subplots_adjust(left=0.15) plt.show() diff --git a/examples/ticks_and_spines/spines_demo.py b/examples/ticks_and_spines/spines_demo.py index b7b8ad193a89..a720131e845c 100644 --- a/examples/ticks_and_spines/spines_demo.py +++ b/examples/ticks_and_spines/spines_demo.py @@ -11,7 +11,7 @@ x = np.linspace(0, 2 * np.pi, 100) y = 2 * np.sin(x) -fig, (ax0, ax1) = plt.subplots(ncols=2) +fig, (ax0, ax1) = plt.subplots(nrows=2) ax0.plot(x, y) ax0.set_title('normal spines') @@ -26,4 +26,6 @@ ax1.yaxis.set_ticks_position('left') ax1.xaxis.set_ticks_position('bottom') +# Tweak spacing between subplots to prevent labels from overlapping +plt.subplots_adjust(hspace=0.5) plt.show() diff --git a/examples/ticks_and_spines/ticklabels_demo_rotation.py b/examples/ticks_and_spines/ticklabels_demo_rotation.py index 0f926fe79c4a..9c1c49b2e4d6 100644 --- a/examples/ticks_and_spines/ticklabels_demo_rotation.py +++ b/examples/ticks_and_spines/ticklabels_demo_rotation.py @@ -13,4 +13,6 @@ plt.xticks(x, labels, rotation='vertical') # Pad margins so that markers don't get clipped by the axes plt.margins(0.2) +# Tweak spacing to prevent clipping of tick-labels +plt.subplots_adjust(bottom=0.15) plt.show() From 502095221d9ac00ff7eb91709236fedac93fdc0f Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 23 Dec 2012 21:56:14 -0800 Subject: [PATCH 30/35] Add colormap references based on show_colormaps --- .../color/colormaps_reference_diverging.py | 32 +++++++++++++++++ .../colormaps_reference_miscellaneous.py | 27 +++++++++++++++ .../color/colormaps_reference_qualitative.py | 34 +++++++++++++++++++ .../color/colormaps_reference_sequential.py | 32 +++++++++++++++++ .../color/colormaps_reference_sequential2.py | 32 +++++++++++++++++ examples/pylab_examples/show_colormaps.py | 4 +++ 6 files changed, 161 insertions(+) create mode 100644 examples/color/colormaps_reference_diverging.py create mode 100644 examples/color/colormaps_reference_miscellaneous.py create mode 100644 examples/color/colormaps_reference_qualitative.py create mode 100644 examples/color/colormaps_reference_sequential.py create mode 100644 examples/color/colormaps_reference_sequential2.py diff --git a/examples/color/colormaps_reference_diverging.py b/examples/color/colormaps_reference_diverging.py new file mode 100644 index 000000000000..5e6b7c9985f0 --- /dev/null +++ b/examples/color/colormaps_reference_diverging.py @@ -0,0 +1,32 @@ +""" +Reference for "diverging" colormaps. + +Diverging colormaps have a median value (usually light in color) and vary +smoothly to two different color tones at high and low values. Diverging +colormaps are ideal when your data has a median value that is significant (e.g. +0, such that positive and negative values are represented by different colors +of the colormap). +""" +import numpy as np +import matplotlib.pyplot as plt + + +gradient = np.linspace(0, 1, 256) +gradient = np.vstack((gradient, gradient)) + +# Note that any of these colormaps can be reversed by appending '_r'. +cmaps = ['BrBG', 'bwr', 'coolwarm', 'PiYG', 'PRGn', 'PuOr', 'RdBu', 'RdGy', + 'RdYlBu', 'RdYlGn', 'seismic'] + +fig, axes = plt.subplots(nrows=len(cmaps)) +fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) + +for ax, m in zip(axes, cmaps): + ax.set_axis_off() + ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) + pos = list(ax.get_position().bounds) + x_text = pos[0] - 0.01 + y_text = pos[1] + pos[3]/2. + fig.text(x_text, y_text, m, va='center', ha='right') + +plt.show() diff --git a/examples/color/colormaps_reference_miscellaneous.py b/examples/color/colormaps_reference_miscellaneous.py new file mode 100644 index 000000000000..f7c1cb6fba35 --- /dev/null +++ b/examples/color/colormaps_reference_miscellaneous.py @@ -0,0 +1,27 @@ +""" +Reference for "miscellaneous" colormaps. +""" +import numpy as np +import matplotlib.pyplot as plt + + +gradient = np.linspace(0, 1, 256) +gradient = np.vstack((gradient, gradient)) + +# Note that any of these colormaps can be reversed by appending '_r'. +cmaps = ['flag', 'gist_earth', 'gist_ncar', 'gist_rainbow', 'gist_stern', + 'jet', 'prism', 'brg', 'CMRmap', 'cubehelix', 'gnuplot', 'gnuplot2', + 'ocean', 'rainbow', 'terrain'] + +fig, axes = plt.subplots(nrows=len(cmaps)) +fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) + +for ax, m in zip(axes, cmaps): + ax.set_axis_off() + ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) + pos = list(ax.get_position().bounds) + x_text = pos[0] - 0.01 + y_text = pos[1] + pos[3]/2. + fig.text(x_text, y_text, m, va='center', ha='right') + +plt.show() diff --git a/examples/color/colormaps_reference_qualitative.py b/examples/color/colormaps_reference_qualitative.py new file mode 100644 index 000000000000..eb63bfa94841 --- /dev/null +++ b/examples/color/colormaps_reference_qualitative.py @@ -0,0 +1,34 @@ +""" +Reference for "qualitative" colormaps. + +Qualitative colormaps vary rapidly in color. These colormaps are useful for +choosing a set of discrete colors. For example:: + + color_list = plt.cm.Set3(np.linspace(0, 1, 12)) + +gives a list of RGB colors that are good for plotting a series of lines on +a dark background. +""" +import numpy as np +import matplotlib.pyplot as plt + + +gradient = np.linspace(0, 1, 256) +gradient = np.vstack((gradient, gradient)) + +# Note that any of these colormaps can be reversed by appending '_r'. +cmaps = ['Accent', 'Dark2', 'hsv', 'Paired', 'Pastel1', 'Pastel2', 'Set1', + 'Set2', 'Set3', 'spectral'] + +fig, axes = plt.subplots(nrows=len(cmaps)) +fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) + +for ax, m in zip(axes, cmaps): + ax.set_axis_off() + ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) + pos = list(ax.get_position().bounds) + x_text = pos[0] - 0.01 + y_text = pos[1] + pos[3]/2. + fig.text(x_text, y_text, m, va='center', ha='right') + +plt.show() diff --git a/examples/color/colormaps_reference_sequential.py b/examples/color/colormaps_reference_sequential.py new file mode 100644 index 000000000000..515471db36bb --- /dev/null +++ b/examples/color/colormaps_reference_sequential.py @@ -0,0 +1,32 @@ +""" +Reference for "sequential" colormaps. + +Sequential colormaps are approximately monochromatic colormaps going from low +saturation (e.g. white) to high saturation (e.g. a bright blue). Sequential +colormaps are ideal for representing most scientific data since they show +a clear progression from low-to-high values. +""" +import numpy as np +import matplotlib.pyplot as plt + + +gradient = np.linspace(0, 1, 256) +gradient = np.vstack((gradient, gradient)) + +# Note that any of these colormaps can be reversed by appending '_r'. +cmaps = ['binary', 'Blues', 'BuGn', 'BuPu', 'gist_yarg', 'GnBu', 'Greens', + 'Greys', 'Oranges', 'OrRd', 'PuBu', 'PuBuGn', 'PuRd', 'Purples', + 'RdPu', 'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd'] + +fig, axes = plt.subplots(nrows=len(cmaps)) +fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) + +for ax, m in zip(axes, cmaps): + ax.set_axis_off() + ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) + pos = list(ax.get_position().bounds) + x_text = pos[0] - 0.01 + y_text = pos[1] + pos[3]/2. + fig.text(x_text, y_text, m, va='center', ha='right') + +plt.show() diff --git a/examples/color/colormaps_reference_sequential2.py b/examples/color/colormaps_reference_sequential2.py new file mode 100644 index 000000000000..7bf354fcd1ce --- /dev/null +++ b/examples/color/colormaps_reference_sequential2.py @@ -0,0 +1,32 @@ +""" +Reference for "sequential" colormaps. + +These are sequential colormaps, which vary smoothly between two color tones. +Unlike the sequential colormaps in the first example, these either vary between +two saturated tones (instead of being nearly monochromatic) or have a reversed +progression (decreasing in saturation for increasing value). Note, however, +that any colormap can be reversed by appending "_r" (e.g., "pink_r"). +""" +import numpy as np +import matplotlib.pyplot as plt + + +gradient = np.linspace(0, 1, 256) +gradient = np.vstack((gradient, gradient)) + +# Note that any of these colormaps can be reversed by appending '_r'. +cmaps = ['afmhot', 'autumn', 'bone', 'cool', 'copper', 'gist_gray', + 'gist_heat', 'gray', 'hot', 'pink', 'spring', 'summer', 'winter'] + +fig, axes = plt.subplots(nrows=len(cmaps)) +fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) + +for ax, m in zip(axes, cmaps): + ax.set_axis_off() + ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) + pos = list(ax.get_position().bounds) + x_text = pos[0] - 0.01 + y_text = pos[1] + pos[3]/2. + fig.text(x_text, y_text, m, va='center', ha='right') + +plt.show() diff --git a/examples/pylab_examples/show_colormaps.py b/examples/pylab_examples/show_colormaps.py index 0146a93c07ed..c2066b579bd7 100644 --- a/examples/pylab_examples/show_colormaps.py +++ b/examples/pylab_examples/show_colormaps.py @@ -1,3 +1,7 @@ +# NOTE: This example has been superseded by examples in +# 'color/colormaps_reference_*, but this example is referenced in the +# "What's New" page, and the image tutorial. + # This example comes from the Cookbook on www.scipy.org. According to the # history, Andrew Straw did the conversion from an old page, but it is # unclear who the original author is. From fae23d66d3519403f5ae466812f48b5743042ba9 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 23 Dec 2012 23:30:45 -0800 Subject: [PATCH 31/35] Clean up and move artist demo --- examples/api/artist_demo.py | 119 ------------------ .../artist_reference.py | 104 +++++++++++++++ 2 files changed, 104 insertions(+), 119 deletions(-) delete mode 100644 examples/api/artist_demo.py create mode 100644 examples/shapes_and_collections/artist_reference.py diff --git a/examples/api/artist_demo.py b/examples/api/artist_demo.py deleted file mode 100644 index 35dc77759c63..000000000000 --- a/examples/api/artist_demo.py +++ /dev/null @@ -1,119 +0,0 @@ -""" -Show examples of matplotlib artists -http://matplotlib.org/api/artist_api.html - -Several examples of standard matplotlib graphics primitives (artists) -are drawn using matplotlib API. Full list of artists and the -documentation is available at -http://matplotlib.org/api/artist_api.html - -Copyright (c) 2010, Bartosz Telenczuk - -License: This work is licensed under the BSD. A copy should be -included with this source code, and is also available at -http://www.opensource.org/licenses/bsd-license.php -""" - - -import numpy as np -import matplotlib.pyplot as plt -import matplotlib -from matplotlib.collections import PatchCollection -import matplotlib.path as mpath -import matplotlib.patches as mpatches -import matplotlib.lines as mlines - -font = "sans-serif" -fig = plt.figure(figsize=(5,5)) -ax = plt.axes([0,0,1,1]) - -# create 3x3 grid to plot the artists -pos = np.mgrid[0.2:0.8:3j, 0.2:0.8:3j].reshape(2, -1) - -patches = [] - -# add a circle -art = mpatches.Circle(pos[:,0], 0.1,ec="none") -patches.append(art) -plt.text(pos[0,0], pos[1,0]-0.15, "Circle", ha="center", - family=font, size=14) - -# add a rectangle -art = mpatches.Rectangle(pos[:,1] - np.array([0.025, 0.05]), 0.05, 0.1, - ec="none") -patches.append(art) -plt.text(pos[0,1], pos[1,1]-0.15, "Rectangle", ha="center", - family=font, size=14) - -# add a wedge -wedge = mpatches.Wedge(pos[:,2], 0.1, 30, 270, ec="none") -patches.append(wedge) -plt.text(pos[0,2], pos[1,2]-0.15, "Wedge", ha="center", - family=font, size=14) - -# add a Polygon -polygon = mpatches.RegularPolygon(pos[:,3], 5, 0.1) -patches.append(polygon) -plt.text(pos[0,3], pos[1,3]-0.15, "Polygon", ha="center", - family=font, size=14) - -#add an ellipse -ellipse = mpatches.Ellipse(pos[:,4], 0.2, 0.1) -patches.append(ellipse) -plt.text(pos[0,4], pos[1,4]-0.15, "Ellipse", ha="center", - family=font, size=14) - -#add an arrow -arrow = mpatches.Arrow(pos[0,5]-0.05, pos[1,5]-0.05, 0.1, 0.1, width=0.1) -patches.append(arrow) -plt.text(pos[0,5], pos[1,5]-0.15, "Arrow", ha="center", - family=font, size=14) - -# add a path patch -Path = mpath.Path -verts = np.array([ - (0.158, -0.257), - (0.035, -0.11), - (-0.175, 0.20), - (0.0375, 0.20), - (0.085, 0.115), - (0.22, 0.32), - (0.3, 0.005), - (0.20, -0.05), - (0.158, -0.257), - ]) -verts = verts-verts.mean(0) -codes = [Path.MOVETO, - Path.CURVE4, Path.CURVE4, Path.CURVE4, Path.LINETO, - Path.CURVE4, Path.CURVE4, Path.CURVE4, Path.CLOSEPOLY] - -path = mpath.Path(verts/2.5+pos[:,6], codes) -patch = mpatches.PathPatch(path) -patches.append(patch) -plt.text(pos[0,6], pos[1,6]-0.15, "PathPatch", ha="center", - family=font, size=14) - -# add a fancy box -fancybox = mpatches.FancyBboxPatch( - pos[:,7]-np.array([0.025, 0.05]), 0.05, 0.1, - boxstyle=mpatches.BoxStyle("Round", pad=0.02)) -patches.append(fancybox) -plt.text(pos[0,7], pos[1,7]-0.15, "FancyBoxPatch", ha="center", - family=font, size=14) - -# add a line -x,y = np.array([[-0.06, 0.0, 0.1], [0.05,-0.05, 0.05]]) -line = mlines.Line2D(x+pos[0,8], y+pos[1,8], lw=5., - alpha=0.4) -plt.text(pos[0,8], pos[1,8]-0.15, "Line2D", ha="center", - family=font, size=14) - -colors = 100*np.random.rand(len(patches)) -collection = PatchCollection(patches, cmap=matplotlib.cm.jet, alpha=0.4) -collection.set_array(np.array(colors)) -ax.add_collection(collection) -ax.add_line(line) -ax.set_xticks([]) -ax.set_yticks([]) - -plt.show() diff --git a/examples/shapes_and_collections/artist_reference.py b/examples/shapes_and_collections/artist_reference.py new file mode 100644 index 000000000000..a9016de58949 --- /dev/null +++ b/examples/shapes_and_collections/artist_reference.py @@ -0,0 +1,104 @@ +""" +Reference for matplotlib artists + +This example displays several of matplotlib's graphics primitives (artists) +drawn using matplotlib API. A full list of artists and the documentation is +available at http://matplotlib.org/api/artist_api.html. + +Copyright (c) 2010, Bartosz Telenczuk +BSD License +""" +import matplotlib.pyplot as plt; plt.rcdefaults() +from mpltools import style; style.use('gallery') + +import numpy as np +import matplotlib.pyplot as plt +import matplotlib.path as mpath +import matplotlib.lines as mlines +import matplotlib.patches as mpatches +from matplotlib.collections import PatchCollection + + +def label(xy, text): + y = xy[1] - 0.15 # shift y-value for label so that it's below the artist + plt.text(xy[0], y, text, ha="center", family='sans-serif', size=14) + + +fig, ax = plt.subplots() +# create 3x3 grid to plot the artists +grid = np.mgrid[0.2:0.8:3j, 0.2:0.8:3j].reshape(2, -1).T + +patches = [] + +# add a circle +circle = mpatches.Circle(grid[0], 0.1,ec="none") +patches.append(circle) +label(grid[0], "Circle") + +# add a rectangle +rect = mpatches.Rectangle(grid[1] - [0.025, 0.05], 0.05, 0.1, ec="none") +patches.append(rect) +label(grid[1], "Rectangle") + +# add a wedge +wedge = mpatches.Wedge(grid[2], 0.1, 30, 270, ec="none") +patches.append(wedge) +label(grid[2], "Wedge") + +# add a Polygon +polygon = mpatches.RegularPolygon(grid[3], 5, 0.1) +patches.append(polygon) +label(grid[3], "Polygon") + +#add an ellipse +ellipse = mpatches.Ellipse(grid[4], 0.2, 0.1) +patches.append(ellipse) +label(grid[4], "Ellipse") + +#add an arrow +arrow = mpatches.Arrow(grid[5, 0]-0.05, grid[5, 1]-0.05, 0.1, 0.1, width=0.1) +patches.append(arrow) +label(grid[5], "Arrow") + +# add a path patch +Path = mpath.Path +path_data = [ + (Path.MOVETO, [ 0.018, -0.11 ]), + (Path.CURVE4, [-0.031, -0.051]), + (Path.CURVE4, [-0.115, 0.073]), + (Path.CURVE4, [-0.03 , 0.073]), + (Path.LINETO, [-0.011, 0.039]), + (Path.CURVE4, [ 0.043, 0.121]), + (Path.CURVE4, [ 0.075, -0.005]), + (Path.CURVE4, [ 0.035, -0.027]), + (Path.CLOSEPOLY, [0.018, -0.11]) + ] +codes, verts = zip(*path_data) +path = mpath.Path(verts + grid[6], codes) +patch = mpatches.PathPatch(path) +patches.append(patch) +label(grid[6], "PathPatch") + +# add a fancy box +fancybox = mpatches.FancyBboxPatch( + grid[7] - [0.025, 0.05], 0.05, 0.1, + boxstyle=mpatches.BoxStyle("Round", pad=0.02)) +patches.append(fancybox) +label(grid[7], "FancyBoxPatch") + +# add a line +x,y = np.array([[-0.06, 0.0, 0.1], [0.05, -0.05, 0.05]]) +line = mlines.Line2D(x + grid[8, 0], y + grid[8, 1], lw=5., alpha=0.3) +label(grid[8], "Line2D") + +colors = np.linspace(0, 1, len(patches)) +collection = PatchCollection(patches, cmap=plt.cm.hsv, alpha=0.3) +collection.set_array(np.array(colors)) +ax.add_collection(collection) +ax.add_line(line) + +plt.subplots_adjust(left=0, right=1, bottom=0, top=1) +plt.axis('equal') +plt.axis('off') + +plt.show() From abfdea4979ccad76255ac535ccf2bb92b9bb0efa Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 23 Dec 2012 23:31:55 -0800 Subject: [PATCH 32/35] Clean up and move streamplot demos --- doc/users/whats_new.rst | 2 +- .../streamplot_demo_features.py} | 10 ++++++++++ .../streamplot_demo_masking.py} | 10 +++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) rename examples/{pylab_examples/streamplot_demo.py => images_contours_and_fields/streamplot_demo_features.py} (57%) rename examples/{pylab_examples/streamplot_with_mask.py => images_contours_and_fields/streamplot_demo_masking.py} (55%) diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst index 5ba32223fae4..8f243e7e93fc 100644 --- a/doc/users/whats_new.rst +++ b/doc/users/whats_new.rst @@ -195,7 +195,7 @@ In addition to simply plotting the streamlines of the vector field, line widths of the streamlines to a separate parameter, such as the speed or local intensity of the vector field. -.. plot:: mpl_examples/pylab_examples/streamplot_demo.py +.. plot:: mpl_examples/images_contours_and_fields/streamplot_demo_features.py New hist functionality diff --git a/examples/pylab_examples/streamplot_demo.py b/examples/images_contours_and_fields/streamplot_demo_features.py similarity index 57% rename from examples/pylab_examples/streamplot_demo.py rename to examples/images_contours_and_fields/streamplot_demo_features.py index f67e3515c908..2cc10bf877e8 100644 --- a/examples/pylab_examples/streamplot_demo.py +++ b/examples/images_contours_and_fields/streamplot_demo_features.py @@ -1,3 +1,13 @@ +""" +Demo of the `streamplot` function. + +A streamplot, or streamline plot, is used to display 2D vector fields. This +example shows a few features of the stream plot function: + + * Varying the color along a streamline. + * Varying the density of streamlines. + * Varying the line width along a stream line. +""" import numpy as np import matplotlib.pyplot as plt diff --git a/examples/pylab_examples/streamplot_with_mask.py b/examples/images_contours_and_fields/streamplot_demo_masking.py similarity index 55% rename from examples/pylab_examples/streamplot_with_mask.py rename to examples/images_contours_and_fields/streamplot_demo_masking.py index c989b0060620..ce0ac99b9410 100644 --- a/examples/pylab_examples/streamplot_with_mask.py +++ b/examples/images_contours_and_fields/streamplot_demo_masking.py @@ -1,6 +1,8 @@ """ -Demonstrate the use of the `streamplot` function using a masked array -and NaN values. +Demo of the streamplot function with masking. + +This example shows how streamlines created by the streamplot function skips +masked regions and NaN values. """ import numpy as np import matplotlib.pyplot as plt @@ -17,7 +19,9 @@ U[:20, :20] = np.nan plt.streamplot(X, Y, U, V, color='r') -plt.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5, interpolation='nearest') + +plt.imshow(~mask, extent=(-w, w, -w, w), alpha=0.5, + interpolation='nearest', cmap=plt.cm.gray) plt.show() From 8f4be5bdffecb37bda6d8208d33cce83252ae3c3 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Mon, 24 Dec 2012 11:27:12 -0800 Subject: [PATCH 33/35] Combine colormap reference examples --- doc/users/image_tutorial.rst | 2 +- doc/users/whats_new.rst | 2 +- examples/color/colormaps_reference.py | 79 +++++++++++++++++++ .../color/colormaps_reference_diverging.py | 32 -------- .../colormaps_reference_miscellaneous.py | 27 ------- .../color/colormaps_reference_qualitative.py | 34 -------- .../color/colormaps_reference_sequential.py | 32 -------- .../color/colormaps_reference_sequential2.py | 32 -------- examples/pylab_examples/show_colormaps.py | 29 ------- 9 files changed, 81 insertions(+), 188 deletions(-) create mode 100644 examples/color/colormaps_reference.py delete mode 100644 examples/color/colormaps_reference_diverging.py delete mode 100644 examples/color/colormaps_reference_miscellaneous.py delete mode 100644 examples/color/colormaps_reference_qualitative.py delete mode 100644 examples/color/colormaps_reference_sequential.py delete mode 100644 examples/color/colormaps_reference_sequential2.py delete mode 100644 examples/pylab_examples/show_colormaps.py diff --git a/doc/users/image_tutorial.rst b/doc/users/image_tutorial.rst index 1ccfb5a8a395..bcc21132c450 100644 --- a/doc/users/image_tutorial.rst +++ b/doc/users/image_tutorial.rst @@ -228,7 +228,7 @@ object: There are many other colormap schemes available. See the `list and images of the colormaps -`_. +`_. .. _`Color Bars`: diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst index 8f243e7e93fc..e54dc4f1af7d 100644 --- a/doc/users/whats_new.rst +++ b/doc/users/whats_new.rst @@ -442,7 +442,7 @@ Other improvements * Pim Schellart added a new colormap called "cubehelix". Sameer Grover also added a colormap called "coolwarm". See it and all - other colormaps :ref:`here `. + other colormaps :ref:`here `. * Many bug fixes and documentation improvements. diff --git a/examples/color/colormaps_reference.py b/examples/color/colormaps_reference.py new file mode 100644 index 000000000000..1c433794e4e1 --- /dev/null +++ b/examples/color/colormaps_reference.py @@ -0,0 +1,79 @@ +""" +Reference for colormaps included with Matplotlib. + +This reference example shows all colormaps included with Matplotlib. Note that +any colormap listed here can be reversed by appending "_r" (e.g., "pink_r"). +These colormaps are divided into the following categories: + +Sequential: + These colormaps are approximately monochromatic colormaps varying smoothly + between two color tones---usually from low saturation (e.g. white) to high + saturation (e.g. a bright blue). Sequential colormaps are ideal for + representing most scientific data since they show a clear progression from + low-to-high values. + +Diverging: + These colormaps have a median value (usually light in color) and vary + smoothly to two different color tones at high and low values. Diverging + colormaps are ideal when your data has a median value that is significant + (e.g. 0, such that positive and negative values are represented by + different colors of the colormap). + +Qualitative: + These colormaps vary rapidly in color. Qualitative colormaps are useful for + choosing a set of discrete colors. For example:: + + color_list = plt.cm.Set3(np.linspace(0, 1, 12)) + + gives a list of RGB colors that are good for plotting a series of lines on + a dark background. + +Miscellaneous: + Colormaps that don't fit into the categories above. + +""" +import numpy as np +import matplotlib.pyplot as plt + + +cmaps = [('Sequential', ['binary', 'Blues', 'BuGn', 'BuPu', 'gist_yarg', + 'GnBu', 'Greens', 'Greys', 'Oranges', 'OrRd', + 'PuBu', 'PuBuGn', 'PuRd', 'Purples', 'RdPu', + 'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd']), + ('Sequential (2)', ['afmhot', 'autumn', 'bone', 'cool', 'copper', + 'gist_gray', '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'])] + + +nrows = max(len(cmap_list) for cmap_category, cmap_list in cmaps) +gradient = np.linspace(0, 1, 256) +gradient = np.vstack((gradient, gradient)) + +def plot_color_gradients(cmap_category, cmap_list): + fig, axes = plt.subplots(nrows=nrows) + fig.subplots_adjust(top=0.95, bottom=0.01, left=0.2, right=0.99) + axes[0].set_title(cmap_category + ' colormaps', fontsize=14) + + for ax, name in zip(axes, cmap_list): + ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(name)) + pos = list(ax.get_position().bounds) + x_text = pos[0] - 0.01 + y_text = pos[1] + pos[3]/2. + fig.text(x_text, y_text, name, va='center', ha='right', fontsize=10) + + # Turn off *all* ticks & spines, not just the ones with colormaps. + for ax in axes: + ax.set_axis_off() + +for cmap_category, cmap_list in cmaps: + plot_color_gradients(cmap_category, cmap_list) + +plt.show() diff --git a/examples/color/colormaps_reference_diverging.py b/examples/color/colormaps_reference_diverging.py deleted file mode 100644 index 5e6b7c9985f0..000000000000 --- a/examples/color/colormaps_reference_diverging.py +++ /dev/null @@ -1,32 +0,0 @@ -""" -Reference for "diverging" colormaps. - -Diverging colormaps have a median value (usually light in color) and vary -smoothly to two different color tones at high and low values. Diverging -colormaps are ideal when your data has a median value that is significant (e.g. -0, such that positive and negative values are represented by different colors -of the colormap). -""" -import numpy as np -import matplotlib.pyplot as plt - - -gradient = np.linspace(0, 1, 256) -gradient = np.vstack((gradient, gradient)) - -# Note that any of these colormaps can be reversed by appending '_r'. -cmaps = ['BrBG', 'bwr', 'coolwarm', 'PiYG', 'PRGn', 'PuOr', 'RdBu', 'RdGy', - 'RdYlBu', 'RdYlGn', 'seismic'] - -fig, axes = plt.subplots(nrows=len(cmaps)) -fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) - -for ax, m in zip(axes, cmaps): - ax.set_axis_off() - ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) - pos = list(ax.get_position().bounds) - x_text = pos[0] - 0.01 - y_text = pos[1] + pos[3]/2. - fig.text(x_text, y_text, m, va='center', ha='right') - -plt.show() diff --git a/examples/color/colormaps_reference_miscellaneous.py b/examples/color/colormaps_reference_miscellaneous.py deleted file mode 100644 index f7c1cb6fba35..000000000000 --- a/examples/color/colormaps_reference_miscellaneous.py +++ /dev/null @@ -1,27 +0,0 @@ -""" -Reference for "miscellaneous" colormaps. -""" -import numpy as np -import matplotlib.pyplot as plt - - -gradient = np.linspace(0, 1, 256) -gradient = np.vstack((gradient, gradient)) - -# Note that any of these colormaps can be reversed by appending '_r'. -cmaps = ['flag', 'gist_earth', 'gist_ncar', 'gist_rainbow', 'gist_stern', - 'jet', 'prism', 'brg', 'CMRmap', 'cubehelix', 'gnuplot', 'gnuplot2', - 'ocean', 'rainbow', 'terrain'] - -fig, axes = plt.subplots(nrows=len(cmaps)) -fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) - -for ax, m in zip(axes, cmaps): - ax.set_axis_off() - ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) - pos = list(ax.get_position().bounds) - x_text = pos[0] - 0.01 - y_text = pos[1] + pos[3]/2. - fig.text(x_text, y_text, m, va='center', ha='right') - -plt.show() diff --git a/examples/color/colormaps_reference_qualitative.py b/examples/color/colormaps_reference_qualitative.py deleted file mode 100644 index eb63bfa94841..000000000000 --- a/examples/color/colormaps_reference_qualitative.py +++ /dev/null @@ -1,34 +0,0 @@ -""" -Reference for "qualitative" colormaps. - -Qualitative colormaps vary rapidly in color. These colormaps are useful for -choosing a set of discrete colors. For example:: - - color_list = plt.cm.Set3(np.linspace(0, 1, 12)) - -gives a list of RGB colors that are good for plotting a series of lines on -a dark background. -""" -import numpy as np -import matplotlib.pyplot as plt - - -gradient = np.linspace(0, 1, 256) -gradient = np.vstack((gradient, gradient)) - -# Note that any of these colormaps can be reversed by appending '_r'. -cmaps = ['Accent', 'Dark2', 'hsv', 'Paired', 'Pastel1', 'Pastel2', 'Set1', - 'Set2', 'Set3', 'spectral'] - -fig, axes = plt.subplots(nrows=len(cmaps)) -fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) - -for ax, m in zip(axes, cmaps): - ax.set_axis_off() - ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) - pos = list(ax.get_position().bounds) - x_text = pos[0] - 0.01 - y_text = pos[1] + pos[3]/2. - fig.text(x_text, y_text, m, va='center', ha='right') - -plt.show() diff --git a/examples/color/colormaps_reference_sequential.py b/examples/color/colormaps_reference_sequential.py deleted file mode 100644 index 515471db36bb..000000000000 --- a/examples/color/colormaps_reference_sequential.py +++ /dev/null @@ -1,32 +0,0 @@ -""" -Reference for "sequential" colormaps. - -Sequential colormaps are approximately monochromatic colormaps going from low -saturation (e.g. white) to high saturation (e.g. a bright blue). Sequential -colormaps are ideal for representing most scientific data since they show -a clear progression from low-to-high values. -""" -import numpy as np -import matplotlib.pyplot as plt - - -gradient = np.linspace(0, 1, 256) -gradient = np.vstack((gradient, gradient)) - -# Note that any of these colormaps can be reversed by appending '_r'. -cmaps = ['binary', 'Blues', 'BuGn', 'BuPu', 'gist_yarg', 'GnBu', 'Greens', - 'Greys', 'Oranges', 'OrRd', 'PuBu', 'PuBuGn', 'PuRd', 'Purples', - 'RdPu', 'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd'] - -fig, axes = plt.subplots(nrows=len(cmaps)) -fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) - -for ax, m in zip(axes, cmaps): - ax.set_axis_off() - ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) - pos = list(ax.get_position().bounds) - x_text = pos[0] - 0.01 - y_text = pos[1] + pos[3]/2. - fig.text(x_text, y_text, m, va='center', ha='right') - -plt.show() diff --git a/examples/color/colormaps_reference_sequential2.py b/examples/color/colormaps_reference_sequential2.py deleted file mode 100644 index 7bf354fcd1ce..000000000000 --- a/examples/color/colormaps_reference_sequential2.py +++ /dev/null @@ -1,32 +0,0 @@ -""" -Reference for "sequential" colormaps. - -These are sequential colormaps, which vary smoothly between two color tones. -Unlike the sequential colormaps in the first example, these either vary between -two saturated tones (instead of being nearly monochromatic) or have a reversed -progression (decreasing in saturation for increasing value). Note, however, -that any colormap can be reversed by appending "_r" (e.g., "pink_r"). -""" -import numpy as np -import matplotlib.pyplot as plt - - -gradient = np.linspace(0, 1, 256) -gradient = np.vstack((gradient, gradient)) - -# Note that any of these colormaps can be reversed by appending '_r'. -cmaps = ['afmhot', 'autumn', 'bone', 'cool', 'copper', 'gist_gray', - 'gist_heat', 'gray', 'hot', 'pink', 'spring', 'summer', 'winter'] - -fig, axes = plt.subplots(nrows=len(cmaps)) -fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) - -for ax, m in zip(axes, cmaps): - ax.set_axis_off() - ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(m)) - pos = list(ax.get_position().bounds) - x_text = pos[0] - 0.01 - y_text = pos[1] + pos[3]/2. - fig.text(x_text, y_text, m, va='center', ha='right') - -plt.show() diff --git a/examples/pylab_examples/show_colormaps.py b/examples/pylab_examples/show_colormaps.py deleted file mode 100644 index c2066b579bd7..000000000000 --- a/examples/pylab_examples/show_colormaps.py +++ /dev/null @@ -1,29 +0,0 @@ -# NOTE: This example has been superseded by examples in -# 'color/colormaps_reference_*, but this example is referenced in the -# "What's New" page, and the image tutorial. - -# This example comes from the Cookbook on www.scipy.org. According to the -# history, Andrew Straw did the conversion from an old page, but it is -# unclear who the original author is. -import numpy as np -import matplotlib.pyplot as plt - -a = np.linspace(0, 1, 256).reshape(1,-1) -a = np.vstack((a,a)) - -# Get a list of the colormaps in matplotlib. Ignore the ones that end with -# '_r' because these are simply reversed versions of ones that don't end -# with '_r' -maps = sorted(m for m in plt.cm.datad if not m.endswith("_r")) -nmaps = len(maps) + 1 - -fig = plt.figure(figsize=(5,10)) -fig.subplots_adjust(top=0.99, bottom=0.01, left=0.2, right=0.99) -for i,m in enumerate(maps): - ax = plt.subplot(nmaps, 1, i+1) - plt.axis("off") - plt.imshow(a, aspect='auto', cmap=plt.get_cmap(m), origin='lower') - pos = list(ax.get_position().bounds) - fig.text(pos[0] - 0.01, pos[1], m, fontsize=10, horizontalalignment='right') - -plt.show() From 917c329a74b209fe0880b9545f9ba4272d476f83 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Mon, 24 Dec 2012 11:44:33 -0800 Subject: [PATCH 34/35] Clean up and move barh_demo --- examples/lines_bars_and_markers/barh_demo.py | 21 ++++++++++++++++++++ examples/pylab_examples/barh_demo.py | 20 ------------------- examples/tests/backend_driver.py | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 examples/lines_bars_and_markers/barh_demo.py delete mode 100644 examples/pylab_examples/barh_demo.py diff --git a/examples/lines_bars_and_markers/barh_demo.py b/examples/lines_bars_and_markers/barh_demo.py new file mode 100644 index 000000000000..b0087acb1eb3 --- /dev/null +++ b/examples/lines_bars_and_markers/barh_demo.py @@ -0,0 +1,21 @@ +""" +Simple demo of a horizontal bar chart. +""" +import matplotlib.pyplot as plt; plt.rcdefaults() +from mpltools import style; style.use('gallery') +import numpy as np +import matplotlib.pyplot as plt + + +# Example data +people = ('Tom', 'Dick', 'Harry', 'Slim', 'Jim') +y_pos = np.arange(len(people)) +performance = 3 + 10 * np.random.rand(len(people)) +error = np.random.rand(len(people)) + +plt.barh(y_pos, performance, xerr=error, align='center', alpha=0.4) +plt.yticks(y_pos, people) +plt.xlabel('Performance') +plt.title('How fast do you want to go today?') + +plt.show() diff --git a/examples/pylab_examples/barh_demo.py b/examples/pylab_examples/barh_demo.py deleted file mode 100644 index 0daef263fd37..000000000000 --- a/examples/pylab_examples/barh_demo.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python -# make a horizontal bar chart - -from pylab import * -val = 3+10*rand(5) # the bar lengths -pos = arange(5)+.5 # the bar centers on the y axis - -figure(1) -barh(pos,val, align='center') -yticks(pos, ('Tom', 'Dick', 'Harry', 'Slim', 'Jim')) -xlabel('Performance') -title('How fast do you want to go today?') -grid(True) - -figure(2) -barh(pos,val, xerr=rand(5), ecolor='r', align='center') -yticks(pos, ('Tom', 'Dick', 'Harry', 'Slim', 'Jim')) -xlabel('Performance') - -show() diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 73b2c195d780..8b18d73f461a 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -52,6 +52,7 @@ files = dict() files['lines'] = [ + 'barh_demo.py', 'fill_demo.py', 'fill_demo_features.py', 'line_demo_dash_control.py', @@ -115,7 +116,6 @@ 'barb_demo.py', 'barchart_demo.py', 'barcode_demo.py', - 'barh_demo.py', 'boxplot_demo.py', 'broken_barh.py', 'clippedline.py', From 1e579d822b4b0b46f44b246cc8a53cc0ec206860 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 29 Dec 2012 19:47:58 -0500 Subject: [PATCH 35/35] STY: Combine declarations of example directories --- doc/conf.py | 36 +++++++++++++++++++++--------------- doc/sphinxext/gen_gallery.py | 22 ++++------------------ doc/sphinxext/gen_rst.py | 9 +++++---- 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 414bddd81812..b2bc7118323a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -82,21 +82,27 @@ plot_formats = [('png', 80), ('hires.png', 200), ('pdf', 50)] -# Subdirectories in 'examples/' directory of package -mpl_example_sections = ('lines_bars_and_markers', - 'shapes_and_collections', - 'statistics', - 'images_contours_and_fields', - 'pie_and_polar_charts', - 'color', - 'text_labels_and_annotations', - 'ticks_and_spines', - 'subplots_axes_and_figures', - 'specialty_plots', - 'showcase', - 'api', 'pylab_examples', - 'mplot3d', 'axes_grid', - 'units', 'widgets') +# Subdirectories in 'examples/' directory of package and titles for gallery +# TODO: Change to OrderedDict when Matplotlib drops support for Python < 2.7 +mpl_example_sections = ( + ('lines_bars_and_markers', 'Lines, bars, and markers'), + ('shapes_and_collections', 'Shapes and collections'), + ('statistics', 'Statistical plots'), + ('images_contours_and_fields', 'Images, contours, and fields'), + ('pie_and_polar_charts', 'Pie and polar charts'), + ('color', 'Color'), + ('text_labels_and_annotations', 'Text, labels, and annotations'), + ('ticks_and_spines', 'Ticks and spines'), + ('subplots_axes_and_figures', 'Subplots, axes, and figures'), + ('specialty_plots', 'Specialty plots'), + ('showcase', 'Showcase'), + ('api', 'API'), + ('pylab_examples', 'pylab examples'), + ('mplot3d', 'mplot3d toolkit'), + ('axes_grid', 'axes_grid toolkit'), + ('units', 'units'), + ('widgets', 'widgets'), + ) # Github extension diff --git a/doc/sphinxext/gen_gallery.py b/doc/sphinxext/gen_gallery.py index 967cd8f9b8f6..51e9a7b82ed5 100644 --- a/doc/sphinxext/gen_gallery.py +++ b/doc/sphinxext/gen_gallery.py @@ -11,20 +11,6 @@ exclude_example_sections = ['units'] multiimage = re.compile('(.*?)(_\d\d){1,2}') -custom_titles = {'pylab_examples' : 'pylab examples', - 'lines_bars_and_markers': 'Lines, bars, and markers', - 'shapes_and_collections': 'Shapes and collections', - 'statistics': 'Statistical plots', - 'images_contours_and_fields': 'Images, contours, and fields', - 'pie_and_polar_charts': 'Pie and polar charts', - 'text_labels_and_annotations': 'Text, labels, and annotations', - 'ticks_and_spines': 'Ticks and spines', - 'subplots_axes_and_figures': 'Subplots, axes, and figures', - 'specialty_plots': 'Specialty plots', - 'showcase': 'Showcase', - 'color': 'Color', - 'api': 'API', - } # generate a thumbnail gallery of examples gallery_template = """\ @@ -79,8 +65,9 @@ def gen_gallery(app, doctree): rootdir = 'plot_directive/mpl_examples' example_sections = list(app.builder.config.mpl_example_sections) - for section in exclude_example_sections: - example_sections.remove(section) + for i, (subdir, title) in enumerate(example_sections): + if subdir in exclude_example_sections: + example_sections.pop(i) # images we want to skip for the gallery because they are an unusual # size that doesn't layout well in a table, or because they may be @@ -96,8 +83,7 @@ def gen_gallery(app, doctree): rows = [] toc_rows = [] - for subdir in example_sections: - title = custom_titles.get(subdir, subdir) + for subdir, title in example_sections: rows.append(header_template.format(title=title, section=subdir)) toc_rows.append(toc_template.format(title=title, section=subdir)) diff --git a/doc/sphinxext/gen_rst.py b/doc/sphinxext/gen_rst.py index 4294f4e4787b..1ea5c2286120 100644 --- a/doc/sphinxext/gen_rst.py +++ b/doc/sphinxext/gen_rst.py @@ -33,9 +33,10 @@ def generate_example_rst(app): os.makedirs(exampledir) example_sections = list(app.builder.config.mpl_example_sections) - for section in exclude_example_sections: - example_sections.remove(section) - + for i, (subdir, title) in enumerate(example_sections): + if subdir in exclude_example_sections: + example_sections.pop(i) + example_subdirs, titles = zip(*example_sections) datad = {} for root, subFolders, files in os.walk(rootdir): @@ -122,7 +123,7 @@ def generate_example_rst(app): fhsubdirIndex.write(' %s <%s>\n'%(os.path.basename(basename),rstfile)) - do_plot = (subdir in example_sections + do_plot = (subdir in example_subdirs and not noplot_regex.search(contents)) if not do_plot: fhstatic = file(outputfile, 'w')

Click on any image to see full size image and source code

+ {title}¶ +

%s¶