10000 Merge remote-tracking branch 'upstream/master' · chrodan/matplotlib@0dcd950 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0dcd950

Browse files
chrodanchrodan
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: lib/matplotlib/axes.py
2 parents 6068f24 + 2c06a95 commit 0dcd950

File tree

99 files changed

+12603
-4864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+12603
-4864
lines changed

‎CHANGELOG

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
1+
2012-03-07 Refactor movie writing into useful classes that make use
2+
of pipes to write image data to ffmpeg or mencoder. Also
3+
improve settings for these and the ability to pass custom
4+
options. - RMM
5+
6+
2012-02-29 errorevery keyword added to errorbar to enable errorbar
7+
subsampling. fixes issue #600.
8+
9+
2012-02-28 Added plot_trisurf to the mplot3d toolkit. This supports plotting
10+
three dimensional surfaces on an irregular grid. - Damon McDougall
11+
12+
2012-01-23 The radius labels in polar plots no longer use a fixed
13+
padding, but use a different alignment depending on the
14+
quadrant they are in. This fixes numerical problems when
15+
(rmax - rmin) gets too small. - MGD
16+
17+
2012-01-08 Add axes.streamplot to plot streamlines of a velocity field.
18+
Adapted from Tom Flannaghan streamplot implementation. -TSY
19+
120
2011-12-29 ps and pdf markers are now stroked only if the line width
221
is nonzero for consistency with agg, fixes issue #621. - JKS
322

23+
424
2011-12-27 Work around an EINTR bug in some versions of subprocess. - JKS
525

626

‎CXX/Python3/Objects.hxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ namespace Py
413413
{
414414
}
415415

416-
bool accepts( PyObject *pyob )
416+
virtual bool accepts( PyObject *pyob ) const
417417
{
418418
return pyob == NULL;
419419
}
@@ -1520,7 +1520,7 @@ namespace Py
15201520

15211521
int operator-( const iterator &other ) const
15221522
{
1523-
if( seq.ptr() != other.seq.ptr() )
1523+
if( seq->ptr() != other.seq->ptr() )
15241524
throw RuntimeError( "SeqBase<T>::iterator comparison error" );
15251525

15261526
return count - other.count;

‎agg24/include/agg_renderer_outline_aa.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ namespace agg
13651365
//---------------------------------------------------------------------
13661366
void profile(const line_profile_aa& prof) { m_profile = &prof; }
13671367
const line_profile_aa& profile() const { return *m_profile; }
1368-
line_profile_aa& profile() { return *m_profile; }
1368+
const line_profile_aa& profile() { return *m_profile; }
13691369

13701370
//---------------------------------------------------------------------
13711371
int subpixel_width() const { return m_profile->subpixel_width(); }

‎boilerplate.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ def %(func)s(%(argspec)s):
8989
#'spy',
9090
'stem',
9191
'step',
92+
'streamplot',
9293
'tricontour',
9394
'tricontourf',
9495
'tripcolor',
@@ -123,6 +124,7 @@ def %(func)s(%(argspec)s):
123124
#'spy' : 'sci(%(ret)s)', ### may return image or Line2D
124125
'quiver' : 'sci(%(ret)s)',
125126
'specgram' : 'sci(%(ret)s[-1])',
127+
'streamplot' : 'sci(%(ret)s)',
126128
'tricontour' : 'if %(ret)s._A is not None: sci(%(ret)s)',
127129
'tricontourf': 'if %(ret)s._A is not None: sci(%(ret)s)',
128130
'tripcolor' : 'sci(%(ret)s)',

‎doc/_templates/index.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -906,6 +906,18 @@ <h3>plotting commands</h3> <br/>
906906
</td>
907907

908908
</tr>
909+
<tr>
910+
<th align="left">
911+
<a href="api/pyplot_api.html#matplotlib.pyplot.subplots">subplots</a>
912+
913+
</th>
914+
915+
<td align="left">
916+
Create a figure with subplots
917+
</td>
918+
919+
</tr>
920+
909921
<tr>
910922
<th align="left">
911923
<a href="api/pyplot_api.html#matplotlib.pyplot.subplots_adjust">subplots_adjust</a>

‎doc/api/sankey_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sankey
44

55

66
:mod:`matplotlib.sankey`
7-
=======================
7+
========================
88

99
.. automodule:: matplotlib.sankey
1010
:members:

‎doc/devel/gitwash/git_links.inc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
.. _git svn crash course: http://git-scm.com/course/svn.html
2121
.. _learn.github: http://learn.github.com/
2222
.. _network graph visualizer: http://github.com/blog/39-say-hello-to-the-network-graph-visualizer
23-
.. _git user manual: http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
24-
.. _git tutorial: http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
23+
.. _git user manual: http://schacon.github.com/git/user-manual.html
24+
.. _git tutorial: http://schacon.github.com/git/gittutorial.html
2525
.. _git community book: http://book.git-scm.com/
2626
.. _git ready: http://www.gitready.com/
2727
.. _git casts: http://www.gitcasts.com/
2828
.. _Fernando's git page: http://www.fperez.org/py4science/git.html
2929
.. _git magic: http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html
3030
.. _git concepts: http://www.eecs.harvard.edu/~cduan/technical/git/
31-
.. _git clone: http://www.kernel.org/pub/software/scm/git/docs/git-clone.html
32-
.. _git checkout: http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
33-
.. _git commit: http://www.kernel.org/pub/software/scm/git/docs/git-commit.html
34-
.. _git push: http://www.kernel.org/pub/software/scm/git/docs/git-push.html
35-
.. _git pull: http://www.kernel.org/pub/software/scm/git/docs/git-pull.html
36-
.. _git add: http://www.kernel.org/pub/software/scm/git/docs/git-add.html
37-
.. _git status: http://www.kernel.org/pub/software/scm/git/docs/git-status.html
38-
.. _git diff: http://www.kernel.org/pub/software/scm/git/docs/git-diff.html
39-
.. _git log: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
40-
.. _git branch: http://www.kernel.org/pub/software/scm/git/docs/git-branch.html
41-
.. _git remote: http://www.kernel.org/pub/software/scm/git/docs/git-remote.html
42-
.. _git config: http://www.kernel.org/pub/software/scm/git/docs/git-config.html
31+
.. _git clone: http://schacon.github.com/git/git-clone.html
32+
.. _git checkout: http://schacon.github.com/git/git-checkout.html
33+
.. _git commit: http://schacon.github.com/git/git-commit.html
34+
.. _git push: http://schacon.github.com/git/git-push.html
35+
.. _git pull: http://schacon.github.com/git/git-pull.html
36+
.. _git add: http://schacon.github.com/git/git-add.html
37+
.. _git status: http://schacon.github.com/git/git-status.html
38+
.. _git diff: http://schacon.github.com/git/git-diff.html
39+
.. _git log: http://schacon.github.com/git/git-log.html
40+
.. _git branch: http://schacon.github.com/git/git-branch.html
41+
.. _git remote: http://schacon.github.com/git/git-remote.html
42+
.. _git config: http://schacon.github.com/git/git-config.html
4343
.. _why the -a flag?: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html
4444
.. _git staging area: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html
4545
.. _tangled working copy problem: http://tomayko.com/writings/the-thing-about-git

‎doc/faq/installing_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,4 +366,4 @@ a single click installer.
366366
* The Enthought Python Distribution `EPD
367367
<http://www.enthought.com/products/epd.php>`_
368368

369-
* `python (x, y) <http://www.pythonxy.com/foreword.php>`_
369+
* `python (x, y) <http://www.pythonxy.com>`_

‎doc/mpl_toolkits/mplot3d/tutorial.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ Surface plots
6464
.. plot:: mpl_examples/mplot3d/surface3d_demo2.py
6565
.. plot:: mpl_examples/mplot3d/surface3d_demo3.py
6666

67+
.. _trisurface:
68+
69+
Tri-Surface plots
70+
=================
71+
.. automethod:: Axes3D.plot_trisurface
72+
73+
.. plot:: mpl_examples/mplot3d/trisurf3d_demo.py
74+
75+
6776
.. _contour3d:
6877

6978
Contour plots

‎doc/users/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ nothing about output. The *backends* are device dependent drawing
7070
devices, aka renderers, that transform the frontend representation to
7171
hardcopy or a display device (:ref:`what-is-a-backend`). Example
7272
backends: PS creates `PostScript®
73-
<http://http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
73+
<http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
7474
creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`_
7575
hardcopy, Agg creates PNG output using the high quality `Anti-Grain
7676
Geometry <http://www.antigrain.com>`_ library that ships with

0 commit comments

Comments
 (0)
0