Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3cedb31

Browse files
committed
Merged revisions 7407,7409,7414,7416,7424 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7407 | jdh2358 | 2009-08-06 08:51:58 -1000 (Thu, 06 Aug 2009) | 1 line hide colorbar_doc a bit ........ r7409 | ryanmay | 2009-08-06 09:28:16 -1000 (Thu, 06 Aug 2009) | 1 line Tweak solution for hiding colorbar_doc to sync with trunk. ........ r7414 | jdh2358 | 2009-08-07 00:15:04 -1000 (Fri, 07 Aug 2009) | 1 line some doc fixes ........ r7416 | jdh2358 | 2009-08-07 05:40:56 -1000 (Fri, 07 Aug 2009) | 1 line don't fail on window icon load ........ r7424 | efiring | 2009-08-07 20:07:06 -1000 (Fri, 07 Aug 2009) | 2 lines Restore default colormap behavior: no color (alpha = 0) for masked data ........ svn path=/trunk/matplotlib/; revision=7425
1 parent df066b5 commit 3cedb31

10 files changed

Lines changed: 619 additions & 625 deletions

File tree

doc/_templates/indexsidebar.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h3>Need help?</h3>
2929
and join the matplotlib
3030
mailing <a href="http://sourceforge.net/mail/?group_id=80706">lists</a>.
3131
The <a href="{{ pathto('search') }}">search</a> tool searches all of
32-
the documentation, including full text search of almost 300 complete
32+
the documentation, including full text search of over 350 complete
3333
examples which exercise almost every corner of matplotlib.</p>
3434

3535
<p>You can file bugs, patches and feature requests on the

doc/users/annotations.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,4 @@ keyword args like ``horizontalalignment``, ``verticalalignment`` and
7878
.. plot:: pyplots/annotation_polar.py
7979
:include-source:
8080

81-
See the `annotations demo
82-
<http://matplotlib.sf.net/examples/pylab_examples/annotation_demo.py>`_ for more
83-
examples.
81+
For more on all the wild and wonderful things you can do with annotations, including fancy arrows, see :ref:`plotting-guide-annotation` and :ref:`pylab_examples-annotation_demo`.

doc/users/artists.rst

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,7 @@ the ``Artist`` handles all the high level constructs like representing
1919
and laying out the figure, text, and lines. The typical user will
2020
spend 95% of his time working with the ``Artists``.
2121

22-
There are two types of ``Artists``: primitives and containers. The
23-
primitives represent the standard graphical objects we want to paint
24-
onto our canvas: :class:`~matplotlib.lines.Line2D`,
25-
:class:`~matplotlib.patches.Rectangle`,
26-
:class:`~matplotlib.text.Text`, :class:`~matplotlib.image.AxesImage`,
27-
etc., and the containers are places to put them
28-
(:class:`~matplotlib.axis.Axis`, :class:`~matplotlib.axes.Axes` and
29-
:class:`~matplotlib.figure.Figure`). The standard use is to create a
30-
:class:`~matplotlib.figure.Figure` instance, use the ``Figure`` to
31-
create one or more :class:`~matplotlib.axes.Axes` or
32-
:class:`~matplotlib.axes.Subplot` instances, and use the ``Axes``
33-
instance helper methods to create the primitives. In the example
34-
below, we create a ``Figure`` instance using
35-
:func:`matplotlib.pyplot.figure`, which is a convenience method for
36-
instantiating ``Figure`` instances and connecting them with your user
37-
interface or drawing toolkit ``FigureCanvas``. As we will discuss
38-
below, this is not necessary, and you can work directly with
39-
PostScript, PDF Gtk+, or wxPython ``FigureCanvas`` instances. For
40-
example, instantiate your ``Figures`` directly and connect them
41-
yourselves, but since we are focusing here on the ``Artist`` API we'll let
42-
:mod:`~matplotlib.pyplot` handle some of those details for us::
22+
There are two types of ``Artists``: primitives and containers. The primitives represent the standard graphical objects we want to paint onto our canvas: :class:`~matplotlib.lines.Line2D`, :class:`~matplotlib.patches.Rectangle`, :class:`~matplotlib.text.Text`, :class:`~matplotlib.image.AxesImage`, etc., and the containers are places to put them (:class:`~matplotlib.axis.Axis`, :class:`~matplotlib.axes.Axes` and :class:`~matplotlib.figure.Figure`). The standard use is to create a :class:`~matplotlib.figure.Figure` instance, use the ``Figure`` to create one or more :class:`~matplotlib.axes.Axes` or :class:`~matplotlib.axes.Subplot` instances, and use the ``Axes`` instance helper methods to create the primitives. In the example below, we create a ``Figure`` instance using :func:`matplotlib.pyplot.figure`, which is a convenience method for instantiating ``Figure`` instances and connecting them with your user interface or drawing toolkit ``FigureCanvas``. As we will discuss below, this is not necessary -- you can work directly with PostScript, PDF Gtk+, or wxPython ``FigureCanvas`` instances, instantiate your ``Figures`` directly and connect them yourselves -- but since we are focusing here on the ``Artist`` API we'll let :mod:`~matplotlib.pyplot` handle some of those details for us::
4323

4424
import matplotlib.pyplot as plt
4525
fig = plt.figure()
@@ -85,7 +65,7 @@ subclass of ``Axes``) and when you call ``ax.plot``, it creates a
8565
<matplotlib.axes.Axes.lines>` list. In the interactive `ipython
8666
<http://ipython.scipy.org/>`_ session below, you can see that the
8767
``Axes.lines`` list is length one and contains the same line that was
88-
returned by the ``line, = ax.plot(x, y, 'o')`` call:
68+
returned by the ``line, = ax.plot...`` call:
8969

9070
.. sourcecode:: ipython
9171

@@ -536,20 +516,7 @@ and zooming, as well as the :class:`~matplotlib.ticker.Locator` and
536516
:class:`~matplotlib.ticker.Formatter` instances which control where
537517
the ticks are placed and how they are represented as strings.
538518

539-
Each ``Axis`` object contains a :attr:`~matplotlib.axis.Axis.label`
540-
attribute (this is what the :mod:`~matplotlib.pylab` calls to
541-
:func:`~matplotlib.pylab.xlabel` and :func:`~matplotlib.pylab.ylabel`
542-
set) as well as a list of major and minor ticks. The ticks are
543-
:class:`~matplotlib.axis.XTick` and :class:`~matplotlib.axis.YTick`
544-
instances, which contain the actual line and text primitives that
545-
render the ticks and ticklabels. Because the ticks are dynamically
546-
created as needed (eg. when panning and zooming), you should access
547-
the lists of major and minor ticks through their accessor methods
548-
:meth:`~matplotlib.axis.Axis.get_major_ticks` and
549-
:meth:`~matplotlib.axis.Axis.get_minor_ticks`. Although the ticks
550-
contain all the primitives and will be covered below, the ``Axis`` methods
551-
contain accessor methods to return the tick lines, tick labels, tick
552-
locations etc.:
519+
Each ``Axis`` object contains a :attr:`~matplotlib.axis.Axis.label` attribute (this is what :mod:`~matplotlib.pylab` modifies in calls to :func:`~matplotlib.pylab.xlabel` and :func:`~matplotlib.pylab.ylabel`) as well as a list of major and minor ticks. The ticks are :class:`~matplotlib.axis.XTick` and :class:`~matplotlib.axis.YTick` instances, which contain the actual line and text primitives that render the ticks and ticklabels. Because the ticks are dynamically created as needed (eg. when panning and zooming), you should access the lists of major and minor ticks through their accessor methods :meth:`~matplotlib.axis.Axis.get_major_ticks` and :meth:`~matplotlib.axis.Axis.get_minor_ticks`. Although the ticks contain all the primitives and will be covered below, the ``Axis`` methods contain accessor methods to return the tick lines, tick labels, tick locations etc.:
553520

554521
.. sourcecode:: ipython
555522

@@ -636,7 +603,7 @@ label1On boolean which determines whether to draw tick label
636603
label2On boolean which determines whether to draw tick label
637604
============== ==========================================================
638605

639-
Here is an example which sets the formatter for the upper ticks with
606+
Here is an example which sets the formatter for the right side ticks with
640607
dollar signs and colors them green on the right side of the yaxis
641608

642609
.. plot:: pyplots/dollar_ticks.py

doc/users/credits.rst

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Special thanks to those who have made valuable contributions
1616
Jeremy O'Donoghue
1717
wrote the wx backend
1818

19-
Andrew Straw
20-
provided much of the log scaling architecture, the fill command, PIL
21-
support for imshow, and provided many examples
19+
Andrew Straw provided much of the log scaling architecture, the fill
20+
command, PIL support for imshow, and provided many examples. He
21+
also wrote the support for dropped axis spines.
2222

2323
Charles Twardy
2424
provided the impetus code for the legend class and has made
@@ -28,7 +28,6 @@ Gary Ruben
2828
made many enhancements to errorbar to support x and y
2929
errorbar plots, and added a number of new marker types to plot.
3030

31-
3231
John Gill
3332
wrote the table class and examples, helped with support for
3433
auto-legend placement, and added support for legending scatter
@@ -133,7 +132,7 @@ Eric Firing
133132
most aspects of matplotlib.
134133

135134
Daishi Harada
136-
added support for "Dashed Text". See ` dashpointlabel.py
135+
added support for "Dashed Text". See `dashpointlabel.py
137136
<examples/pylab_examples/dashpointlabel.py>`_ and
138137
:class:`~matplotlib.text.TextWithDash`.
139138

@@ -147,11 +146,10 @@ The `brainvisa <http://brainvisa.info>`_ Orsay team and Fernando Perez
147146

148147

149148
Charlie Moad
150-
contributed work to matplotlib's Cocoa support and does the binary
151-
builds and releases.
149+
contributed work to matplotlib's Cocoa support and has done a lot of work on the OSX and win32 binary releases.
152150

153-
Jouni K. Seppaenen
154-
wrote the PDF backend.
151+
Jouni K. Seppaenen wrote the PDF backend and contributed numerous
152+
fixes to the code, to tex support and to the get_sample_data handler
155153

156154
Paul Kienzle
157155
improved the picking infrastruture for interactive plots, and with
@@ -171,4 +169,7 @@ John Porter, Jonathon Taylor and Reinier Heeres
171169
matplotlib, and Jonathon Taylor and Reinier Heeres ported it to the
172170
refactored transform trunk.
173171

174-
172+
Jae-Joon Lee implemented fancy arrows and boxes, rewrote the legend
173+
support to handle multiple columns and fancy text boxes, wrote the
174+
axes grid toolkit, and has made numerous contributions to the code
175+
and documentation

0 commit comments

Comments
 (0)