diff --git a/boilerplate.py b/boilerplate.py index b1a430a0f98f..1572158c30d1 100644 --- a/boilerplate.py +++ b/boilerplate.py @@ -42,7 +42,7 @@ PLOT_TEMPLATE = AUTOGEN_MSG + """ -@autogen_docstring(Axes.%(func)s) +@_autogen_docstring(Axes.%(func)s) def %(func)s(%(argspec)s): %(ax)s = gca() # allow callers to override the hold state by passing hold=True|False @@ -216,7 +216,7 @@ def format_value(value): call.append('%s' % arg) else: call.append('%s=%s' % (arg, arg)) - + if varargs is not None: call.append('*'+varargs) if varkw is not None: @@ -286,6 +286,8 @@ def format_value(value): for name in cmaps: yield CMAP_TEMPLATE.format(name=name) + yield '' + yield '_setup_pyplot_info_docstrings()' def build_pyplot(): pyplot_path = os.path.join(os.path.dirname(__file__), 'lib', diff --git a/doc/_templates/index.html b/doc/_templates/index.html index fdf1d417607d..4edb3d532c4f 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -3,7 +3,42 @@ {% block body %} -
matplotlib is a python 2D plotting library which produces publication quality figures in a variety of hardcopy formats and @@ -17,23 +52,17 @@
matplotlib tries to make easy things easy and hard things possible. You can generate plots, histograms, power spectra, bar charts, errorcharts, scatterplots, etc, with just a few lines of code. For a sampling, see the screenshots, thumbnail gallery, and -examples directory
- - + examples directory - -For example, using "ipython -pylab" to provide an interactive +
For example, using "ipython --pylab" to provide an interactive environment, to generate 10,000 gaussian random numbers and plot a histogram with 100 bins, you simply need to type
@@ -44,1266 +73,89 @@For the power user, you have full control of line styles, font properties, axes properties, etc, via an object oriented interface - or via a set of functions familiar to MATLAB users. - The pylab mode provides all of the pyplot plotting - functions listed below, as well as non-plotting functions from - numpy and - matplotlib.mlab.
- -Function | Description |
---|---|
- acorr - - | - -- plot the autocorrelation function - | - -
- annotate - - | - -- annotate something in the figure - | - -
- arrow - - | - -- add an arrow to the axes - | - -
- axes - - | - -- create a new axes - | - -
- axhline - - | - -- draw a horizontal line across axes - | - -
- axvline - - | - -- draw a vertical line across axes - | - -
- axhspan - - | - -- draw a horizontal bar across axes - | - -
- axvspan - - | - -- draw a vertical bar across axes - | - -
- axis - - | - -- set or return the current axis limits - | - -
- barbs - - | - -- a (wind) barb plot - | - -
- bar - - | - -- make a bar chart - | - -
- barh - - | - -- a horizontal bar chart - | - -
- broken_barh - - | - -- a set of horizontal bars with gaps - | - -
- box - - | - -- set the axes frame on/off state - | - -
- boxplot - - | - -- make a box and whisker plot - | - -
- cla - - | - -- clear current axes - | - -
- clabel - - | - -- label a contour plot - | - -
- clf - - | - -- clear a figure window - | - -
- clim - - | - -- adjust the color limits of the current image - | - -
- close - - | - -- close a figure window - | - -
- colorbar - - | - -- add a colorbar to the current figure - | - -
- cohere - - | - -- make a plot of coherence - | - -
- contour - - | - -- make a contour plot - | - -
- contourf - - | - -- make a filled contour plot - | - -
- csd - - | - -- make a plot of cross spectral density - | - -
- delaxes - - | - -- delete an axes from the current figure - | - -
- draw - - | - -- Force a redraw of the current figure - | - -
- errorbar - - | - -- make an errorbar graph - | - -
- figlegend - - | - -- make legend on the figure rather than the axes - | - -
- figimage - - | - -- make a figure image - | - -
- figtext - - | - -- add text in figure coords - | - -
- figure - - | - -- create or change active figure - | - -
- fill - - | - -- make filled polygons - | - -
- fill_between - - | - -- make filled polygons between two curves - | - -
- findobj - - | - -- recursively find all objects matching some criteria - | - -
- gca - - | - -- return the current axes - | - -
- gcf - - | - -- return the current figure - | - -
- gci - - | - -- get the current image, or None - | - -
- getp - - | - -- get a graphics property - | - -
- grid - - | - -- set whether gridding is on - | - -
- hexbin - - | - -- make a 2D hexagonal binning plot - | - -
- hist - - | - -- make a histogram - | - -
- hold - - | - -- set the axes hold state - | - -
- ioff - - | - -- turn interaction mode off - | - -
- ion - - | - -- turn interaction mode on - | - -
- isinteractive - - | - -- return True if interaction mode is on - | - -
- imread - - | - -- load image file into array - | - -
- imsave - - | - -- save array as an image file - | - -
- imshow - - | - -- plot image data - | - -
- ishold - - | - -- return the hold state of the current axes - | - -
- legend - - | - -- make an axes legend - | - -
- locator_params - - | - -- adjust parameters used in locating axis ticks - | - -
- loglog - - | - -- a log log plot - | - -
- matshow - - | - -- display a matrix in a new figure preserving aspect - | - -
- margins - - | - -- set margins used in autoscaling - | - -
- pcolor - - | - -- make a pseudocolor plot - | - -
- pcolormesh - - | - -- make a pseudocolor plot using a quadrilateral mesh - | - -
- pie - - | - -- make a pie chart - | - -
- plot - - | - -- make a line plot - | - -
- plot_date - - | - -- plot dates - | - -
- plotfile - - | - -- plot column data from an ASCII tab/space/comma delimited file - | - -
- pie - - | - -- pie charts - | - -
- polar - - | - -- make a polar plot on a PolarAxes - | - -
- psd - - | - -- make a plot of power spectral density - | - -
- quiver - - | - -- make a direction field (arrows) plot - | - -
- rc - - | - -- control the default params - | - -
- rgrids - - | - -- customize the radial grids and labels for polar - | - -
- savefig - - | - -- save the current figure - | - -
- scatter - - | - -- make a scatter plot - | - -
- setp - - | - -- set a graphics property - | - -
- semilogx - - | - -- log x axis - | - -
- semilogy - - | - -- log y axis - | - -
- show - - | - -- show the figures - | - -
- specgram - - | - -- a spectrogram plot - | - -
- spy - - | - -- plot sparsity pattern using markers or image - | - -
- stem - - | - -- make a stem plot - | - -
- subplot - - | - -- make a subplot (numrows, numcols, axesnum) - | - -
- subplots - - | - -- Create a figure with subplots - | - -
- subplots_adjust - - | - -- change the params controlling the subplot positions of current figure - | - -
- subplot_tool - - | - -- launch the subplot configuration tool - | - -
- suptitle - - | - -- add a figure title - | - -
- table - - | - -- add a table to the plot - | - -
- text - - | - -- add some text at location x,y to the current axes - | - -
- thetagrids - - | - -- customize the radial theta grids and labels for polar - | - -
- tick_params - - | - -- control the appearance of ticks and tick labels - | - -
- ticklabel_format - - | - -- control the format of tick labels - | - -
- title - - | - -- add a title to the current axes - | - -
- tricontour - - | - -- make a contour plot on a triangular grid - | - -
- tricontourf - - | - -- make a filled contour plot on a triangular grid - | - -
- tripcolor - - | - -- make a pseudocolor plot on a triangular grid - | - -
- triplot - - | - -- plot a triangular grid - | - -
- xcorr - - | - -- plot the autocorrelation function of x and y - | - -
- xlim - - | - -- set/get the xlimits - | - -
- ylim - - | - -- set/get the ylimits - | - -
- xticks - - | - -- set/get the xticks - | - -
- yticks - - | - -- set/get the yticks - | - -
- xlabel - - | - -- add an xlabel to the current axes - | - -
- ylabel - - | - -- add a ylabel to the current axes - | - -
- autumn - - | - -- set the default colormap to autumn - | - -
- bone - - | - -- set the default colormap to bone - | - -
- cool - - | - -- set the default colormap to cool - | - -
- copper - - | - -- set the default colormap to copper - | - -
- flag - - | - -- set the default colormap to flag - | - -
- gray - - | - -- set the default colormap to gray - | - -
- hot - - | - -- set the default colormap to hot - | - -
- hsv - - | - -- set the default colormap to hsv - | - -
- jet + or via a set of functions familiar to MATLAB users. - | +- set the default colormap to jet - | + Matplotlib 1.1.1 is available for +download. -
- pink
+ Documentation- |
+ This is the documentation for matplotlib version {{ version }}.
- - set the default colormap to pink - | + + -
- prism
+ Trying to learn how to do a particular kind of plot? Check out + the gallery, examples, + or the list of plotting + commands. - |
+ - set the default colormap to prism - | +
- spring
+ |
+ - set the default colormap to spring - | +
- summer
+ Check the faq, +the api docs, +mailing +list archives, and join the matplotlib +mailing lists. +The search tool searches all of +the documentation, including full text search of over 350 complete +examples which exercise almost every corner of matplotlib. - |
+- set the default colormap to summer - | +
- winter
+Toolkits- |
+- set the default colormap to winter - | +
- spectral
+ Please +consider donating +to support matplotlib development. - |
+- set the default colormap to spectral - | +
* diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html index 6ef509120ff1..e69de29bb2d1 100644 --- a/doc/_templates/indexsidebar.html +++ b/doc/_templates/indexsidebar.html @@ -1,82 +0,0 @@ -
Please donate -to support matplotlib development.
- - -Matplotlib 1.1.1 is available for -download. -See what's new -and tips on installing. -
- -Sandro Tosi has a new book - Matplotlib for python - developers - also - at amazon.
- -Build websites like matplotlib's, -with Sphinx and extensions for -mpl plots, math, inheritance diagrams -- try -the sampledoc -tutorial. -
- -Watch the SciPy 2009 intro and advanced matplotlib tutorials -
- -Watch -a talk about -matplotlib presented -at NIPS 08 -Workshop MLOSS and one presented -at ChiPy. -
- - -There are several matplotlib add-on toolkits, including the projection -and mapping toolkit -basemap, 3d plotting with mplot3d, axes and axis helpers in axes_grid and more. -
- -Check the user guide, -the faq, the api docs, -archives, -and join the matplotlib -mailing lists. -The search tool searches all of -the documentation, including full text search of over 350 complete -examples which exercise almost every corner of matplotlib.
- -You can file bugs, patches and feature requests on the -github -tracker, -but it is a good idea to ping us on the mailing list too.
- -For details on what's new, see the detailed changelog or browse the source code. Anything that could -require changes to your existing codes is logged in the api changes file.
- -The matplotlib license -is based on the Python Software Foundation -(PSF) license.
- -There is an active developer community and a long list of people -who have made significant contributions.
- diff --git a/doc/api/index.rst b/doc/api/index.rst index 194e481eddcb..f6c05695b3dd 100644 --- a/doc/api/index.rst +++ b/doc/api/index.rst @@ -12,6 +12,7 @@ .. toctree:: :maxdepth: 1 + pyplot_summary.rst api_changes.rst matplotlib_configuration_api.rst afm_api.rst diff --git a/doc/api/pyplot_api.rst b/doc/api/pyplot_api.rst index fe090eac87af..94e3baac26f0 100644 --- a/doc/api/pyplot_api.rst +++ b/doc/api/pyplot_api.rst @@ -1,7 +1,7 @@ ****** pyplot ****** - + :mod:`matplotlib.pyplot` ======================== @@ -10,3 +10,4 @@ pyplot :members: :undoc-members: :show-inheritance: + :exclude-members: plotting, colormaps diff --git a/doc/api/pyplot_summary.rst b/doc/api/pyplot_summary.rst new file mode 100644 index 000000000000..7236fa864ccc --- /dev/null +++ b/doc/api/pyplot_summary.rst @@ -0,0 +1,8 @@ +Plotting commands summary +========================= + +.. currentmodule:: matplotlib.pyplot + +.. autofunction:: plotting + +.. autofunction:: colormaps diff --git a/doc/conf.py b/doc/conf.py index 4e5e3557ce5f..8f87cb4ae05b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -74,6 +74,8 @@ # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' +default_role = 'obj' + # Plot directive configuration # ---------------------------- diff --git a/doc/sphinxext/gen_gallery.py b/doc/sphinxext/gen_gallery.py index aadc2c0e9b8c..45e2d47370d7 100644 --- a/doc/sphinxext/gen_gallery.py +++ b/doc/sphinxext/gen_gallery.py @@ -16,7 +16,7 @@ import os, glob, re, sys, warnings import matplotlib.image as image -multiimage = re.compile('(.*)_\d\d') +multiimage = re.compile('(.*?)(_\d\d){1,2}') def make_thumbnail(args): image.thumbnail(args[0], args[1], 0.3) @@ -68,11 +68,8 @@ def gen_gallery(app, doctree): thumbnails[orig_path] = thumb_path m = multiimage.match(basename) - if m is None: - pyfile = '%s.py'%basename - else: + if m is not None: basename = m.group(1) - pyfile = '%s.py'%basename data.append((subdir, basename, os.path.join(rootdir, subdir, 'thumbnails', filename))) diff --git a/doc/users/credits.rst b/doc/users/credits.rst index d1a6200c19b8..50930f7d5e79 100644 --- a/doc/users/credits.rst +++ b/doc/users/credits.rst @@ -6,19 +6,22 @@ Credits matplotlib was written by John Hunter and is now developed and -maintained by a number of -`activeNote: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: