Revision: 6288
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6288&view=rev
Author: jdh2358
Date: 2008-10-21 15:26:22 +0000 (Tue, 21 Oct 2008)
Log Message:
-----------
restored the support for multiple pyplots that I broke earlier
Modified Paths:
--------------
trunk/matplotlib/API_CHANGES
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/_templates/gallery.html
trunk/matplotlib/doc/make.py
trunk/matplotlib/doc/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/API_CHANGES
===================================================================
--- trunk/matplotlib/API_CHANGES 2008-10-21 14:52:59 UTC (rev 6287)
+++ trunk/matplotlib/API_CHANGES 2008-10-21 15:26:22 UTC (rev 6288)
@@ -1,7 +1,9 @@
-
Changes for 0.98.x
==================
-
+
+* Restored 0.91 behavior of get_xlim/ylim returning a tuple
+ rather than array - JDH
+
* AFM.get_fullname() and get_familyname() no longer raise an
exception if the AFM file does not specify these optional attributes,
but returns a guess based on the required FontName attribute.
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2008-10-21 14:52:59 UTC (rev 6287)
+++ trunk/matplotlib/CHANGELOG 2008-10-21 15:26:22 UTC (rev 6288)
@@ -1,3 +1,6 @@
+2008-10-21 Restored 0.91 behavior of get_xlim/ylim returning a tuple
+ rather than array - JDH
+
2008-10-20 Added image thumbnail generating function
matplotlib.image.thumbnail. See
examples/misc/image_thumbnail.py - JDH
@@ -5,8 +8,8 @@
2008-10-20 Applied scatleg patch based on ideas and work by Erik
Tollerud and Jae-Joon Lee. - MM
-2008-10-11 Fixed bug in pdf backend: if you pass a file object for
- output instead of a filename, e.g. in a wep app, we now
+2008-10-11 Fixed bug in pdf backend: if you pass a file object for
+ output instead of a filename, e.g. in a wep app, we now
flush the object at the end. - JKS
2008-10-08 Add path simplification support to paths with gaps. - EF
Modified: trunk/matplotlib/doc/_templates/gallery.html
===================================================================
--- trunk/matplotlib/doc/_templates/gallery.html 2008-10-21 14:52:59 UTC
(rev 6287)
+++ trunk/matplotlib/doc/_templates/gallery.html 2008-10-21 15:26:22 UTC
(rev 6288)
@@ -23,7 +23,7 @@
<a href="examples/api/date_demo.html"><img
src="_static/plot_directive/mpl_examples/api/thumbnails/date_demo.png"
border="0" alt="date_demo"/></a>
-<a href="examples/api/date_index_formatter.html"><img
src="_static/plot_directive/mpl_examples/api/thumbnails/date_index_formatter.png"
border="0" alt="date_index_formatter"/></a>
+<a href="examples/api/date_index_formatter.html"><img
src="_static/plot_directive/mpl_examples/api/thumbnails/date_index_formatter_00.png"
border="0" alt="date_index_formatter"/></a>
<a href="examples/api/date_index_formatter.html"><img
src="_static/plot_directive/mpl_examples/api/thumbnails/date_index_formatter_01.png"
border="0" alt="date_index_formatter"/></a>
@@ -57,13 +57,13 @@
<a href="examples/pylab_examples/accented_text.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/accented_text.png"
border="0" alt="accented_text"/></a>
-<a href="examples/pylab_examples/agg_buffer_to_array.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/agg_buffer_to_array.png"
border="0" alt="agg_buffer_to_array"/></a>
+<a href="examples/pylab_examples/agg_buffer_to_array.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/agg_buffer_to_array_00.png"
border="0" alt="agg_buffer_to_array"/></a>
<a href="examples/pylab_examples/agg_buffer_to_array.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/agg_buffer_to_array_01.png"
border="0" alt="agg_buffer_to_array"/></a>
<a href="examples/pylab_examples/alignment_test.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/alignment_test.png"
border="0" alt="alignment_test"/></a>
-<a href="examples/pylab_examples/annotation_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/annotation_demo.png"
border="0" alt="annotation_demo"/></a>
+<a href="examples/pylab_examples/annotation_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/annotation_demo_00.png"
border="0" alt="annotation_demo"/></a>
<a href="examples/pylab_examples/annotation_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/annotation_demo_01.png"
border="0" alt="annotation_demo"/></a>
@@ -91,11 +91,11 @@
<a href="examples/pylab_examples/barcode_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/barcode_demo.png"
border="0" alt="barcode_demo"/></a>
-<a href="examples/pylab_examples/barh_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/barh_demo.png"
border="0" alt="barh_demo"/></a>
+<a href="examples/pylab_examples/barh_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/barh_demo_00.png"
border="0" alt="barh_demo"/></a>
<a href="examples/pylab_examples/barh_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/barh_demo_01.png"
border="0" alt="barh_demo"/></a>
-<a href="examples/pylab_examples/boxplot_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/boxplot_demo.png"
border="0" alt="boxplot_demo"/></a>
+<a href="examples/pylab_examples/boxplot_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/boxplot_demo_00.png"
border="0" alt="boxplot_demo"/></a>
<a href="examples/pylab_examples/boxplot_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/boxplot_demo_01.png"
border="0" alt="boxplot_demo"/></a>
@@ -121,7 +121,7 @@
<a href="examples/pylab_examples/color_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/color_demo.png"
border="0" alt="color_demo"/></a>
-<a href="examples/pylab_examples/contour_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contour_demo.png"
border="0" alt="contour_demo"/></a>
+<a href="examples/pylab_examples/contour_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contour_demo_00.png"
border="0" alt="contour_demo"/></a>
<a href="examples/pylab_examples/contour_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contour_demo_01.png"
border="0" alt="contour_demo"/></a>
@@ -133,11 +133,11 @@
<a href="examples/pylab_examples/contour_image.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contour_image.png"
border="0" alt="contour_image"/></a>
-<a href="examples/pylab_examples/contour_label_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contour_label_demo.png"
border="0" alt="contour_label_demo"/></a>
+<a href="examples/pylab_examples/contour_label_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contour_label_demo_00.png"
border="0" alt="contour_label_demo"/></a>
<a href="examples/pylab_examples/contour_label_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contour_label_demo_01.png"
border="0" alt="contour_label_demo"/></a>
-<a href="examples/pylab_examples/contourf_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contourf_demo.png"
border="0" alt="contourf_demo"/></a>
+<a href="examples/pylab_examples/contourf_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contourf_demo_00.png"
border="0" alt="contourf_demo"/></a>
<a href="examples/pylab_examples/contourf_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/contourf_demo_01.png"
border="0" alt="contourf_demo"/></a>
@@ -181,7 +181,7 @@
<a href="examples/pylab_examples/equal_aspect_ratio.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/equal_aspect_ratio.png"
border="0" alt="equal_aspect_ratio"/></a>
-<a href="examples/pylab_examples/errorbar_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/errorbar_demo.png"
border="0" alt="errorbar_demo"/></a>
+<a href="examples/pylab_examples/errorbar_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/errorbar_demo_00.png"
border="0" alt="errorbar_demo"/></a>
<a href="examples/pylab_examples/errorbar_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/errorbar_demo_01.png"
border="0" alt="errorbar_demo"/></a>
@@ -201,7 +201,7 @@
<a href="examples/pylab_examples/errorbar_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/errorbar_demo_09.png"
border="0" alt="errorbar_demo"/></a>
-<a href="examples/pylab_examples/errorbar_limits.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/errorbar_limits.png"
border="0" alt="errorbar_limits"/></a>
+<a href="examples/pylab_examples/errorbar_limits.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/errorbar_limits_00.png"
border="0" alt="errorbar_limits"/></a>
<a href="examples/pylab_examples/errorbar_limits.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/errorbar_limits_01.png"
border="0" alt="errorbar_limits"/></a>
@@ -253,7 +253,7 @@
<a href="examples/pylab_examples/histogram_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/histogram_demo.png"
border="0" alt="histogram_demo"/></a>
-<a href="examples/pylab_examples/histogram_demo_extended.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/histogram_demo_extended.png"
border="0" alt="histogram_demo_extended"/></a>
+<a href="examples/pylab_examples/histogram_demo_extended.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/histogram_demo_extended_00.png"
border="0" alt="histogram_demo_extended"/></a>
<a href="examples/pylab_examples/histogram_demo_extended.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/histogram_demo_extended_01.png"
border="0" alt="histogram_demo_extended"/></a>
@@ -273,7 +273,7 @@
<a href="examples/pylab_examples/image_demo3.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/image_demo3.png"
border="0" alt="image_demo3"/></a>
-<a href="examples/pylab_examples/image_interp.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/image_interp.png"
border="0" alt="image_interp"/></a>
+<a href="examples/pylab_examples/image_interp.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/image_interp_00.png"
border="0" alt="image_interp"/></a>
<a href="examples/pylab_examples/image_interp.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/image_interp_01.png"
border="0" alt="image_interp"/></a>
@@ -295,7 +295,7 @@
<a href="examples/pylab_examples/layer_images.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/layer_images.png"
border="0" alt="layer_images"/></a>
-<a href="examples/pylab_examples/legend_auto.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/legend_auto.png"
border="0" alt="legend_auto"/></a>
+<a href="examples/pylab_examples/legend_auto.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/legend_auto_00.png"
border="0" alt="legend_auto"/></a>
<a href="examples/pylab_examples/legend_auto.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/legend_auto_01.png"
border="0" alt="legend_auto"/></a>
@@ -349,7 +349,7 @@
<a href="examples/pylab_examples/mathtext_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/mathtext_demo.png"
border="0" alt="mathtext_demo"/></a>
-<a href="examples/pylab_examples/matshow.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/matshow.png"
border="0" alt="matshow"/></a>
+<a href="examples/pylab_examples/matshow.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/matshow_00.png"
border="0" alt="matshow"/></a>
<a href="examples/pylab_examples/matshow.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/matshow_01.png"
border="0" alt="matshow"/></a>
@@ -363,13 +363,13 @@
<a href="examples/pylab_examples/multiline.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/multiline.png"
border="0" alt="multiline"/></a>
-<a href="examples/pylab_examples/multiple_figs_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/multiple_figs_demo.png"
border="0" alt="multiple_figs_demo"/></a>
+<a href="examples/pylab_examples/multiple_figs_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/multiple_figs_demo_00.png"
border="0" alt="multiple_figs_demo"/></a>
<a href="examples/pylab_examples/multiple_figs_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/multiple_figs_demo_01.png"
border="0" alt="multiple_figs_demo"/></a>
<a href="examples/pylab_examples/nan_test.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/nan_test.png"
border="0" alt="nan_test"/></a>
-<a href="examples/pylab_examples/newscalarformatter_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/newscalarformatter_demo.png"
border="0" alt="newscalarformatter_demo"/></a>
+<a href="examples/pylab_examples/newscalarformatter_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/newscalarformatter_demo_00.png"
border="0" alt="newscalarformatter_demo"/></a>
<a href="examples/pylab_examples/newscalarformatter_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/newscalarformatter_demo_01.png"
border="0" alt="newscalarformatter_demo"/></a>
@@ -387,7 +387,7 @@
<a href="examples/pylab_examples/pie_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/pie_demo.png"
border="0" alt="pie_demo"/></a>
-<a href="examples/pylab_examples/plotfile_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/plotfile_demo.png"
border="0" alt="plotfile_demo"/></a>
+<a href="examples/pylab_examples/plotfile_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/plotfile_demo_00.png"
border="0" alt="plotfile_demo"/></a>
<a href="examples/pylab_examples/plotfile_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/plotfile_demo_01.png"
border="0" alt="plotfile_demo"/></a>
@@ -413,7 +413,7 @@
<a href="examples/pylab_examples/quadmesh_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/quadmesh_demo.png"
border="0" alt="quadmesh_demo"/></a>
-<a href="examples/pylab_examples/quiver_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/quiver_demo.png"
border="0" alt="quiver_demo"/></a>
+<a href="examples/pylab_examples/quiver_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/quiver_demo_00.png"
border="0" alt="quiver_demo"/></a>
<a href="examples/pylab_examples/quiver_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/quiver_demo_01.png"
border="0" alt="quiver_demo"/></a>
@@ -455,7 +455,7 @@
<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.png"
border="0" alt="subplot_toolbar"/></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>
<a href="examples/pylab_examples/subplot_toolbar.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/subplot_toolbar_01.png"
border="0" alt="subplot_toolbar"/></a>
@@ -489,7 +489,7 @@
<a href="examples/pylab_examples/xcorr_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/xcorr_demo.png"
border="0" alt="xcorr_demo"/></a>
-<a href="examples/pylab_examples/zorder_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/zorder_demo.png"
border="0" alt="zorder_demo"/></a>
+<a href="examples/pylab_examples/zorder_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/zorder_demo_00.png"
border="0" alt="zorder_demo"/></a>
<a href="examples/pylab_examples/zorder_demo.html"><img
src="_static/plot_directive/mpl_examples/pylab_examples/thumbnails/zorder_demo_01.png"
border="0" alt="zorder_demo"/></a>
Modified: trunk/matplotlib/doc/make.py
===================================================================
--- trunk/matplotlib/doc/make.py 2008-10-21 14:52:59 UTC (rev 6287)
+++ trunk/matplotlib/doc/make.py 2008-10-21 15:26:22 UTC (rev 6288)
@@ -17,8 +17,6 @@
def sf():
'push a copy to the sf site'
os.system('cd build/html; rsync -avz . jdh2358,[EMAIL
PROTECTED]:/home/groups/m/ma/matplotlib/htdocs/ -essh --cvs-exclude')
- # we are now doing this in the doc/examples build
- #os.system('cd ~/mpl/examples; svn-clean; cd ..; rsync -avz examples
jdh2358,[EMAIL PROTECTED]:/home/groups/m/ma/matplotlib/htdocs/ -essh
--cvs-exclude --delete')
def sfpdf():
'push a copy to the sf site'
Modified: trunk/matplotlib/doc/sphinxext/plot_directive.py
===================================================================
--- trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-10-21 14:52:59 UTC
(rev 6287)
+++ trunk/matplotlib/doc/sphinxext/plot_directive.py 2008-10-21 15:26:22 UTC
(rev 6288)
@@ -127,12 +127,7 @@
while True:
all_exists = True
for format, dpi in formats:
- if i==0:
- outname = basename
- else:
- outname = "%s_%02d" % (basename, i)
-
- outname = os.path.join(outdir, '%s.%s' % (outname, format))
+ outname = os.path.join(outdir, '%s_%02d.%s' % (basename, i,
format))
if out_of_date(fullpath, outname):
all_exists = False
break
@@ -163,7 +158,7 @@
fig_managers = _pylab_helpers.Gcf.get_all_fig_managers()
for i, figman in enumerate(fig_managers):
for format, dpi in formats:
- if i==0:
+ if len(fig_managers) == 1:
outname = basename
else:
outname = "%s_%02d" % (basename, i)
@@ -221,7 +216,7 @@
options = "\n".join(options)
for i in range(num_figs):
- if i==0:
+ if num_figs == 1:
outname = basename
else:
outname = "%s_%02d" % (basename, i)
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-10-21 14:52:59 UTC (rev
6287)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-10-21 15:26:22 UTC (rev
6288)
@@ -1771,7 +1771,7 @@
"""
Get the x-axis range [*xmin*, *xmax*]
"""
- return self.viewLim.intervalx
+ return tuple(self.viewLim.intervalx)
def set_xlim(self, xmin=None, xmax=None, emit=True, **kwargs):
"""
@@ -1944,7 +1944,7 @@
"""
Get the y-axis range [*ymin*, *ymax*]
"""
- return self.viewLim.intervaly
+ return tuple(self.viewLim.intervaly)
def set_ylim(self, ymin=None, ymax=None, emit=True, **kwargs):
"""
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
