Menu
▾
▴
matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(115) |
Aug
(120) |
Sep
(137) |
Oct
(170) |
Nov
(461) |
Dec
(263) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(120) |
Feb
(74) |
Mar
(35) |
Apr
(74) |
May
(245) |
Jun
(356) |
Jul
(240) |
Aug
(115) |
Sep
(78) |
Oct
(225) |
Nov
(98) |
Dec
(271) |
| 2009 |
Jan
(132) |
Feb
(84) |
Mar
(74) |
Apr
(56) |
May
(90) |
Jun
(79) |
Jul
(83) |
Aug
(296) |
Sep
(214) |
Oct
(76) |
Nov
(82) |
Dec
(66) |
| 2010 |
Jan
(46) |
Feb
(58) |
Mar
(51) |
Apr
(77) |
May
(58) |
Jun
(126) |
Jul
(128) |
Aug
(64) |
Sep
(50) |
Oct
(44) |
Nov
(48) |
Dec
(54) |
| 2011 |
Jan
(68) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jd...@us...> - 2008-12-15 14:58:08
|
Revision: 6612
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6612&view=rev
Author: jdh2358
Date: 2008-12-15 14:58:02 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
updates to release guide
Modified Paths:
--------------
trunk/matplotlib/doc/devel/release_guide.rst
Modified: trunk/matplotlib/doc/devel/release_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/release_guide.rst 2008-12-15 14:53:30 UTC (rev 6611)
+++ trunk/matplotlib/doc/devel/release_guide.rst 2008-12-15 14:58:02 UTC (rev 6612)
@@ -49,6 +49,7 @@
Packaging
=========
+
* Make sure the :file:`MANIFEST.in` us up to date and remove
:file:`MANIFEST` so it will be rebuilt by MANIFEST.in
@@ -68,11 +69,9 @@
* on windows, unix2dos the rc file
-* make a branch of the svn revision that is released, in case we need
- to do a bug fix release. Eg, from the top level of the mpl svn
- tree, the one which has "branches", "tags" and "trunk", do::
+* We have a Makefile for the OS X builds in the mpl source dir
+ :file:`release/osx`, so use this to prepare the OS X releases.
- > svn copy trunk/matplotlib branches/v0_98_4_maint
.. _release-candidate-testing:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-12-15 14:53:40
|
Revision: 6611
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6611&view=rev
Author: jdh2358
Date: 2008-12-15 14:53:30 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
updates to release guide
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
trunk/matplotlib/doc/devel/release_guide.rst
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2008-12-15 14:21:15 UTC (rev 6610)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2008-12-15 14:53:30 UTC (rev 6611)
@@ -1,4 +1,4 @@
-.. _coding-guide:
+M.. _coding-guide:
************
Coding guide
@@ -29,10 +29,10 @@
svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
v0_91_maint mpl91 --username=youruser --password=yourpass
-The current release of the trunk is in the 0.98.4 maintenance branch::
+The current release of the trunk is in the 0.98.5 maintenance branch::
svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/\
- v0_98_4_maint mpl98.4 --username=youruser --password=yourpass
+ v0_98_5_maint mpl98.5 --username=youruser --password=yourpass
Committing changes
@@ -118,6 +118,9 @@
> svn commit -F svnmerge-commit-message.txt
+
+.. _setting-up-svnmerge:
+
Setting up svnmerge
~~~~~~~~~~~~~~~~~~~
Modified: trunk/matplotlib/doc/devel/release_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/release_guide.rst 2008-12-15 14:21:15 UTC (rev 6610)
+++ trunk/matplotlib/doc/devel/release_guide.rst 2008-12-15 14:53:30 UTC (rev 6611)
@@ -9,6 +9,9 @@
* Edit :file:`__init__.py` and bump the version number
+
+When doing a release
+
.. _release-testing:
Testing
@@ -27,6 +30,20 @@
* remove font cache and tex cache from :file:`.matplotlib` and test
with and without cache on some example script
+
+.. _release-branching:
+
+Branching
+============
+
+Once all the tests are passing and you are ready to do a release, you
+need to create a release branch and configure svn-merge to use it;
+Michael Droettboom should probably handle this step, but if he is not
+available see instructions at :ref:`setting-up-svnmerge`. On the
+bracnh, do any additional testing you want to do, and then build
+binaries and source distributions for testing as release candidates.
+
+
.. _release-packaging:
Packaging
@@ -57,11 +74,35 @@
> svn copy trunk/matplotlib branches/v0_98_4_maint
+
+.. _release-candidate-testing:
+
+Release candidate testing:
+============================
+
+Post the release candidates to
+http://matplotlib.sf.net/release-candidates and post a message to
+matplotlib-users and devel requesting testing. To post to the server,
+you can do::
+
+ > scp somefile.tgz jdh2358,mat...@sh...:/home/groups/m/ma/matplotlib/htdocs/release-candidates/
+
+replacing 'jdh2358' with your sourceforge login.
+
+
+Any changes to fix bugs in the release candidate should be fixed in
+the release branch and merged into the trunk with svn-merge; see
+:ref:`svn-merge`. When the release candidate is signed off on, build
+the final sdist, binaries and eggs, and upload them to the sourceforge
+release area.
+
+
.. _release-uploading:
Uploading
=========
+
* Post the win32 and OS-X binaries for testing and make a request on
matplotlib-devel for testing. Pester us if we don't respond
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-12-15 14:21:19
|
Revision: 6610
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6610&view=rev
Author: mdboom
Date: 2008-12-15 14:21:15 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
Merged revisions 6589,6608-6609 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint
........
r6589 | mmetz_bn | 2008-12-12 08:58:24 -0500 (Fri, 12 Dec 2008) | 1 line
fix warning in hist for numpy 1.2
........
r6608 | mdboom | 2008-12-15 09:16:27 -0500 (Mon, 15 Dec 2008) | 2 lines
Fix gridlines not moving correctly during pan and zoom
........
r6609 | mdboom | 2008-12-15 09:18:03 -0500 (Mon, 15 Dec 2008) | 2 lines
Turn off anti-aliasing when auto-snapping.
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/transforms.py
trunk/matplotlib/src/_backend_agg.cpp
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6587
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6609
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-12-15 14:18:03 UTC (rev 6609)
+++ trunk/matplotlib/CHANGELOG 2008-12-15 14:21:15 UTC (rev 6610)
@@ -1,3 +1,7 @@
+2008-12-15 Fix anti-aliasing when auto-snapping - MGD
+
+2008-12-15 Fix grid lines not moving correctly during pan and zoom - MGD
+
2008-12-12 Preparations to eliminate maskedarray rcParams key: its
use will now generate a warning. Similarly, importing
the obsolote numerix.npyma will generate a warning. - EF
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609
Modified: trunk/matplotlib/lib/matplotlib/transforms.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/transforms.py 2008-12-15 14:18:03 UTC (rev 6609)
+++ trunk/matplotlib/lib/matplotlib/transforms.py 2008-12-15 14:21:15 UTC (rev 6610)
@@ -120,8 +120,7 @@
root = stack.pop()
# Stop at subtrees that have already been invalidated
if root._invalid != value or root.pass_through:
- value |= root._invalid
- root._invalid = value
+ root._invalid = self.INVALID
stack.extend(root._parents.keys())
def set_children(self, *children):
Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp 2008-12-15 14:18:03 UTC (rev 6609)
+++ trunk/matplotlib/src/_backend_agg.cpp 2008-12-15 14:21:15 UTC (rev 6610)
@@ -355,7 +355,7 @@
}
template<class Path>
-bool should_snap(const GCAgg& gc, Path& path, const agg::trans_affine& trans) {
+bool should_snap(GCAgg& gc, Path& path, const agg::trans_affine& trans) {
// If this contains only straight horizontal or vertical lines, it should be
// quantized to the nearest pixels
double x0, y0, x1, y1;
@@ -393,6 +393,7 @@
}
path.rewind(0);
+ gc.isaa = false;
return true;
case GCAgg::SNAP_FALSE:
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-12-15 14:18:06
|
Revision: 6609
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6609&view=rev
Author: mdboom
Date: 2008-12-15 14:18:03 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
Turn off anti-aliasing when auto-snapping.
Modified Paths:
--------------
branches/v0_98_5_maint/CHANGELOG
branches/v0_98_5_maint/src/_backend_agg.cpp
Modified: branches/v0_98_5_maint/CHANGELOG
===================================================================
--- branches/v0_98_5_maint/CHANGELOG 2008-12-15 14:16:27 UTC (rev 6608)
+++ branches/v0_98_5_maint/CHANGELOG 2008-12-15 14:18:03 UTC (rev 6609)
@@ -1,3 +1,5 @@
+2008-12-15 Fix anti-aliasing when auto-snapping - MGD
+
2008-12-15 Fix grid lines not moving correctly during pan and zoom - MGD
2008-12-12 Fixed warning in hist() with numpy 1.2 - MM
Modified: branches/v0_98_5_maint/src/_backend_agg.cpp
===================================================================
--- branches/v0_98_5_maint/src/_backend_agg.cpp 2008-12-15 14:16:27 UTC (rev 6608)
+++ branches/v0_98_5_maint/src/_backend_agg.cpp 2008-12-15 14:18:03 UTC (rev 6609)
@@ -355,7 +355,7 @@
}
template<class Path>
-bool should_snap(const GCAgg& gc, Path& path, const agg::trans_affine& trans) {
+bool should_snap(GCAgg& gc, Path& path, const agg::trans_affine& trans) {
// If this contains only straight horizontal or vertical lines, it should be
// quantized to the nearest pixels
double x0, y0, x1, y1;
@@ -393,6 +393,7 @@
}
path.rewind(0);
+ gc.isaa = false;
return true;
case GCAgg::SNAP_FALSE:
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-12-15 14:16:32
|
Revision: 6608
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6608&view=rev
Author: mdboom
Date: 2008-12-15 14:16:27 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
Fix gridlines not moving correctly during pan and zoom
Modified Paths:
--------------
branches/v0_98_5_maint/CHANGELOG
branches/v0_98_5_maint/lib/matplotlib/transforms.py
Modified: branches/v0_98_5_maint/CHANGELOG
===================================================================
--- branches/v0_98_5_maint/CHANGELOG 2008-12-15 06:26:18 UTC (rev 6607)
+++ branches/v0_98_5_maint/CHANGELOG 2008-12-15 14:16:27 UTC (rev 6608)
@@ -1,3 +1,5 @@
+2008-12-15 Fix grid lines not moving correctly during pan and zoom - MGD
+
2008-12-12 Fixed warning in hist() with numpy 1.2 - MM
=================================================================
Modified: branches/v0_98_5_maint/lib/matplotlib/transforms.py
===================================================================
--- branches/v0_98_5_maint/lib/matplotlib/transforms.py 2008-12-15 06:26:18 UTC (rev 6607)
+++ branches/v0_98_5_maint/lib/matplotlib/transforms.py 2008-12-15 14:16:27 UTC (rev 6608)
@@ -120,8 +120,7 @@
root = stack.pop()
# Stop at subtrees that have already been invalidated
if root._invalid != value or root.pass_through:
- value |= root._invalid
- root._invalid = value
+ root._invalid = self.INVALID
stack.extend(root._parents.keys())
def set_children(self, *children):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2008-12-15 06:26:29
|
Revision: 6607
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6607&view=rev
Author: efiring
Date: 2008-12-15 06:26:18 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
In collections, keep track of whether edges or faces are colormapped.
Thanks to Eric Bruning for finding the problem and outlining the solution.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/collections.py
Modified: trunk/matplotlib/lib/matplotlib/collections.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/collections.py 2008-12-15 06:23:25 UTC (rev 6606)
+++ trunk/matplotlib/lib/matplotlib/collections.py 2008-12-15 06:26:18 UTC (rev 6607)
@@ -231,7 +231,7 @@
def get_pickradius(self): return self.pickradius
def set_urls(self, urls):
- if urls is None:
+ if urls is None:
self._urls = [None,]
else:
self._urls = urls
@@ -365,11 +365,19 @@
"""
Set the facecolor(s) of the collection. *c* can be a
matplotlib color arg (all patches have same color), or a
- sequence or rgba tuples; if it is a sequence the patches will
- cycle through the sequence
+ sequence of rgba tuples; if it is a sequence the patches will
+ cycle through the sequence.
+ If *c* is 'none', the patch will not be filled.
+
ACCEPTS: matplotlib color arg or sequence of rgba tuples
"""
+ self._is_filled = True
+ try:
+ if c.lower() == 'none':
+ self._is_filled = False
+ except AttributeError:
+ pass
if c is None: c = mpl.rcParams['patch.facecolor']
self._facecolors_original = c
self._facecolors = _colors.colorConverter.to_rgba_array(c, self._alpha)
@@ -393,14 +401,21 @@
"""
Set the edgecolor(s) of the collection. *c* can be a
matplotlib color arg (all patches have same color), or a
- sequence or rgba tuples; if it is a sequence the patches will
+ sequence of rgba tuples; if it is a sequence the patches will
cycle through the sequence.
If *c* is 'face', the edge color will always be the same as
- the face color.
+ the face color. If it is 'none', the patch boundary will not
+ be drawn.
ACCEPTS: matplotlib color arg or sequence of rgba tuples
"""
+ self._is_stroked = True
+ try:
+ if c.lower() == 'none':
+ self._is_stroked = False
+ except AttributeError:
+ pass
if c == 'face':
self._edgecolors = 'face'
self._edgecolors_original = 'face'
@@ -409,6 +424,7 @@
self._edgecolors_original = c
self._edgecolors = _colors.colorConverter.to_rgba_array(c, self._alpha)
+
def set_edgecolors(self, c):
"""alias for set_edgecolor"""
return self.set_edgecolor(c)
@@ -452,9 +468,9 @@
if self._A is None: return
if self._A.ndim > 1:
raise ValueError('Collections can only map rank 1 arrays')
- if len(self._facecolors):
+ if self._is_filled:
self._facecolors = self.to_rgba(self._A, self._alpha)
- else:
+ elif self._is_stroked:
self._edgecolors = self.to_rgba(self._A, self._alpha)
def update_from(self, other):
@@ -887,6 +903,7 @@
Collection.__init__(
self,
edgecolors=colors,
+ facecolors='none',
linewidths=linewidths,
linestyles=linestyles,
antialiaseds=antialiaseds,
@@ -897,7 +914,6 @@
pickradius=pickradius,
**kwargs)
- self.set_facecolors([])
self.set_segments(segments)
def get_paths(self):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2008-12-15 06:23:33
|
Revision: 6606
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6606&view=rev
Author: efiring
Date: 2008-12-15 06:23:25 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
Add orientation kwarg to docstring
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/colorbar.py
Modified: trunk/matplotlib/lib/matplotlib/colorbar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/colorbar.py 2008-12-15 03:22:17 UTC (rev 6605)
+++ trunk/matplotlib/lib/matplotlib/colorbar.py 2008-12-15 06:23:25 UTC (rev 6606)
@@ -32,15 +32,16 @@
make_axes_kw_doc = '''
- ========== ====================================================
- Property Description
- ========== ====================================================
- *fraction* 0.15; fraction of original axes to use for colorbar
- *pad* 0.05 if vertical, 0.15 if horizontal; fraction
- of original axes between colorbar and new image axes
- *shrink* 1.0; fraction by which to shrink the colorbar
- *aspect* 20; ratio of long to short dimensions
- ========== ====================================================
+ ============= ====================================================
+ Property Description
+ ============= ====================================================
+ *orientation* vertical or horizontal
+ *fraction* 0.15; fraction of original axes to use for colorbar
+ *pad* 0.05 if vertical, 0.15 if horizontal; fraction
+ of original axes between colorbar and new image axes
+ *shrink* 1.0; fraction by which to shrink the colorbar
+ *aspect* 20; ratio of long to short dimensions
+ ============= ====================================================
'''
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-12-15 03:22:24
|
Revision: 6605
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6605&view=rev
Author: jdh2358
Date: 2008-12-15 03:22:17 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
fixed a few doc bugs
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/gallery.html
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/users/intro.rst
Modified: trunk/matplotlib/doc/_templates/gallery.html
===================================================================
--- trunk/matplotlib/doc/_templates/gallery.html 2008-12-14 17:16:38 UTC (rev 6604)
+++ trunk/matplotlib/doc/_templates/gallery.html 2008-12-15 03:22:17 UTC (rev 6605)
@@ -169,6 +169,8 @@
<a href="examples/pylab_examples/customize_rc.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/customize_rc.png" border="0" alt="customize_rc"/></a>
+<a href="examples/pylab_examples/dannys_example.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dannys_example.png" border="0" alt="dannys_example"/></a>
+
<a href="examples/pylab_examples/dash_control.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dash_control.png" border="0" alt="dash_control"/></a>
<a href="examples/pylab_examples/dashpointlabel.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dashpointlabel.png" border="0" alt="dashpointlabel"/></a>
@@ -475,6 +477,8 @@
<a href="examples/pylab_examples/step_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/step_demo.png" border="0" alt="step_demo"/></a>
+<a href="examples/pylab_examples/stix_fonts_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/stix_fonts_demo.png" border="0" alt="stix_fonts_demo"/></a>
+
<a href="examples/pylab_examples/subplot_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_demo.png" border="0" alt="subplot_demo"/></a>
<a href="examples/pylab_examples/subplot_toolbar.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_toolbar_00.png" border="0" alt="subplot_toolbar"/></a>
@@ -487,6 +491,8 @@
<a href="examples/pylab_examples/table_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/table_demo.png" border="0" alt="table_demo"/></a>
+<a href="examples/pylab_examples/tex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/tex_demo.png" border="0" alt="tex_demo"/></a>
+
<a href="examples/pylab_examples/text_handles.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_handles.png" border="0" alt="text_handles"/></a>
<a href="examples/pylab_examples/text_rotation.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_rotation.png" border="0" alt="text_rotation"/></a>
@@ -503,6 +509,8 @@
<a href="examples/pylab_examples/unicode_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/unicode_demo.png" border="0" alt="unicode_demo"/></a>
+<a href="examples/pylab_examples/usetex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/usetex_demo.png" border="0" alt="usetex_demo"/></a>
+
<a href="examples/pylab_examples/vertical_ticklabels.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vertical_ticklabels.png" border="0" alt="vertical_ticklabels"/></a>
<a href="examples/pylab_examples/vline_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vline_demo.png" border="0" alt="vline_demo"/></a>
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2008-12-14 17:16:38 UTC (rev 6604)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2008-12-15 03:22:17 UTC (rev 6605)
@@ -1,11 +1,11 @@
<h3>Download</h3>
<p>Current version: <b>{{ version }}</b></p>
-<p>Download matplotlib from the sourceforge <a
-href="http://sourceforge.net/projects/matplotlib">project</a> page
-(but first take a look at the <a href="{{ pathto('users/installing')
-}}">installing</a> page). Here's a summary of <a href="{{
-pathto('users/whats_new') }}">what's new</a>. </p>
+<p>Download matplotlib from the
+sourceforge <a href="http://sourceforge.net/projects/matplotlib">project</a>
+page (but first take a look at the <a href="{{
+pathto('users/installing') }}">installing</a> page). Here's a summary
+of <a href="{{ pathto('users/whats_new') }}">what's new</a>. </p>
<p>There are several matplotlib addon <a href="{{
pathto('users/toolkits') }}">toolkits</a>, including the projection
Modified: trunk/matplotlib/doc/users/intro.rst
===================================================================
--- trunk/matplotlib/doc/users/intro.rst 2008-12-14 17:16:38 UTC (rev 6604)
+++ trunk/matplotlib/doc/users/intro.rst 2008-12-15 03:22:17 UTC (rev 6605)
@@ -2,11 +2,11 @@
============
matplotlib is a library for making 2D plots of arrays in `Python
-<http://www.python.org>`. Although it has its origins in emulating
-the `MATLAB™ <http://www.mathworks.com>` graphics commands, it is
+<http://www.python.org>`_. Although it has its origins in emulating
+the `MATLAB™ <http://www.mathworks.com>`_ graphics commands, it is
independent of MATLAB, and can be used in a Pythonic, object oriented
way. Although matplotlib is written primarily in pure Python, it
-makes heavy use of `NumPy <http://www.numpy.org>` and other extension
+makes heavy use of `NumPy <http://www.numpy.org>`_ and other extension
code to provide good performance even for large arrays.
matplotlib is designed with the philosophy that you should be able to
@@ -25,7 +25,7 @@
programming language, and decided to start over in Python. Python
more than makes up for all of MATLAB's deficiencies as a programming
language, but I was having difficulty finding a 2D plotting package
-(for 3D `VTK <http://www.vtk.org/>` more than exceeds all of my
+(for 3D `VTK <http://www.vtk.org/>`_ more than exceeds all of my
needs).
When I went searching for a Python plotting package, I had several
@@ -67,16 +67,16 @@
devices, aka renderers, that transform the frontend representation to
hardcopy or a display device (:ref:`what-is-a-backend`). Example
backends: PS creates `PostScript®
-<http://http://www.adobe.com/products/postscript/>` hardcopy, SVG
-creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`
+<http://http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
+creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`_
hardcopy, Agg creates PNG output using the high quality `Anti-Grain
-Geometry <http://www.antigrain.com>` library that ships with
-matplotlib, GTK embeds matplotlib in a `Gtk+ <http://www.gtk.org/>`
+Geometry <http://www.antigrain.com>`_ library that ships with
+matplotlib, GTK embeds matplotlib in a `Gtk+ <http://www.gtk.org/>`_
application, GTKAgg uses the Anti-Grain renderer to create a figure
and embed it a Gtk+ application, and so on for `PDF
-<http://www.adobe.com/products/acrobat/adobepdf.html>`, `WxWidgets
-<http://www.wxpython.org/>`, `Tkinter
-<http://docs.python.org/lib/module-Tkinter.html>` etc.
+<http://www.adobe.com/products/acrobat/adobepdf.html>`_, `WxWidgets
+<http://www.wxpython.org/>`_, `Tkinter
+<http://docs.python.org/lib/module-Tkinter.html>`_ etc.
matplotlib is used by many people in many different contexts. Some
people want to automatically generate PostScript files to send
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-12-14 17:16:41
|
Revision: 6604
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6604&view=rev
Author: jdh2358
Date: 2008-12-14 17:16:38 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
few changes to osx installer
Modified Paths:
--------------
trunk/matplotlib/release/osx/README.txt
Modified: trunk/matplotlib/release/osx/README.txt
===================================================================
--- trunk/matplotlib/release/osx/README.txt 2008-12-14 16:46:37 UTC (rev 6603)
+++ trunk/matplotlib/release/osx/README.txt 2008-12-14 17:16:38 UTC (rev 6604)
@@ -21,6 +21,13 @@
How to build
--------------
+* You need to make sure to unset PKG_CONFIG_PATH to make sure the
+ static linking below is respected. Otherwise the mpl build script
+ will dynamically link using the libs from pkgconfig if you have this
+ configured on your box::
+
+ unset PKG_CONFIG_PATH
+
* OPTIONAL: edit :file:`Makefile` so that the *VERSION variables point
to the latest zlib, png, freetype
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-12-14 16:46:40
|
Revision: 6603
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6603&view=rev
Author: jdh2358
Date: 2008-12-14 16:46:37 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
removed release tarball
Removed Paths:
-------------
trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
Deleted: trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2008-12-14 16:43:31
|
Revision: 6602
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6602&view=rev
Author: jdh2358
Date: 2008-12-14 16:43:20 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
added release dir
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/gallery.html
trunk/matplotlib/doc/devel/release_guide.rst
trunk/matplotlib/doc/users/mathtext.rst
trunk/matplotlib/examples/event_handling/path_editor.py
trunk/matplotlib/examples/pylab_examples/loadrec.py
trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
Added Paths:
-----------
trunk/matplotlib/release/
trunk/matplotlib/release/osx/
trunk/matplotlib/release/osx/Makefile
trunk/matplotlib/release/osx/README.txt
trunk/matplotlib/release/osx/data/
trunk/matplotlib/release/osx/data/bdist.patch
trunk/matplotlib/release/osx/data/setup.cfg
trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
Modified: trunk/matplotlib/doc/_templates/gallery.html
===================================================================
--- trunk/matplotlib/doc/_templates/gallery.html 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/doc/_templates/gallery.html 2008-12-14 16:43:20 UTC (rev 6602)
@@ -169,8 +169,6 @@
<a href="examples/pylab_examples/customize_rc.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/customize_rc.png" border="0" alt="customize_rc"/></a>
-<a href="examples/pylab_examples/dannys_example.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dannys_example.png" border="0" alt="dannys_example"/></a>
-
<a href="examples/pylab_examples/dash_control.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dash_control.png" border="0" alt="dash_control"/></a>
<a href="examples/pylab_examples/dashpointlabel.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/dashpointlabel.png" border="0" alt="dashpointlabel"/></a>
@@ -477,8 +475,6 @@
<a href="examples/pylab_examples/step_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/step_demo.png" border="0" alt="step_demo"/></a>
-<a href="examples/pylab_examples/stix_fonts_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/stix_fonts_demo.png" border="0" alt="stix_fonts_demo"/></a>
-
<a href="examples/pylab_examples/subplot_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_demo.png" border="0" alt="subplot_demo"/></a>
<a href="examples/pylab_examples/subplot_toolbar.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_toolbar_00.png" border="0" alt="subplot_toolbar"/></a>
@@ -491,8 +487,6 @@
<a href="examples/pylab_examples/table_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/table_demo.png" border="0" alt="table_demo"/></a>
-<a href="examples/pylab_examples/tex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/tex_demo.png" border="0" alt="tex_demo"/></a>
-
<a href="examples/pylab_examples/text_handles.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_handles.png" border="0" alt="text_handles"/></a>
<a href="examples/pylab_examples/text_rotation.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/text_rotation.png" border="0" alt="text_rotation"/></a>
@@ -509,8 +503,6 @@
<a href="examples/pylab_examples/unicode_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/unicode_demo.png" border="0" alt="unicode_demo"/></a>
-<a href="examples/pylab_examples/usetex_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/usetex_demo.png" border="0" alt="usetex_demo"/></a>
-
<a href="examples/pylab_examples/vertical_ticklabels.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vertical_ticklabels.png" border="0" alt="vertical_ticklabels"/></a>
<a href="examples/pylab_examples/vline_demo.html"><img src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/vline_demo.png" border="0" alt="vline_demo"/></a>
Modified: trunk/matplotlib/doc/devel/release_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/release_guide.rst 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/doc/devel/release_guide.rst 2008-12-14 16:43:20 UTC (rev 6602)
@@ -42,7 +42,12 @@
* unpack the sdist and make sure you can build from that directory
* Use :file:`setup.cfg` to set the default backends. For windows and
- OSX, the default backend should be TkAgg.
+ OSX, the default backend should be TkAgg. You should also turn on
+ or off any platform specific build options you need. Importantly,
+ you also need to make sure that you delete the :file:`build` dir
+ after any changes to file:`setup.cfg` before rebuilding since cruft
+ in the :file:`build` dir can get carried along. I will add this to
+ the devel release notes,
* on windows, unix2dos the rc file
Modified: trunk/matplotlib/doc/users/mathtext.rst
===================================================================
--- trunk/matplotlib/doc/users/mathtext.rst 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/doc/users/mathtext.rst 2008-12-14 16:43:20 UTC (rev 6602)
@@ -299,5 +299,8 @@
.. plot:: pyplots/pyplot_mathtext.py
:include-source:
+.. plot:: mpl_examples/pylab_examples/mathtext_examples.py
+
+
Modified: trunk/matplotlib/examples/event_handling/path_editor.py
===================================================================
--- trunk/matplotlib/examples/event_handling/path_editor.py 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/examples/event_handling/path_editor.py 2008-12-14 16:43:20 UTC (rev 6602)
@@ -1,5 +1,3 @@
-import matplotlib
-matplotlib.use('TkAgg')
import numpy as np
import matplotlib.path as mpath
import matplotlib.patches as mpatches
Modified: trunk/matplotlib/examples/pylab_examples/loadrec.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/loadrec.py 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/examples/pylab_examples/loadrec.py 2008-12-14 16:43:20 UTC (rev 6602)
@@ -11,6 +11,6 @@
fig.autofmt_xdate()
# if you have pyExcelerator installed, you can output excel
-#import mpl_toolkits.exceltools as exceltools
-#exceltools.rec2excel(a, 'test.xls', colnum=4)
+import mpl_toolkits.exceltools as exceltools
+exceltools.rec2excel(a, 'test.xls')
show()
Modified: trunk/matplotlib/examples/pylab_examples/mathtext_examples.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-12-13 19:01:00 UTC (rev 6601)
+++ trunk/matplotlib/examples/pylab_examples/mathtext_examples.py 2008-12-14 16:43:20 UTC (rev 6602)
@@ -49,11 +49,11 @@
r'$\widehat{abc}\widetilde{def}$',
r'$\Gamma \Delta \Theta \Lambda \Xi \Pi \Sigma \Upsilon \Phi \Psi \Omega$',
r'$\alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \lambda \mu \nu \xi \pi \kappa \rho \sigma \tau \upsilon \phi \chi \psi$',
- ur'Generic symbol: $\u23ce$',
+ #ur'Generic symbol: $\u23ce$',
]
-if sys.maxunicode > 0xffff:
- stests.append(ur'$\mathrm{\ue0f2 \U0001D538}$')
+#if sys.maxunicode > 0xffff:
+# stests.append(ur'$\mathrm{\ue0f2 \U0001D538}$')
from pylab import *
Added: trunk/matplotlib/release/osx/Makefile
===================================================================
--- trunk/matplotlib/release/osx/Makefile (rev 0)
+++ trunk/matplotlib/release/osx/Makefile 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,69 @@
+SRCDIR=${PWD}
+ZLIBVERSION=1.2.3
+PNGVERSION=1.2.33
+FREETYPEVERSION=2.3.7
+MPLVERSION=0.98.5
+MPLSRC=matplotlib-0.98.5
+MACOSX_DEPLOYMENT_TARGET=10.4
+
+## You shouldn't need to configure past this point
+CFLAGS="-Os -arch ppc -arch i386 -I${SRCDIR}/zlib-1.2.3 -I${SRCDIR}/libpng-1.2.33 -I${SRCDIR}/freetype-2.3.7/include"
+
+LDFLAGS="-arch ppc -arch i386 -L${SRCDIR}/zlib-1.2.3 -L${SRCDIR}/libpng-1.2.33 -L${SRCDIR}/freetype-2.3.7"
+
+CFLAGS_DEPS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+LDFLAGS_DEPS="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+
+clean:
+ rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
+ freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-0.4.3.tar.gz \
+ bdist_mpkg-0.4.3 \
+ zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
+ matplotlib-${MPLVERSION} *~
+
+fetch_deps:
+ wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
+ wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
+ wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
+ wget http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-0.4.3.tar.gz&&\
+ tar xvfz bdist_mpkg-0.4.3.tar.gz &&\
+ patch -p0 < data/bdist.patch
+ echo "You need to to install bdist_mpkg-0.4.3 now"
+
+
+
+zlib:
+ rm -rf zlib-${ZLIBVERSION} &&\
+ tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+ cd zlib-${ZLIBVERSION} &&\
+ ./configure &&\
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3
+
+png: zlib
+ rm -rf libpng-${PNGVERSION} &&\
+ tar xvfj libpng-${PNGVERSION}.tar.bz2
+ cd libpng-${PNGVERSION} &&\
+ ./configure --disable-dependency-tracking &&\
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 &&\
+ cp .libs/libpng.a .
+
+freetype: zlib
+ rm -rf ${FREETYPEVERSION} &&\
+ tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+ cd freetype-${FREETYPEVERSION} &&\
+ ./configure &&\
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 &&\
+ cp objs/.libs/libfreetype.a .
+
+dependencies:
+ make zlib png freetype
+
+installers:
+ tar xvfz matplotlib-${MPLVERSION}.tar.gz && \
+ cd ${MPLSRC} && \
+ rm -rf build && \
+ cp ../data/setup.cfg . &&\
+ CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} bdist_mpkg &&\
+ CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} python setupegg.py bdist_egg
+
+
Added: trunk/matplotlib/release/osx/README.txt
===================================================================
--- trunk/matplotlib/release/osx/README.txt (rev 0)
+++ trunk/matplotlib/release/osx/README.txt 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,50 @@
+Building binary releases of OS X
+
+Included here is everything to build a binay package installer for OS
+X
+
+Dir Contents
+-------------
+
+* :file:`bdist_mkpg` - the distutils.extension to build Installer.app
+ mpkg installers. It is patched from the tarball with
+ file:`data/bdist.patch` because 0.4.3 is broken on OS X 10.5.
+ Instructions on how to patch and install are below
+
+* :file:`data` - some config files and patches needed for the build
+
+* :file:`*.tar.gz` - the bdist_mkpg, zlib, png, freetype and mpl
+ tarballs
+
+* :file:`Makefile` - all the build commands
+
+How to build
+--------------
+
+* OPTIONAL: edit :file:`Makefile` so that the *VERSION variables point
+ to the latest zlib, png, freetype
+
+* First fetch all the dependencies and patch bdist_mpkg for OSX 10.5.
+ You can do this automatically in one step with::
+
+ make fetch_deps
+
+* install the patched bdist_mpkg, that the fetch_deps step just created::
+
+ cd bdist_mpkg-0.4.3
+ sudo python setup.py install
+
+* build the dependencies::
+
+ make dependencies
+
+* copy over the latest mpl *.tar.gz tarball to this directory, update
+ the MPLVERSION in the Makefile::
+
+ cp /path/to/mpl/matplotlib.0.98.5.tar.gz .
+
+* build the mkpg binary and egg
+
+ make installers
+
+ The mpkg and egg binaries will reside in :file:`matplotlib-VERSION/dist`
Added: trunk/matplotlib/release/osx/data/bdist.patch
===================================================================
--- trunk/matplotlib/release/osx/data/bdist.patch (rev 0)
+++ trunk/matplotlib/release/osx/data/bdist.patch 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,25 @@
+diff -rNu bdist_mpkg-0.4.3/bdist_mpkg/tools.py bdist_mpkg-0.4.3.leopard/bdist_mpkg/tools.py
+--- bdist_mpkg-0.4.3/bdist_mpkg/tools.py 2006-07-09 00:39:00.000000000 -0400
++++ bdist_mpkg-0.4.3.leopard/bdist_mpkg/tools.py 2008-08-21 07:43:35.000000000 -0400
+@@ -79,15 +79,12 @@
+ yield os.path.join(root, fn)
+
+ def get_gid(name, _cache={}):
+- if not _cache:
+- for line in os.popen('/usr/bin/nidump group .'):
+- fields = line.split(':')
+- if len(fields) >= 3:
+- _cache[fields[0]] = int(fields[2])
+- try:
+- return _cache[name]
+- except KeyError:
+- raise ValueError('group %s not found' % (name,))
++ for line in os.popen("dscl . -read /Groups/" + name + " PrimaryGroupID"):
++ fields = [f.strip() for f in line.split(':')]
++ if fields[0] == "PrimaryGroupID":
++ return fields[1]
++
++ raise ValueError('group %s not found' % (name,))
+
+ def find_root(path, base='/'):
+ """
Added: trunk/matplotlib/release/osx/data/setup.cfg
===================================================================
--- trunk/matplotlib/release/osx/data/setup.cfg (rev 0)
+++ trunk/matplotlib/release/osx/data/setup.cfg 2008-12-14 16:43:20 UTC (rev 6602)
@@ -0,0 +1,78 @@
+# Rename this file to setup.cfg to modify matplotlib's
+# build options.
+
+[egg_info]
+tag_svn_revision = 1
+
+[status]
+# To suppress display of the dependencies and their versions
+# at the top of the build log, uncomment the following line:
+#suppress = True
+#
+# Uncomment to insert lots of diagnostic prints in extension code
+#verbose = True
+
+[provide_packages]
+# By default, matplotlib checks for a few dependencies and
+# installs them if missing. This feature can be turned off
+# by uncommenting the following lines. Acceptible values are:
+# True: install, overwrite an existing installation
+# False: do not install
+# auto: install only if the package is unavailable. This
+# is the default behavior
+#
+## Date/timezone support:
+pytz = True
+dateutil = True
+
+[gui_support]
+# Matplotlib supports multiple GUI toolkits, including Cocoa,
+# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
+# these toolkits requires AGG, the Anti-Grain Geometry library,
+# which is provided by matplotlib and built by default.
+#
+# Some backends are written in pure Python, and others require
+# extension code to be compiled. By default, matplotlib checks
+# for these GUI toolkits during installation and, if present,
+# compiles the required extensions to support the toolkit. GTK
+# support requires the GTK runtime environment and PyGTK. Wx
+# support requires wxWidgets and wxPython. Tk support requires
+# Tk and Tkinter. The other GUI toolkits do not require any
+# extension code, and can be used as long as the libraries are
+# installed on your system.
+#
+# You can uncomment any the following lines if you know you do
+# not want to use the GUI toolkit. Acceptible values are:
+# True: build the extension. Exits with a warning if the
+# required dependencies are not available
+# False: do not build the extension
+# auto: build if the required dependencies are available,
+# otherwise skip silently. This is the default
+# behavior
+#
+#gtk = False
+#gtkagg = False
+#tkagg = False
+#wxagg = False
+#macosx = False
+
+[rc_options]
+# User-configurable options
+#
+# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
+# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
+#
+# The Agg, Ps, Pdf and SVG backends do not require external
+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
+# if you have disabled the relevent extension modules. Agg will be used
+# by default.
+#
+backend = TkAgg
+#
+# The numerix module was historically used to provide
+# compatibility between the Numeric, numarray, and NumPy array
+# packages. Now that NumPy has emerge as the universal array
+# package for python, numerix is not really necessary and is
+# maintained to provide backward compatibility. Do not change
+# this unless you have a compelling reason to do so.
+#numerix = numpy
Added: trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/release/osx/matplotlib-0.98.5.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-12-13 19:01:05
|
Revision: 6601
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6601&view=rev
Author: jswhit
Date: 2008-12-13 19:01:00 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
update entry
Modified Paths:
--------------
trunk/toolkits/basemap/Changelog
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog 2008-12-13 18:03:10 UTC (rev 6600)
+++ trunk/toolkits/basemap/Changelog 2008-12-13 19:01:00 UTC (rev 6601)
@@ -5,7 +5,8 @@
can be iterated over to remove them from the plot.
* fillcontinents was returning just last Polygon instance.
Now returns a list of all Polygon instances.
- * bluemarble: pass kwargs to imshow, return Image instance.
+ * bluemarble/warpimage: pass kwargs to imshow,
+ return Image instance.
version 0.99.2 (svn revision 6541)
* fix drawlsmask method so that it works for cylindrical
projections with limits outside (-180,180).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-12-13 18:03:13
|
Revision: 6600
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6600&view=rev
Author: jswhit
Date: 2008-12-13 18:03:10 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
append LineCollection tuple to readshapefile return tuple.
Modified Paths:
--------------
trunk/toolkits/basemap/Changelog
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog 2008-12-13 17:45:00 UTC (rev 6599)
+++ trunk/toolkits/basemap/Changelog 2008-12-13 18:03:10 UTC (rev 6600)
@@ -1,4 +1,6 @@
version 0.99.3 (not yet released)
+ * if readshapefile is called with drawbounds=True, a
+ LineCollection object is appended to the returned tuple.
* make sure drawmapscale method returns a list of objects that
can be iterated over to remove them from the plot.
* fillcontinents was returning just last Polygon instance.
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 17:45:00 UTC (rev 6599)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 18:03:10 UTC (rev 6600)
@@ -1586,7 +1586,8 @@
the SHPT* constants defined in the shapelib module, see
http://shapelib.maptools.org/shp_api.html) and min and
max are 4-element lists with the minimum and maximum values of the
- vertices.
+ vertices. If ``drawbounds=True`` a
+ matplotlib.patches.LineCollection object is appended to the tuple.
"""
# open shapefile, read vertices for each object, convert
# to map projection coordinates (only works for 2D shape types).
@@ -1664,6 +1665,7 @@
ax.add_collection(lines)
# set axes limits to fit map region.
self.set_axes_limits(ax=ax)
+ info = info + (lines,)
# save segments/polygons and shape attribute dicts as class attributes.
self.__dict__[name]=shpsegs
self.__dict__[name+'_info']=shpinfo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-12-13 17:45:05
|
Revision: 6599
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6599&view=rev
Author: jswhit
Date: 2008-12-13 17:45:00 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
docstring update.
Modified Paths:
--------------
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 15:11:57 UTC (rev 6598)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 17:45:00 UTC (rev 6599)
@@ -2185,7 +2185,9 @@
Extra keyword ``ax`` can be used to override the default axis instance.
- Other \**kwargs passed on to matplotlib.patches.Polygon."""
+ Other \**kwargs passed on to matplotlib.patches.Polygon.
+
+ returns a matplotlib.patches.Polygon object."""
if not kwargs.has_key('ax') and self.ax is None:
try:
ax = plt.gca()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-12-13 15:12:00
|
Revision: 6598
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6598&view=rev
Author: jswhit
Date: 2008-12-13 15:11:57 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
make sure drawmapscale returns a list of plot objects.
Modified Paths:
--------------
trunk/toolkits/basemap/Changelog
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog 2008-12-13 14:46:30 UTC (rev 6597)
+++ trunk/toolkits/basemap/Changelog 2008-12-13 15:11:57 UTC (rev 6598)
@@ -1,4 +1,6 @@
version 0.99.3 (not yet released)
+ * make sure drawmapscale method returns a list of objects that
+ can be iterated over to remove them from the plot.
* fillcontinents was returning just last Polygon instance.
Now returns a list of all Polygon instances.
* bluemarble: pass kwargs to imshow, return Image instance.
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 14:46:30 UTC (rev 6597)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 15:11:57 UTC (rev 6598)
@@ -3043,6 +3043,8 @@
is used.
Extra keyword ``ax`` can be used to override the default axis instance.
+
+ returns a matplotlib.image.AxesImage instance.
"""
# convert land and ocean colors to integer rgba tuples with
# values between 0 and 255.
@@ -3162,7 +3164,7 @@
\**kwargs passed on to :meth:`imshow`.
- returns an matplotlib.image.AxesImage instance.
+ returns a matplotlib.image.AxesImage instance.
"""
if ax is not None:
return self.warpimage(image='bluemarble',ax=ax,scale=scale,**kwargs)
@@ -3191,7 +3193,7 @@
\**kwargs passed on to :meth:`imshow`.
- returns an matplotlib.image.AxesImage instance.
+ returns a matplotlib.image.AxesImage instance.
"""
try:
from PIL import Image
@@ -3433,6 +3435,7 @@
raise KeyError("labelstyle must be 'simple' or 'fancy'")
# default y offset is 2 percent of map height.
if yoffset is None: yoffset = 0.02*(self.ymax-self.ymin)
+ rets = [] # will hold all plot objects generated.
# 'fancy' style
if barstyle == 'fancy':
#we need 5 sets of x coordinates (in map units)
@@ -3449,62 +3452,63 @@
ybottom = yc-yoffset/2
ytick = ybottom - yoffset/2
ytext = ytick - yoffset/2
- self.plot([x1,x4],[ytop,ytop],color=fontcolor)
+ rets.append(self.plot([x1,x4],[ytop,ytop],color=fontcolor)[0])
#plot bottom line
- self.plot([x1,x4],[ybottom,ybottom],color=fontcolor)
+ rets.append(self.plot([x1,x4],[ybottom,ybottom],color=fontcolor)[0])
#plot left edge
- self.plot([x1,x1],[ybottom,ytop],color=fontcolor)
+ rets.append(self.plot([x1,x1],[ybottom,ytop],color=fontcolor)[0])
#plot right edge
- self.plot([x4,x4],[ybottom,ytop],color=fontcolor)
+ rets.append(self.plot([x4,x4],[ybottom,ytop],color=fontcolor)[0])
#make a filled black box from left edge to 1/4 way across
- ax.fill([x1,x2,x2,x1,x1],[ytop,ytop,ybottom,ybottom,ytop],\
- ec=fontcolor,fc=fillcolor1)
+ rets.append(ax.fill([x1,x2,x2,x1,x1],[ytop,ytop,ybottom,ybottom,ytop],\
+ ec=fontcolor,fc=fillcolor1)[0])
#make a filled white box from 1/4 way across to 1/2 way across
- ax.fill([x2,xc,xc,x2,x2],[ytop,ytop,ybottom,ybottom,ytop],\
- ec=fontcolor,fc=fillcolor2)
+ rets.append(ax.fill([x2,xc,xc,x2,x2],[ytop,ytop,ybottom,ybottom,ytop],\
+ ec=fontcolor,fc=fillcolor2)[0])
#make a filled white box from 1/2 way across to 3/4 way across
- ax.fill([xc,x3,x3,xc,xc],[ytop,ytop,ybottom,ybottom,ytop],\
- ec=fontcolor,fc=fillcolor1)
+ rets.append(ax.fill([xc,x3,x3,xc,xc],[ytop,ytop,ybottom,ybottom,ytop],\
+ ec=fontcolor,fc=fillcolor1)[0])
#make a filled white box from 3/4 way across to end
- ax.fill([x3,x4,x4,x3,x3],[ytop,ytop,ybottom,ybottom,ytop],\
- ec=fontcolor,fc=fillcolor2)
+ rets.append(ax.fill([x3,x4,x4,x3,x3],[ytop,ytop,ybottom,ybottom,ytop],\
+ ec=fontcolor,fc=fillcolor2)[0])
#plot 3 tick marks at left edge, center, and right edge
- self.plot([x1,x1],[ytick,ybottom],color=fontcolor)
- self.plot([xc,xc],[ytick,ybottom],color=fontcolor)
- self.plot([x4,x4],[ytick,ybottom],color=fontcolor)
+ rets.append(self.plot([x1,x1],[ytick,ybottom],color=fontcolor)[0])
+ rets.append(self.plot([xc,xc],[ytick,ybottom],color=fontcolor)[0])
+ rets.append(self.plot([x4,x4],[ytick,ybottom],color=fontcolor)[0])
#label 3 tick marks
- ax.text(x1,ytext,'%d' % (0),\
+ rets.append(ax.text(x1,ytext,'%d' % (0),\
horizontalalignment='center',\
verticalalignment='top',\
- fontsize=fontsize,color=fontcolor)
- ax.text(xc,ytext,'%d' % (0.5*lenlab),\
+ fontsize=fontsize,color=fontcolor))
+ rets.append(ax.text(xc,ytext,'%d' % (0.5*lenlab),\
horizontalalignment='center',\
verticalalignment='top',\
- fontsize=fontsize,color=fontcolor)
- ax.text(x4,ytext,'%d' % (lenlab),\
+ fontsize=fontsize,color=fontcolor))
+ rets.append(ax.text(x4,ytext,'%d' % (lenlab),\
horizontalalignment='center',\
verticalalignment='top',\
- fontsize=fontsize,color=fontcolor)
+ fontsize=fontsize,color=fontcolor))
#put units, scale factor on top
- ax.text(xc,ytop+yoffset/2,labelstr,\
+ rets.append(ax.text(xc,ytop+yoffset/2,labelstr,\
horizontalalignment='center',\
verticalalignment='bottom',\
- fontsize=fontsize,color=fontcolor)
+ fontsize=fontsize,color=fontcolor))
# 'simple' style
elif barstyle == 'simple':
- self.plot([x1,x4],[yc,yc],color=fontcolor)
- self.plot([x1,x1],[yc-yoffset,yc+yoffset],color=fontcolor)
- self.plot([x4,x4],[yc-yoffset,yc+yoffset],color=fontcolor)
- ax.text(xc,yc-yoffset,'%d' % lenlab,\
+ rets.append(self.plot([x1,x4],[yc,yc],color=fontcolor)[0])
+ rets.append(self.plot([x1,x1],[yc-yoffset,yc+yoffset],color=fontcolor)[0])
+ rets.append(self.plot([x4,x4],[yc-yoffset,yc+yoffset],color=fontcolor)[0])
+ rets.append(ax.text(xc,yc-yoffset,'%d' % lenlab,\
verticalalignment='top',horizontalalignment='center',\
- fontsize=fontsize,color=fontcolor)
+ fontsize=fontsize,color=fontcolor))
#put units, scale factor on top
- ax.text(xc,yc+yoffset,labelstr,\
+ rets.append(ax.text(xc,yc+yoffset,labelstr,\
horizontalalignment='center',\
verticalalignment='bottom',\
- fontsize=fontsize,color=fontcolor)
+ fontsize=fontsize,color=fontcolor))
else:
raise KeyError("barstyle must be 'simple' or 'fancy'")
+ return rets
### End of Basemap class
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-12-13 14:46:33
|
Revision: 6597
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6597&view=rev
Author: jswhit
Date: 2008-12-13 14:46:30 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
update docstrings.
Modified Paths:
--------------
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 14:43:02 UTC (rev 6596)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 14:46:30 UTC (rev 6597)
@@ -1289,7 +1289,7 @@
After filling continents, lakes are re-filled with
axis background color.
- returns matplotlib.patches.Polygon object.
+ returns a list of matplotlib.patches.Polygon objects.
"""
if self.resolution is None:
raise AttributeError, 'there are no boundary datasets associated with this Basemap instance'
@@ -2632,6 +2632,8 @@
Extra keyword ``ax`` can be used to override the default axis instance.
Other \**kwargs passed on to matplotlib.pyplot.plot.
+
+ returns an matplotlib.image.AxesImage instance.
"""
if not kwargs.has_key('ax') and self.ax is None:
try:
@@ -3159,6 +3161,8 @@
to downsample the image (``scale=0.5`` downsamples to 2700x1350).
\**kwargs passed on to :meth:`imshow`.
+
+ returns an matplotlib.image.AxesImage instance.
"""
if ax is not None:
return self.warpimage(image='bluemarble',ax=ax,scale=scale,**kwargs)
@@ -3186,6 +3190,8 @@
Extra keyword ``ax`` can be used to override the default axis instance.
\**kwargs passed on to :meth:`imshow`.
+
+ returns an matplotlib.image.AxesImage instance.
"""
try:
from PIL import Image
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-12-13 14:43:06
|
Revision: 6596
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6596&view=rev
Author: jswhit
Date: 2008-12-13 14:43:02 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
make sure fillcontinents returns a list of *all* Polygon instances
(not just the last one).
Modified Paths:
--------------
trunk/toolkits/basemap/Changelog
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog 2008-12-13 06:20:28 UTC (rev 6595)
+++ trunk/toolkits/basemap/Changelog 2008-12-13 14:43:02 UTC (rev 6596)
@@ -1,4 +1,6 @@
version 0.99.3 (not yet released)
+ * fillcontinents was returning just last Polygon instance.
+ Now returns a list of all Polygon instances.
* bluemarble: pass kwargs to imshow, return Image instance.
version 0.99.2 (svn revision 6541)
* fix drawlsmask method so that it works for cylindrical
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 06:20:28 UTC (rev 6595)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-13 14:43:02 UTC (rev 6596)
@@ -1305,6 +1305,7 @@
# get axis background color.
axisbgc = ax.get_axis_bgcolor()
npoly = 0
+ polys = []
for x,y in self.coastpolygons:
xa = np.array(x,np.float32)
ya = np.array(y,np.float32)
@@ -1334,10 +1335,11 @@
if zorder is not None:
poly.set_zorder(zorder)
ax.add_patch(poly)
+ polys.append(poly)
npoly = npoly + 1
# set axes limits to fit map region.
self.set_axes_limits(ax=ax)
- return poly
+ return polys
def drawcoastlines(self,linewidth=1.,color='k',antialiased=1,ax=None,zorder=None):
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2008-12-13 06:20:38
|
Revision: 6595
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6595&view=rev
Author: efiring
Date: 2008-12-13 06:20:28 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
Start eliminating obsolete and temporary rcParams key, numerix.npyma module
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/config/mplconfig.py
trunk/matplotlib/lib/matplotlib/config/rcsetup.py
trunk/matplotlib/lib/matplotlib/numerix/__init__.py
trunk/matplotlib/lib/matplotlib/numerix/ma/__init__.py
trunk/matplotlib/lib/matplotlib/numerix/npyma/__init__.py
trunk/matplotlib/lib/matplotlib/rcsetup.py
trunk/matplotlib/matplotlibrc.template
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/CHANGELOG 2008-12-13 06:20:28 UTC (rev 6595)
@@ -1,3 +1,7 @@
+2008-12-12 Preparations to eliminate maskedarray rcParams key: its
+ use will now generate a warning. Similarly, importing
+ the obsolote numerix.npyma will generate a warning. - EF
+
2008-12-12 Added support for the numpy.histogram() weights parameter
to the axes hist() method. Docs taken from numpy - MM
@@ -5,7 +9,7 @@
2008-12-12 Removed external packages: configobj and enthought.traits
which are only required by the experimental traited config
- and are somewhat out of date. If needed, install them
+ and are somewhat out of date. If needed, install them
independently, see:
http://code.enthought.com/projects/traits
Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2008-12-13 06:20:28 UTC (rev 6595)
@@ -59,7 +59,6 @@
timezone = T.Trait('UTC', pytz.all_timezones)
datapath = T.Trait(cutils.get_data_path())
numerix = T.Trait('numpy', 'numpy', 'numeric', 'numarray')
- maskedarray = T.false
units = T.false
class backend(TConfig):
@@ -290,7 +289,6 @@
'backend' : (self.tconfig.backend, 'use'),
'backend_fallback' : (self.tconfig.backend, 'fallback'),
'numerix' : (self.tconfig, 'numerix'),
- 'maskedarray' : (self.tconfig, 'maskedarray'),
'toolbar' : (self.tconfig, 'toolbar'),
'datapath' : (self.tconfig, 'datapath'),
'units' : (self.tconfig, 'units'),
Modified: trunk/matplotlib/lib/matplotlib/config/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/rcsetup.py 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/lib/matplotlib/config/rcsetup.py 2008-12-13 06:20:28 UTC (rev 6595)
@@ -296,7 +296,6 @@
defaultParams = {
'backend' : ['WXAgg', validate_backend],
'numerix' : ['numpy', validate_numerix],
- 'maskedarray' : [False, validate_bool],
'toolbar' : ['toolbar2', validate_toolbar],
'datapath' : [None, validate_path_exists], # handled by _get_data_path_cached
'units' : [False, validate_bool],
Modified: trunk/matplotlib/lib/matplotlib/numerix/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/numerix/__init__.py 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/lib/matplotlib/numerix/__init__.py 2008-12-13 06:20:28 UTC (rev 6595)
@@ -20,7 +20,6 @@
from matplotlib import rcParams, verbose
which = None, None
-use_maskedarray = None
# First, see if --numarray or --Numeric was specified on the command
# line:
@@ -31,10 +30,6 @@
"--NumPy", "--numpy", "--NUMPY", "--Numpy",
]:
which = a[2:], "command line"
- if a == "--maskedarray":
- use_maskedarray = True
- if a == "--ma":
- use_maskedarray = False
try: del a
except NameError: pass
@@ -45,11 +40,6 @@
except KeyError:
pass
-if use_maskedarray is None:
- try:
- use_maskedarray = rcParams['maskedarray']
- except KeyError:
- use_maskedarray = False
# If all the above fail, default to Numeric. Most likely not used.
if which[0] is None:
Modified: trunk/matplotlib/lib/matplotlib/numerix/ma/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/numerix/ma/__init__.py 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/lib/matplotlib/numerix/ma/__init__.py 2008-12-13 06:20:28 UTC (rev 6595)
@@ -1,4 +1,4 @@
-from matplotlib.numerix import which, use_maskedarray
+from matplotlib.numerix import which
if which[0] == "numarray":
from numarray.ma import *
@@ -9,15 +9,10 @@
nomask = None
getmaskorNone = getmask
elif which[0] == "numpy":
- if use_maskedarray:
- from maskedarray import *
- print "using maskedarray"
- else:
- try:
- from numpy.ma import * # numpy 1.05 and later
- except ImportError:
- from numpy.core.ma import * # earlier
- #print "using ma"
+ try:
+ from numpy.ma import * # numpy 1.05 and later
+ except ImportError:
+ from numpy.core.ma import * # earlier
def getmaskorNone(obj):
_msk = getmask(obj)
if _msk is nomask:
Modified: trunk/matplotlib/lib/matplotlib/numerix/npyma/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/numerix/npyma/__init__.py 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/lib/matplotlib/numerix/npyma/__init__.py 2008-12-13 06:20:28 UTC (rev 6595)
@@ -1,11 +1,7 @@
-from matplotlib.numerix import use_maskedarray
+import warnings
-if use_maskedarray:
- from maskedarray import *
- print "using maskedarray"
-else:
- try:
- from numpy.ma import * # numpy 1.05 and later
- except ImportError:
- from numpy.core.ma import * # earlier
- #print "using ma"
+warnings.warn("npyma is obsolete and will be removed", DeprecationWarning)
+try:
+ from numpy.ma import * # numpy 1.05 and later
+except ImportError:
+ from numpy.core.ma import * # earlier
Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py 2008-12-13 06:20:28 UTC (rev 6595)
@@ -118,6 +118,16 @@
if v:
warnings.warn("figure.autolayout is not currently supported")
+def validate_maskedarray(v):
+ # 2008/12/12: start warning; later, remove all traces of maskedarray
+ try:
+ if v == 'obsolete':
+ return v
+ except ValueError:
+ pass
+ warnings.warn('rcParams key "maskedarray" is obsolete and has no effect;\n'
+ ' please delete it from your matplotlibrc file')
+
class validate_nseq_float:
def __init__(self, n):
self.n = n
@@ -311,7 +321,7 @@
'backend' : ['Agg', validate_backend], # agg is certainly present
'backend_fallback' : [True, validate_bool], # agg is certainly present
'numerix' : ['numpy', validate_numerix],
- 'maskedarray' : [False, validate_bool],
+ 'maskedarray' : ['obsolete', validate_maskedarray], #to be removed
'toolbar' : ['toolbar2', validate_toolbar],
'datapath' : [None, validate_path_exists], # handled by _get_data_path_cached
'units' : [False, validate_bool],
Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template 2008-12-12 21:22:04 UTC (rev 6594)
+++ trunk/matplotlib/matplotlibrc.template 2008-12-13 06:20:28 UTC (rev 6595)
@@ -35,9 +35,6 @@
# you if backend_fallback is True
#backend_fallback: True
numerix : %(numerix)s # numpy, Numeric or numarray
-#maskedarray : False # True to use external maskedarray module
- # instead of numpy.ma; this is a temporary
- # setting for testing maskedarray.
#interactive : False # see http://matplotlib.sourceforge.net/interactive.html
#toolbar : toolbar2 # None | classic | toolbar2
#timezone : UTC # a pytz timezone string, eg US/Central or Europe/Paris
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-12-12 21:22:07
|
Revision: 6594
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6594&view=rev
Author: mdboom
Date: 2008-12-12 21:22:04 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
Fix numerous documentation warnings.
Modified Paths:
--------------
trunk/matplotlib/doc/api/font_manager_api.rst
trunk/matplotlib/doc/faq/howto_faq.rst
trunk/matplotlib/doc/users/event_handling.rst
trunk/matplotlib/lib/matplotlib/artist.py
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/collections.py
trunk/matplotlib/lib/matplotlib/colors.py
trunk/matplotlib/lib/matplotlib/lines.py
trunk/matplotlib/lib/matplotlib/mlab.py
trunk/matplotlib/lib/matplotlib/patches.py
trunk/matplotlib/lib/matplotlib/path.py
trunk/matplotlib/lib/matplotlib/pyplot.py
trunk/matplotlib/lib/matplotlib/text.py
trunk/matplotlib/lib/matplotlib/ticker.py
Modified: trunk/matplotlib/doc/api/font_manager_api.rst
===================================================================
--- trunk/matplotlib/doc/api/font_manager_api.rst 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/doc/api/font_manager_api.rst 2008-12-12 21:22:04 UTC (rev 6594)
@@ -11,7 +11,7 @@
:show-inheritance:
:mod:`matplotlib.fontconfig_pattern`
-==============================
+====================================
.. automodule:: matplotlib.fontconfig_pattern
:members:
Modified: trunk/matplotlib/doc/faq/howto_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/howto_faq.rst 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/doc/faq/howto_faq.rst 2008-12-12 21:22:04 UTC (rev 6594)
@@ -428,8 +428,10 @@
.. seealso::
:ref:`howto-webapp`
+ For information about running matplotlib inside of a web
+ application.
-.. _howto-show
+.. _howto-show:
Use :func:`~matplotlib.pyplot.show`
------------------------------------------
Modified: trunk/matplotlib/doc/users/event_handling.rst
===================================================================
--- trunk/matplotlib/doc/users/event_handling.rst 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/doc/users/event_handling.rst 2008-12-12 21:22:04 UTC (rev 6594)
@@ -64,8 +64,8 @@
'scroll_event' :class:`~matplotlib.backend_bases.MouseEvent` - mouse scroll wheel is rolled
'figure_enter_event' :class:`~matplotlib.backend_bases.LocationEvent` - mouse enters a new figure
'figure_leave_event' :class:`~matplotlib.backend_bases.LocationEvent` - mouse leaves a figure
-'axes_enter_event' :class:`~matplotlib.backend_bases.LocationEvent` - mouse enters a new axes
-'axes_leave_event' :class:`~matplotlib.backend_bases.LocationEvent` - mouse leaves an axes
+'axes_enter_event' :class:`~matplotlib.backend_bases.LocationEvent` - mouse enters a new axes
+'axes_leave_event' :class:`~matplotlib.backend_bases.LocationEvent` - mouse leaves an axes
======================= ======================================================================================
.. _event-attributes:
Modified: trunk/matplotlib/lib/matplotlib/artist.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/artist.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/artist.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -144,7 +144,10 @@
Remove a callback based on its *id*.
.. seealso::
+
:meth:`add_callback`
+ For adding callbacks
+
"""
try: del self._propobservers[oid]
except KeyError: pass
@@ -497,7 +500,7 @@
def set_alpha(self, alpha):
"""
Set the alpha value used for blending - not supported on
- all backends
+ all backends.
ACCEPTS: float (0.0 transparent through 1.0 opaque)
"""
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -43,8 +43,9 @@
* 'r--': red dashed lines
.. seealso::
+
:func:`~matplotlib.Line2D.lineStyles` and
- :func:`~matplotlib.pyplot.colors`:
+ :func:`~matplotlib.pyplot.colors`
for all possible styles and color format string.
"""
@@ -2574,7 +2575,8 @@
ACCEPTS: str
.. seealso::
- :meth:`text`:
+
+ :meth:`text`
for information on how override and the optional args work
"""
default = {
@@ -2610,7 +2612,8 @@
ACCEPTS: str
.. seealso::
- :meth:`text`:
+
+ :meth:`text`
for information on how override and the optional args work
"""
@@ -2641,7 +2644,8 @@
ACCEPTS: str
.. seealso::
- :meth:`text`:
+
+ :meth:`text`
for information on how override and the optional args work
"""
label = self.yaxis.get_label()
@@ -2794,7 +2798,8 @@
%(Line2D)s
.. seealso::
- :meth:`axhspan`:
+
+ :meth:`axhspan`
for example plot and source code
"""
@@ -2853,7 +2858,8 @@
%(Line2D)s
.. seealso::
- :meth:`axhspan`:
+
+ :meth:`axhspan`
for example plot and source code
"""
@@ -2964,7 +2970,8 @@
%(Polygon)s
.. seealso::
- :meth:`axhspan`:
+
+ :meth:`axhspan`
for example plot and source code
"""
trans = mtransforms.blended_transform_factory(
@@ -3331,12 +3338,13 @@
%(Line2D)s
.. seealso::
- :mod:`~matplotlib.dates`:
+
+ :mod:`~matplotlib.dates`
for helper functions
:func:`~matplotlib.dates.date2num`,
:func:`~matplotlib.dates.num2date` and
- :func:`~matplotlib.dates.drange`:
+ :func:`~matplotlib.dates.drange`
for help on creating the required floating point
dates.
"""
@@ -3439,7 +3447,8 @@
%(Line2D)s
.. seealso::
- :meth:`loglog`:
+
+ :meth:`loglog`
For example code and figure
"""
if not self._hold: self.cla()
@@ -3484,7 +3493,8 @@
%(Line2D)s
.. seealso::
- :meth:`loglog`:
+
+ :meth:`loglog`
For example code and figure
"""
if not self._hold: self.cla()
@@ -3546,9 +3556,10 @@
- *b* is the *x*-axis.
.. seealso::
+
:meth:`~matplotlib.axes.Axes.plot` or
- :meth:`~matplotlib.axes.Axes.vlines`: For documentation on
- valid kwargs.
+ :meth:`~matplotlib.axes.Axes.vlines`
+ For documentation on valid kwargs.
**Example:**
@@ -4249,11 +4260,13 @@
*baseline*).
.. seealso::
- `this document`__ for details
- :file:`examples/pylab_examples/stem_plot.py`:
- for a demo
+ `this document`__
+ for details
+ :file:`examples/pylab_examples/stem_plot.py`
+ for a demo
+
__ http://www.mathworks.com/access/helpdesk/help/techdoc/ref/stem.html
"""
@@ -5594,7 +5607,7 @@
%(PolyCollection)s
- .. plot:: mpl_examples/pylab_examples/fill_between.py
+ .. plot:: mpl_examples/pylab_examples/fill_between.py
"""
# Handle united data, such as dates
self._process_unit_info(xdata=x, ydata=y1, kwargs=kwargs)
@@ -6093,7 +6106,8 @@
%(QuadMesh)s
.. seealso::
- :func:`~matplotlib.pyplot.pcolor`:
+
+ :func:`~matplotlib.pyplot.pcolor`
For an explanation of the grid orientation and the
expansion of 1-D *X* and/or *Y* to 2-D arrays.
"""
@@ -6424,7 +6438,7 @@
def hist(self, x, bins=10, range=None, normed=False, weights=None,
cumulative=False, bottom=None, histtype='bar', align='mid',
- orientation='vertical', rwidth=None, log=False,
+ orientation='vertical', rwidth=None, log=False,
**kwargs):
"""
call signature::
@@ -6896,6 +6910,7 @@
.. plot:: mpl_examples/pylab_examples/csd_demo.py
.. seealso:
+
:meth:`psd`
For a description of the optional parameters.
"""
@@ -7093,7 +7108,9 @@
* *alpha*
.. seealso::
+
:func:`~matplotlib.pyplot.imshow`
+ For image options.
For controlling colors, e.g. cyan background and red marks,
use::
@@ -7114,7 +7131,9 @@
* ',' pixel
.. seealso::
+
:func:`~matplotlib.pyplot.plot`
+ For plotting options
"""
if precision is None:
precision = 0
Modified: trunk/matplotlib/lib/matplotlib/collections.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/collections.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/collections.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -354,7 +354,9 @@
ACCEPTS: matplotlib color arg or sequence of rgba tuples
.. seealso::
+
:meth:`set_facecolor`, :meth:`set_edgecolor`
+ For setting the edge or face color individually.
"""
self.set_facecolor(c)
self.set_edgecolor(c)
@@ -702,8 +704,8 @@
over the regions in *x* where *where* is True. The bars range
on the y-axis from *ymin* to *ymax*
- A :class:`BrokenBarHCollection` is returned.
- **kwargs are passed on to the collection
+ A :class:`BrokenBarHCollection` is returned. kwargs are
+ passed on to the collection.
"""
xranges = []
for ind0, ind1 in mlab.contiguous_regions(where):
@@ -932,7 +934,7 @@
Set the color(s) of the line collection. *c* can be a
matplotlib color arg (all patches have same color), or a
sequence or rgba tuples; if it is a sequence the patches will
- cycle through the sequence
+ cycle through the sequence.
ACCEPTS: matplotlib color arg or sequence of rgba tuples
"""
Modified: trunk/matplotlib/lib/matplotlib/colors.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/colors.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/colors.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -594,7 +594,9 @@
.. seealso::
+
:func:`makeMappingArray`
+ For information about making a mapping array.
"""
self.monochrome = False # True only if all colors in map are identical;
# needed for contouring.
Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/lines.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -622,7 +622,9 @@
backward-compatibility.
.. seealso::
+
:meth:`set_drawstyle`
+ To set the drawing style (stepping) of the plot.
ACCEPTS: [ '-' | '--' | '-.' | ':' | 'None' | ' ' | '' ] and
any drawstyle in combination with a linestyle, e.g. 'steps--'.
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -59,7 +59,7 @@
A collection of helper methods for numpyrecord arrays
-.. _htmlonly::
+.. _htmlonly:
See :ref:`misc-examples-index`
@@ -475,7 +475,8 @@
segments.
.. seealso::
- :func:`psd`:
+
+ :func:`psd`
:func:`psd` differs in the default overlap; in returning
the mean of the segment periodograms; and in not returning
times.
@@ -517,7 +518,8 @@
the factors cancel out.
.. seealso::
- :func:`psd` and :func:`csd`:
+
+ :func:`psd` and :func:`csd`
For information about the methods used to compute
:math:`P_{xy}`, :math:`P_{xx}` and :math:`P_{yy}`.
"""
@@ -565,7 +567,7 @@
Do a best fit polynomial of order *N* of *y* to *x*. Return value
is a vector of polynomial coefficients [pk ... p1 p0]. Eg, for
- *N*=2::
+ *N* = 2::
p2*x0^2 + p1*x0 + p0 = y1
p2*x1^2 + p1*x1 + p0 = y1
@@ -601,7 +603,9 @@
subscripts on that page. The linear algebra is correct, however.
.. seealso::
+
:func:`polyval`
+ polyval function
"""
warnings.warn("use numpy.poyfit", DeprecationWarning)
return np.polyfit(*args, **kwargs)
@@ -623,7 +627,9 @@
resid = y - trend
.. seealso::
+
:func:`polyfit`
+ polyfit function
"""
warnings.warn("use numpy.polyval", DeprecationWarning)
return np.polyval(*args, **kwargs)
@@ -709,7 +715,8 @@
cohere.
.. seealso::
- :file:`test/cohere_pairs_test.py` in the src tree:
+
+ :file:`test/cohere_pairs_test.py` in the src tree
For an example script that shows that this
:func:`cohere_pairs` and :func:`cohere` give the same
results for a given pair.
@@ -1212,10 +1219,11 @@
\lambda = \\frac{1}{n}\\sum \\ln|f^'(x_i)|
.. seealso::
- Sec 10.5 Strogatz (1994) "Nonlinear Dynamics and Chaos".
- `Wikipedia article on Lyapunov Exponent
- <http://en.wikipedia.org/wiki/Lyapunov_exponent>`_.
+ Lyapunov Exponent
+ Sec 10.5 Strogatz (1994) "Nonlinear Dynamics and Chaos".
+ `Wikipedia article on Lyapunov Exponent
+ <http://en.wikipedia.org/wiki/Lyapunov_exponent>`_.
.. note::
What the function here calculates may not be what you really want;
@@ -1426,7 +1434,8 @@
- *dtype*: the array will have this dtype. default: ``numpy.float_``
.. seealso::
- See :file:`examples/pylab_examples/load_converter.py` in the source tree:
+
+ See :file:`examples/pylab_examples/load_converter.py` in the source tree
Exercises many of these options.
"""
@@ -2057,6 +2066,7 @@
.. seealso::
http://projects.scipy.org/pipermail/numpy-discussion/2008-August/036429.html
+ Motivation for this function
"""
return rec.view(np.recarray)
#return rec.view(dtype=(np.record, rec.dtype), type=np.recarray)
@@ -2815,7 +2825,8 @@
files is automatic, if the filename ends in '.gz'
.. seealso::
- :func:`csv2rec`:
+
+ :func:`csv2rec`
For information about *missing* and *missingd*, which can
be used to fill in masked values into your CSV file.
"""
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/patches.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -643,8 +643,10 @@
%(Patch)s
.. seealso::
- :class:`Patch`:
+
+ :class:`Patch`
For additional kwargs
+
"""
Patch.__init__(self, **kwargs)
self._path = path
@@ -671,8 +673,10 @@
%(Patch)s
.. seealso::
- :class:`Patch`:
+
+ :class:`Patch`
For additional kwargs
+
"""
Patch.__init__(self, **kwargs)
xy = np.asarray(xy, np.float_)
Modified: trunk/matplotlib/lib/matplotlib/path.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/path.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/path.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -223,7 +223,8 @@
Return a transformed copy of the path.
.. seealso::
- :class:`matplotlib.transforms.TransformedPath`:
+
+ :class:`matplotlib.transforms.TransformedPath`
A specialized path class that will cache the
transformed result and automatically update when the
transform changes.
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -425,7 +425,8 @@
'upper right' )
.. seealso::
- :func:`~matplotlib.pyplot.legend`:
+
+ :func:`~matplotlib.pyplot.legend`
For information about the location codes
"""
l = gcf().legend(handles, labels, loc, **kwargs)
@@ -616,11 +617,13 @@
registered. See :func:`matplotlib.projections.register_projection`
.. seealso::
- :func:`~matplotlib.pyplot.axes`:
+
+ :func:`~matplotlib.pyplot.axes`
For additional information on :func:`axes` and
:func:`subplot` keyword arguments.
:file:`examples/pylab_examples/polar_scatter.py`
+ For an example
**Example:**
@@ -650,7 +653,9 @@
the right, and the *ax2* instance is returned.
.. seealso::
+
:file:`examples/api_examples/two_scales.py`
+ For an example
"""
if ax is None:
ax=gca()
@@ -746,7 +751,8 @@
'horizontalalignment': 'center'}
.. seealso::
- :func:`~matplotlib.pyplot.text`:
+
+ :func:`~matplotlib.pyplot.text`
for information on how override and the optional args work.
"""
l = gca().set_title(s, *args, **kwargs)
@@ -812,7 +818,9 @@
The xmin, xmax, ymin, ymax tuple is returned
.. seealso::
+
:func:`xlim`, :func:`ylim`
+ For setting the x- and y-limits individually.
"""
ax = gca()
v = ax.axis(*v, **kwargs)
@@ -832,7 +840,8 @@
}
.. seealso::
- :func:`~matplotlib.pyplot.text`:
+
+ :func:`~matplotlib.pyplot.text`
For information on how override and the optional args work
"""
l = gca().set_xlabel(s, *args, **kwargs)
@@ -852,7 +861,8 @@
'rotation'='vertical' : }
.. seealso::
- :func:`~matplotlib.pyplot.text`:
+
+ :func:`~matplotlib.pyplot.text`
For information on how override and the optional args
work.
"""
@@ -1139,9 +1149,9 @@
"""
Plotting commands
- ========= =================================================
+ ============== =================================================
Command Description
- ========= =================================================
+ ============== =================================================
axes Create a new axes
axis Set or return the current axis limits
bar make a bar chart
@@ -1162,7 +1172,7 @@
figtext add text in figure coords
figure create or change active figure
fill make filled polygons
- fill_between make filled polygons
+ fill_between make filled polygons
gca return the current axes
gcf return the current figure
gci get the current image, or None
@@ -1194,7 +1204,7 @@
title add a title to the current axes
xlabel add an xlabel to the current axes
ylabel add a ylabel to the current axes
- ========= =================================================
+ ============== =================================================
The following commands will set the default colormap accordingly:
Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/text.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -658,7 +658,9 @@
Set the background color of the text by updating the bbox.
.. seealso::
+
:meth:`set_bbox`
+ To change the position of the bounding box.
ACCEPTS: any matplotlib color
"""
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py 2008-12-12 17:23:57 UTC (rev 6593)
+++ trunk/matplotlib/lib/matplotlib/ticker.py 2008-12-12 21:22:04 UTC (rev 6594)
@@ -213,7 +213,7 @@
'Return fixed strings for tick labels'
def __init__(self, seq):
"""
- seq is a sequence of strings. For positions ``i<len(seq)` return
+ *seq* is a sequence of strings. For positions ``i < len(seq)`` return
*seq[i]* regardless of *x*. Otherwise return ''
"""
self.seq = seq
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2008-12-12 17:24:02
|
Revision: 6593
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6593&view=rev
Author: jswhit
Date: 2008-12-12 17:23:57 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
docstring update
Modified Paths:
--------------
trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-12 14:55:12 UTC (rev 6592)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2008-12-12 17:23:57 UTC (rev 6593)
@@ -3155,6 +3155,8 @@
Default image size is 5400x2700, which can be quite slow and
use quite a bit of memory. The ``scale`` keyword can be used
to downsample the image (``scale=0.5`` downsamples to 2700x1350).
+
+ \**kwargs passed on to :meth:`imshow`.
"""
if ax is not None:
return self.warpimage(image='bluemarble',ax=ax,scale=scale,**kwargs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mme...@us...> - 2008-12-12 14:55:26
|
Revision: 6592
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6592&view=rev
Author: mmetz_bn
Date: 2008-12-12 14:55:12 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
Added support for weights to axes.hist()
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-12-12 14:47:38 UTC (rev 6591)
+++ trunk/matplotlib/CHANGELOG 2008-12-12 14:55:12 UTC (rev 6592)
@@ -1,3 +1,6 @@
+2008-12-12 Added support for the numpy.histogram() weights parameter
+ to the axes hist() method. Docs taken from numpy - MM
+
2008-12-12 Fixed warning in hist() with numpy 1.2 - MM
2008-12-12 Removed external packages: configobj and enthought.traits
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-12-12 14:47:38 UTC (rev 6591)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-12-12 14:55:12 UTC (rev 6592)
@@ -6422,9 +6422,10 @@
#### Data analysis
- def hist(self, x, bins=10, range=None, normed=False, cumulative=False,
- bottom=None, histtype='bar', align='mid',
- orientation='vertical', rwidth=None, log=False, **kwargs):
+ def hist(self, x, bins=10, range=None, normed=False, weights=None,
+ cumulative=False, bottom=None, histtype='bar', align='mid',
+ orientation='vertical', rwidth=None, log=False,
+ **kwargs):
"""
call signature::
@@ -6468,6 +6469,13 @@
pdf, bins, patches = ax.hist(...)
print np.sum(pdf * np.diff(bins))
+ *weights*
+ An array of weights, of the same shape as *x*. Each value in
+ *x* only contributes its associated weight towards the bin
+ count (instead of 1). If *normed* is True, the weights are
+ normalized, so that the integral of the density over the range
+ remains 1.
+
*cumulative*:
If *True*, then a histogram is computed where each bin
gives the counts in that bin plus all bins for smaller values.
@@ -6543,7 +6551,7 @@
if not self._hold: self.cla()
# NOTE: the range keyword overwrites the built-in func range !!!
- # needs to be fixed in with numpy !!!
+ # needs to be fixed in numpy !!!
if kwargs.get('width') is not None:
raise DeprecationWarning(
@@ -6566,8 +6574,30 @@
tx.append( np.array(x[i]) )
x = tx
else:
- raise ValueError, 'Can not use providet data to create a histogram'
+ raise ValueError, 'Can not use provided data to create a histogram'
+ if weights is not None:
+ try:
+ w = np.transpose(np.array(weights))
+ if len(w.shape)==1:
+ w.shape = (1, w.shape[0])
+ except:
+ if iterable(weights[0]) and not is_string_like(weights[0]):
+ tw = []
+ for i in xrange(len(weights)):
+ tw.append( np.array(weights[i]) )
+ w = tw
+ else:
+ raise ValueError, 'Can not use provided weights to create a hist'
+
+ if len(x) != len(w):
+ raise ValueError, 'weights should have the same shape as x'
+ for i in xrange(len(x)):
+ if len(x[i]) != len(w[i]):
+ raise ValueError, 'weights should have the same shape as x'
+ else:
+ w = [None]*len(x)
+
# Check whether bins or range are given explicitly. In that
# case do not autoscale axes.
binsgiven = (cbook.iterable(bins) or range != None)
@@ -6584,7 +6614,7 @@
for i in xrange(len(x)):
# this will automatically overwrite bins,
# so that each histogram uses the same bins
- m, bins = np.histogram(x[i], bins, **hist_kwargs)
+ m, bins = np.histogram(x[i], bins, weights=w[i], **hist_kwargs)
n.append(m)
if cumulative:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ds...@us...> - 2008-12-12 14:47:45
|
Revision: 6591
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6591&view=rev
Author: dsdale
Date: 2008-12-12 14:47:38 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
added note to api_changes.rst about removing configobj and traits
Modified Paths:
--------------
trunk/matplotlib/doc/api/api_changes.rst
trunk/matplotlib/doc/pyplots/tex_demo.png
Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst 2008-12-12 14:05:20 UTC (rev 6590)
+++ trunk/matplotlib/doc/api/api_changes.rst 2008-12-12 14:47:38 UTC (rev 6591)
@@ -6,6 +6,13 @@
outward-facing API. If updating matplotlib breaks your scripts, this
list may help describe what changes may be necessary in your code.
+* Removed configobj_ and `enthought.traits`_ packages, which are only
+ required by the experimental traited config and are somewhat out of
+ date. If needed, install them independently.
+
+.. _configobj: http://www.voidspace.org.uk/python/configobj.html
+.. _`enthought.traits`: http://code.enthought.com/projects/traits
+
Changes for 0.98.x
==================
@@ -253,7 +260,7 @@
`Axes.toggle_log_lineary()` has been removed.
:mod:`matplotlib.artist`
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
============================================================ ============================================================
Old method New method
Modified: trunk/matplotlib/doc/pyplots/tex_demo.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mme...@us...> - 2008-12-12 14:05:25
|
Revision: 6590
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6590&view=rev
Author: mmetz_bn
Date: 2008-12-12 14:05:20 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
Merged revisions 6589 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint
........
r6589 | mmetz_bn | 2008-12-12 14:58:24 +0100 (Fri, 12 Dec 2008) | 1 line
fix warning in hist for numpy 1.2
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-12-12 13:58:24 UTC (rev 6589)
+++ trunk/matplotlib/CHANGELOG 2008-12-12 14:05:20 UTC (rev 6590)
@@ -1,3 +1,5 @@
+2008-12-12 Fixed warning in hist() with numpy 1.2 - MM
+
2008-12-12 Removed external packages: configobj and enthought.traits
which are only required by the experimental traited config
and are somewhat out of date. If needed, install them
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-12-12 13:58:24 UTC (rev 6589)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-12-12 14:05:20 UTC (rev 6590)
@@ -6573,10 +6573,10 @@
binsgiven = (cbook.iterable(bins) or range != None)
# check the version of the numpy
- if np.__version__ < "1.2": # version 1.1
+ if np.__version__ < "1.3": # version 1.1 and 1.2
hist_kwargs = dict(range=range,
normed=bool(normed), new=True)
- else: # version 1.2 and later, drop new=True
+ else: # version 1.3 and later, drop new=True
hist_kwargs = dict(range=range,
normed=bool(normed))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mme...@us...> - 2008-12-12 13:58:34
|
Revision: 6589
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6589&view=rev
Author: mmetz_bn
Date: 2008-12-12 13:58:24 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
fix warning in hist for numpy 1.2
Modified Paths:
--------------
branches/v0_98_5_maint/CHANGELOG
branches/v0_98_5_maint/lib/matplotlib/axes.py
Modified: branches/v0_98_5_maint/CHANGELOG
===================================================================
--- branches/v0_98_5_maint/CHANGELOG 2008-12-12 13:42:22 UTC (rev 6588)
+++ branches/v0_98_5_maint/CHANGELOG 2008-12-12 13:58:24 UTC (rev 6589)
@@ -1,3 +1,5 @@
+2008-12-12 Fixed warning in hist() with numpy 1.2 - MM
+
=================================================================
2008-12-09 Released 0.98.5 at svn r6573
Modified: branches/v0_98_5_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v0_98_5_maint/lib/matplotlib/axes.py 2008-12-12 13:42:22 UTC (rev 6588)
+++ branches/v0_98_5_maint/lib/matplotlib/axes.py 2008-12-12 13:58:24 UTC (rev 6589)
@@ -6568,10 +6568,10 @@
binsgiven = (cbook.iterable(bins) or range != None)
# check the version of the numpy
- if np.__version__ < "1.2": # version 1.1
+ if np.__version__ < "1.3": # version 1.1 and 1.2
hist_kwargs = dict(range=range,
normed=bool(normed), new=True)
- else: # version 1.2 and later, drop new=True
+ else: # version 1.3 and later, drop new=True
hist_kwargs = dict(range=range,
normed=bool(normed))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2008-12-12 13:42:26
|
Revision: 6588
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6588&view=rev
Author: mdboom
Date: 2008-12-12 13:42:22 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
Merged revisions 6587 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint
........
r6587 | mdboom | 2008-12-12 08:39:32 -0500 (Fri, 12 Dec 2008) | 1 line
Fix cross-reference in docs
........
Modified Paths:
--------------
trunk/matplotlib/doc/faq/installing_faq.rst
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6585
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6587
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst 2008-12-12 13:39:32 UTC (rev 6587)
+++ trunk/matplotlib/doc/faq/installing_faq.rst 2008-12-12 13:42:22 UTC (rev 6588)
@@ -106,7 +106,8 @@
> cd matplotlib
> python setup.py install
-For more information on Subversion usage, see :ref:`using-svn`.
+There is more information on :ref:`using Subversion <using-svn>` in
+the developer docs.
Install from git
================
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
