Menu
▾
▴
matplotlib-checkins
|
From: <as...@us...> - 2009-09-07 20:03:36
|
Revision: 7688
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7688&view=rev
Author: astraw
Date: 2009-09-07 20:03:29 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
trunk/matplotlib/test/test_plots/TestPlot.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/single_point.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/baseline/TestPlot/single_point.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/single_point.png (from rev 7687, trunk/matplotlib/test/test_plots/baseline/TestPlot/single_point.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:03:12 UTC (rev 7687)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:03:29 UTC (rev 7688)
@@ -170,3 +170,14 @@
fig.autofmt_xdate()
fig.savefig( 'fill_units' )
+@image_comparison(baseline_images=['single_point'])
+def test_single_point():
+ """Test single-point plots."""
+ fig = pylab.figure()
+ pylab.subplot( 211 )
+ pylab.plot( [0], [0], 'o' )
+
+ pylab.subplot( 212 )
+ pylab.plot( [1], [1], 'o' )
+
+ fig.savefig( 'single_point' )
Modified: trunk/matplotlib/test/test_plots/TestPlot.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:03:12 UTC (rev 7687)
+++ trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:03:29 UTC (rev 7688)
@@ -41,21 +41,6 @@
pass
#--------------------------------------------------------------------
- def test_single_point( self ):
- """Test single-point plots."""
- fname = self.outFile( "single_point.png" )
-
- fig = pylab.figure()
- pylab.subplot( 211 )
- pylab.plot( [0], [0], 'o' )
-
- pylab.subplot( 212 )
- pylab.plot( [1], [1], 'o' )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
- #--------------------------------------------------------------------
def test_single_date( self ):
"""Test single-point date plots."""
Deleted: trunk/matplotlib/test/test_plots/baseline/TestPlot/single_point.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:03:53
|
Revision: 7689
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7689&view=rev
Author: astraw
Date: 2009-09-07 20:03:46 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
trunk/matplotlib/test/test_plots/TestPlot.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/single_date.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/baseline/TestPlot/single_date.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/single_date.png (from rev 7688, trunk/matplotlib/test/test_plots/baseline/TestPlot/single_date.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:03:29 UTC (rev 7688)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:03:46 UTC (rev 7689)
@@ -181,3 +181,19 @@
pylab.plot( [1], [1], 'o' )
fig.savefig( 'single_point' )
+
+@image_comparison(baseline_images=['single_date'])
+def test_single_date():
+ """Test single-point date plots."""
+
+ time1=[ 721964.0 ]
+ data1=[ -65.54 ]
+
+ fig = pylab.figure()
+ pylab.subplot( 211 )
+ pylab.plot_date( time1, data1, 'o', color='r' )
+
+ pylab.subplot( 212 )
+ pylab.plot( time1, data1, 'o', color='r' )
+
+ fig.savefig( 'single_date' )
Modified: trunk/matplotlib/test/test_plots/TestPlot.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:03:29 UTC (rev 7688)
+++ trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:03:46 UTC (rev 7689)
@@ -41,25 +41,6 @@
pass
#--------------------------------------------------------------------
- def test_single_date( self ):
- """Test single-point date plots."""
-
- fname = self.outFile( "single_date.png" )
-
- time1=[ 721964.0 ]
- data1=[ -65.54 ]
-
- fig = pylab.figure()
- pylab.subplot( 211 )
- pylab.plot_date( time1, data1, 'o', color='r' )
-
- pylab.subplot( 212 )
- pylab.plot( time1, data1, 'o', color='r' )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
- #--------------------------------------------------------------------
def test_shaped_data( self ):
"""Test numpy shaped data."""
Deleted: trunk/matplotlib/test/test_plots/baseline/TestPlot/single_date.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:04:11
|
Revision: 7690
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7690&view=rev
Author: astraw
Date: 2009-09-07 20:04:04 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
trunk/matplotlib/test/test_plots/TestPlot.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/shaped_data.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/baseline/TestPlot/shaped_data.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/shaped_data.png (from rev 7689, trunk/matplotlib/test/test_plots/baseline/TestPlot/shaped_data.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:03:46 UTC (rev 7689)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:04 UTC (rev 7690)
@@ -197,3 +197,49 @@
pylab.plot( time1, data1, 'o', color='r' )
fig.savefig( 'single_date' )
+
+@image_comparison(baseline_images=['single_date'])
+def test_shaped_data():
+ """Test numpy shaped data."""
+
+ xdata = np.array([[ 0.53295185, 0.23052951, 0.19057629, 0.66724975, 0.96577916,
+ 0.73136095, 0.60823287, 0.017921 , 0.29744742, 0.27164665],
+ [ 0.2798012 , 0.25814229, 0.02818193, 0.12966456, 0.57446277,
+ 0.58167607, 0.71028245, 0.69112737, 0.89923072, 0.99072476],
+ [ 0.81218578, 0.80464528, 0.76071809, 0.85616314, 0.12757994,
+ 0.94324936, 0.73078663, 0.09658102, 0.60703967, 0.77664978],
+ [ 0.28332265, 0.81479711, 0.86985333, 0.43797066, 0.32540082,
+ 0.43819229, 0.92230363, 0.49414252, 0.68168256, 0.05922372],
+ [ 0.10721335, 0.93904142, 0.79163075, 0.73232848, 0.90283839,
+ 0.68408046, 0.25502302, 0.95976614, 0.59214115, 0.13663711],
+ [ 0.28087456, 0.33127607, 0.15530412, 0.76558121, 0.83389773,
+ 0.03735974, 0.98717738, 0.71432229, 0.54881366, 0.86893953],
+ [ 0.77995937, 0.995556 , 0.29688434, 0.15646162, 0.051848 ,
+ 0.37161935, 0.12998491, 0.09377296, 0.36882507, 0.36583435],
+ [ 0.37851836, 0.05315792, 0.63144617, 0.25003433, 0.69586032,
+ 0.11393988, 0.92362096, 0.88045438, 0.93530252, 0.68275072],
+ [ 0.86486596, 0.83236675, 0.82960664, 0.5779663 , 0.25724233,
+ 0.84841095, 0.90862812, 0.64414887, 0.3565272 , 0.71026066],
+ [ 0.01383268, 0.3406093 , 0.76084285, 0.70800694, 0.87634056,
+ 0.08213693, 0.54655021, 0.98123181, 0.44080053, 0.86815815]])
+
+ y1 = np.arange( 10 )
+ y1.shape = 1, 10
+
+ y2 = np.arange( 10 )
+ y2.shape = 10, 1
+
+ fig = pylab.figure()
+ pylab.subplot( 411 )
+ pylab.plot( y1 )
+ pylab.subplot( 412 )
+ pylab.plot( y2 )
+
+ pylab.subplot( 413 )
+ from nose.tools import assert_raises
+ assert_raises(ValueError,pylab.plot, (y1,y2))
+
+ pylab.subplot( 414 )
+ pylab.plot( xdata[:,1], xdata[1,:], 'o' )
+
+ fig.savefig( 'shaped data' )
Modified: trunk/matplotlib/test/test_plots/TestPlot.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:03:46 UTC (rev 7689)
+++ trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:04:04 UTC (rev 7690)
@@ -41,60 +41,6 @@
pass
#--------------------------------------------------------------------
- def test_shaped_data( self ):
- """Test numpy shaped data."""
-
- xdata = npy.array([[ 0.53295185, 0.23052951, 0.19057629, 0.66724975, 0.96577916,
- 0.73136095, 0.60823287, 0.017921 , 0.29744742, 0.27164665],
- [ 0.2798012 , 0.25814229, 0.02818193, 0.12966456, 0.57446277,
- 0.58167607, 0.71028245, 0.69112737, 0.89923072, 0.99072476],
- [ 0.81218578, 0.80464528, 0.76071809, 0.85616314, 0.12757994,
- 0.94324936, 0.73078663, 0.09658102, 0.60703967, 0.77664978],
- [ 0.28332265, 0.81479711, 0.86985333, 0.43797066, 0.32540082,
- 0.43819229, 0.92230363, 0.49414252, 0.68168256, 0.05922372],
- [ 0.10721335, 0.93904142, 0.79163075, 0.73232848, 0.90283839,
- 0.68408046, 0.25502302, 0.95976614, 0.59214115, 0.13663711],
- [ 0.28087456, 0.33127607, 0.15530412, 0.76558121, 0.83389773,
- 0.03735974, 0.98717738, 0.71432229, 0.54881366, 0.86893953],
- [ 0.77995937, 0.995556 , 0.29688434, 0.15646162, 0.051848 ,
- 0.37161935, 0.12998491, 0.09377296, 0.36882507, 0.36583435],
- [ 0.37851836, 0.05315792, 0.63144617, 0.25003433, 0.69586032,
- 0.11393988, 0.92362096, 0.88045438, 0.93530252, 0.68275072],
- [ 0.86486596, 0.83236675, 0.82960664, 0.5779663 , 0.25724233,
- 0.84841095, 0.90862812, 0.64414887, 0.3565272 , 0.71026066],
- [ 0.01383268, 0.3406093 , 0.76084285, 0.70800694, 0.87634056,
- 0.08213693, 0.54655021, 0.98123181, 0.44080053, 0.86815815]])
-
- fname = self.outFile( "shaped_data.png" )
-
- y1 = npy.arange( 10 )
- y1.shape = 1, 10
-
- y2 = npy.arange( 10 )
- y2.shape = 10, 1
-
- fig = pylab.figure()
- pylab.subplot( 411 )
- pylab.plot( y1 )
- pylab.subplot( 412 )
- pylab.plot( y2 )
-
- pylab.subplot( 413 )
- try:
- pylab.plot( y1, y2 )
- except:
- # This should fail
- pass
- else:
- self.fail( "Failed to raise an exception for mis-matched dimensions." )
-
- pylab.subplot( 414 )
- pylab.plot( xdata[:,1], xdata[1,:], 'o' )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
- #--------------------------------------------------------------------
def test_const_xy( self ):
"""Test constant xy data."""
Deleted: trunk/matplotlib/test/test_plots/baseline/TestPlot/shaped_data.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:04:28
|
Revision: 7691
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7691&view=rev
Author: astraw
Date: 2009-09-07 20:04:20 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/const_xy.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/TestPlot.py
trunk/matplotlib/test/test_plots/baseline/TestPlot/const_xy.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/const_xy.png (from rev 7690, trunk/matplotlib/test/test_plots/baseline/TestPlot/const_xy.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:04 UTC (rev 7690)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:20 UTC (rev 7691)
@@ -243,3 +243,19 @@
pylab.plot( xdata[:,1], xdata[1,:], 'o' )
fig.savefig( 'shaped data' )
+
+@image_comparison(baseline_images=['const_xy'])
+def test_const_xy():
+ """Test constant xy data."""
+ fig = pylab.figure()
+
+ pylab.subplot( 311 )
+ pylab.plot( np.arange(10), np.ones( (10,) ) )
+
+ pylab.subplot( 312 )
+ pylab.plot( np.ones( (10,) ), np.arange(10) )
+
+ pylab.subplot( 313 )
+ pylab.plot( np.ones( (10,) ), np.ones( (10,) ), 'o' )
+
+ fig.savefig( 'const_xy' )
Deleted: trunk/matplotlib/test/test_plots/TestPlot.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:04:04 UTC (rev 7690)
+++ trunk/matplotlib/test/test_plots/TestPlot.py 2009-09-07 20:04:20 UTC (rev 7691)
@@ -1,63 +0,0 @@
-#=======================================================================
-"""The Plot unit-test class implementation."""
-#=======================================================================
-
-from mplTest import *
-
-#=======================================================================
-# Add import modules below.
-import matplotlib
-matplotlib.use( "Agg", warn = False )
-
-import pylab
-import numpy as npy
-#
-#=======================================================================
-
-#=======================================================================
-class TestPlot( MplTestCase ):
- """Plot unit test class."""
-
- # Uncomment any appropriate tags
- tags = [
- # 'gui', # requires the creation of a gui window
- 'agg', # uses agg in the backend
- 'agg-only', # uses only agg in the backend
- # 'wx', # uses wx in the backend
- # 'qt', # uses qt in the backend
- # 'ps', # uses the postscript backend
- # 'units', # uses units in the test
- 'PIL', # uses PIL for image comparison
- ]
-
- #--------------------------------------------------------------------
- def setUp( self ):
- """Setup any data needed for the unit test."""
- pass
-
- #--------------------------------------------------------------------
- def tearDown( self ):
- """Clean-up any generated files here."""
- pass
-
- #--------------------------------------------------------------------
- def test_const_xy( self ):
- """Test constant xy data."""
-
- fname = self.outFile( "const_xy.png" )
- fig = pylab.figure()
-
- pylab.subplot( 311 )
- pylab.plot( npy.arange(10), npy.ones( (10,) ) )
-
- pylab.subplot( 312 )
- pylab.plot( npy.ones( (10,) ), npy.arange(10) )
-
- pylab.subplot( 313 )
- pylab.plot( npy.ones( (10,) ), npy.ones( (10,) ), 'o' )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
- #--------------------------------------------------------------------
-
Deleted: trunk/matplotlib/test/test_plots/baseline/TestPlot/const_xy.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:04:48
|
Revision: 7692
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7692&view=rev
Author: astraw
Date: 2009-09-07 20:04:38 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
trunk/matplotlib/test/test_plots/TestPolar.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.png
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_wrap_180.png
trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_wrap_360.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_180.png (from rev 7691, trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_wrap_180.png)
===================================================================
(Binary files differ)
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_wrap_360.png (from rev 7691, trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_wrap_360.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:20 UTC (rev 7691)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:38 UTC (rev 7692)
@@ -259,3 +259,32 @@
pylab.plot( np.ones( (10,) ), np.ones( (10,) ), 'o' )
fig.savefig( 'const_xy' )
+
+@image_comparison(baseline_images=['polar_wrap_180',
+ 'polar_wrap_360',
+ ])
+def test_polar_wrap():
+ """Test polar plots where data crosses 0 degrees."""
+
+ D2R = np.pi / 180.0
+
+ fig = pylab.figure()
+
+ #NOTE: resolution=1 really should be the default
+ pylab.subplot( 111, polar=True, resolution=1 )
+ pylab.polar( [179*D2R, -179*D2R], [0.2, 0.1], "b.-" )
+ pylab.polar( [179*D2R, 181*D2R], [0.2, 0.1], "g.-" )
+ pylab.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] )
+
+ fig.savefig( 'polar_wrap_180' )
+
+ fig = pylab.figure()
+
+ #NOTE: resolution=1 really should be the default
+ pylab.subplot( 111, polar=True, resolution=1 )
+ pylab.polar( [2*D2R, -2*D2R], [0.2, 0.1], "b.-" )
+ pylab.polar( [2*D2R, 358*D2R], [0.2, 0.1], "g.-" )
+ pylab.polar( [358*D2R, 2*D2R], [0.2, 0.1], "r.-" )
+ pylab.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] )
+
+ fig.savefig( 'polar_wrap_360' )
Modified: trunk/matplotlib/test/test_plots/TestPolar.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestPolar.py 2009-09-07 20:04:20 UTC (rev 7691)
+++ trunk/matplotlib/test/test_plots/TestPolar.py 2009-09-07 20:04:38 UTC (rev 7692)
@@ -41,40 +41,6 @@
pass
#--------------------------------------------------------------------
- def test_polar_wrap( self ):
- """Test polar plots where data crosses 0 degrees."""
-
- fname = self.outFile( "polar_wrap_180.png" )
-
- D2R = npy.pi / 180.0
-
- fig = pylab.figure()
-
- #NOTE: resolution=1 really should be the default
- pylab.subplot( 111, polar=True, resolution=1 )
- pylab.polar( [179*D2R, -179*D2R], [0.2, 0.1], "b.-" )
- pylab.polar( [179*D2R, 181*D2R], [0.2, 0.1], "g.-" )
- pylab.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
-
- fname = self.outFile( "polar_wrap_360.png" )
-
- fig = pylab.figure()
-
- #NOTE: resolution=1 really should be the default
- pylab.subplot( 111, polar=True, resolution=1 )
- pylab.polar( [2*D2R, -2*D2R], [0.2, 0.1], "b.-" )
- pylab.polar( [2*D2R, 358*D2R], [0.2, 0.1], "g.-" )
- pylab.polar( [358*D2R, 2*D2R], [0.2, 0.1], "r.-" )
- pylab.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
- #--------------------------------------------------------------------
def test_polar_units( self ):
"""Test polar plots with unitized data."""
Deleted: trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_wrap_180.png
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_wrap_360.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:05:05
|
Revision: 7693
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7693&view=rev
Author: astraw
Date: 2009-09-07 20:04:56 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_units.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/TestPolar.py
trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_units.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_units.png (from rev 7692, trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_units.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:38 UTC (rev 7692)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:56 UTC (rev 7693)
@@ -288,3 +288,27 @@
pylab.rgrids( [0.05, 0.1, 0.15, 0.2, 0.25, 0.3] )
fig.savefig( 'polar_wrap_360' )
+
+@image_comparison(baseline_images=['polar_units'])
+def test_polar_units():
+ """Test polar plots with unitized data."""
+ import matplotlib.testing.jpl_units as units
+ units.register()
+
+ pi = np.pi
+ deg = units.UnitDbl( 1.0, "deg" )
+
+ x1 = [ pi/6.0, pi/4.0, pi/3.0, pi/2.0 ]
+ x2 = [ 30.0*deg, 45.0*deg, 60.0*deg, 90.0*deg ]
+
+ y1 = [ 1.0, 2.0, 3.0, 4.0]
+ y2 = [ 4.0, 3.0, 2.0, 1.0 ]
+
+ fig = pylab.figure()
+
+ pylab.polar( x2, y1, color = "blue" )
+
+ # polar( x2, y1, color = "red", xunits="rad" )
+ # polar( x2, y2, color = "green" )
+
+ fig.savefig( 'polar_units' )
Deleted: trunk/matplotlib/test/test_plots/TestPolar.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestPolar.py 2009-09-07 20:04:38 UTC (rev 7692)
+++ trunk/matplotlib/test/test_plots/TestPolar.py 2009-09-07 20:04:56 UTC (rev 7693)
@@ -1,67 +0,0 @@
-#=======================================================================
-"""The Polar unit-test class implementation."""
-#=======================================================================
-
-from mplTest import *
-
-#=======================================================================
-# Add import modules below.
-import matplotlib
-matplotlib.use( "Agg", warn = False )
-
-import pylab
-import numpy as npy
-#
-#=======================================================================
-
-#=======================================================================
-class TestPolar( MplTestCase ):
- """Polar unit test class."""
-
- # Uncomment any appropriate tags
- tags = [
- # 'gui', # requires the creation of a gui window
- 'agg', # uses agg in the backend
- 'agg-only', # uses only agg in the backend
- # 'wx', # uses wx in the backend
- # 'qt', # uses qt in the backend
- # 'ps', # uses the postscript backend
- # 'units', # uses units in the test
- 'PIL', # uses PIL for image comparison
- ]
-
- #--------------------------------------------------------------------
- def setUp( self ):
- """Setup any data needed for the unit test."""
- units.register()
-
- #--------------------------------------------------------------------
- def tearDown( self ):
- """Clean-up any generated files here."""
- pass
-
- #--------------------------------------------------------------------
- def test_polar_units( self ):
- """Test polar plots with unitized data."""
-
- fname = self.outFile( "polar_units.png" )
-
- pi = npy.pi
- deg = units.UnitDbl( 1.0, "deg" )
-
- x1 = [ pi/6.0, pi/4.0, pi/3.0, pi/2.0 ]
- x2 = [ 30.0*deg, 45.0*deg, 60.0*deg, 90.0*deg ]
-
- y1 = [ 1.0, 2.0, 3.0, 4.0]
- y2 = [ 4.0, 3.0, 2.0, 1.0 ]
-
- fig = pylab.figure()
-
- pylab.polar( x2, y1, color = "blue" )
-
- # polar( x2, y1, color = "red", xunits="rad" )
- # polar( x2, y2, color = "green" )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
Deleted: trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_units.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:05:20
|
Revision: 7694
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7694&view=rev
Author: astraw
Date: 2009-09-07 20:05:12 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
trunk/matplotlib/test/test_plots/TestSpan.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/baseline/TestSpan/axvspan_epoch.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/axvspan_epoch.png (from rev 7693, trunk/matplotlib/test/test_plots/baseline/TestSpan/axvspan_epoch.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:04:56 UTC (rev 7693)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:05:12 UTC (rev 7694)
@@ -312,3 +312,25 @@
# polar( x2, y2, color = "green" )
fig.savefig( 'polar_units' )
+
+@image_comparison(baseline_images=['axvspan_epoch'])
+def test_axvspan_epoch():
+ """Test the axvspan method with Epochs."""
+ from datetime import datetime
+ import matplotlib.testing.jpl_units as units
+ units.register()
+
+ # generate some data
+ t0 = units.Epoch( "ET", dt=datetime(2009, 1, 20) )
+ tf = units.Epoch( "ET", dt=datetime(2009, 1, 21) )
+
+ dt = units.Duration( "ET", units.day.convert( "sec" ) )
+
+ fig = pylab.figure()
+
+ pylab.axvspan( t0, tf, facecolor="blue", alpha=0.25 )
+
+ ax = pylab.gca()
+ ax.set_xlim( t0 - 5.0*dt, tf + 5.0*dt )
+
+ fig.savefig( 'axvspan_epoch' )
Modified: trunk/matplotlib/test/test_plots/TestSpan.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestSpan.py 2009-09-07 20:04:56 UTC (rev 7693)
+++ trunk/matplotlib/test/test_plots/TestSpan.py 2009-09-07 20:05:12 UTC (rev 7694)
@@ -42,28 +42,6 @@
pass
#--------------------------------------------------------------------
- def test_axvspan_epoch( self ):
- """Test the axvspan method with Epochs."""
-
- fname = self.outFile( "axvspan_epoch.png" )
-
- # generate some data
- t0 = units.Epoch( "ET", dt=datetime(2009, 1, 20) )
- tf = units.Epoch( "ET", dt=datetime(2009, 1, 21) )
-
- dt = units.Duration( "ET", units.day.convert( "sec" ) )
-
- fig = pylab.figure()
-
- pylab.axvspan( t0, tf, facecolor="blue", alpha=0.25 )
-
- ax = pylab.gca()
- ax.set_xlim( t0 - 5.0*dt, tf + 5.0*dt )
-
- fig.savefig( fname )
- self.checkImage( fname )
-
- #--------------------------------------------------------------------
def test_axhspan_epoch( self ):
"""Test the axhspan method with Epochs."""
Deleted: trunk/matplotlib/test/test_plots/baseline/TestSpan/axvspan_epoch.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:05:40
|
Revision: 7695
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7695&view=rev
Author: astraw
Date: 2009-09-07 20:05:29 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/tests/test_axes.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png
Removed Paths:
-------------
trunk/matplotlib/test/test_plots/TestSpan.py
trunk/matplotlib/test/test_plots/baseline/TestSpan/axhspan_epoch.png
Copied: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/axhspan_epoch.png (from rev 7694, trunk/matplotlib/test/test_plots/baseline/TestSpan/axhspan_epoch.png)
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:05:12 UTC (rev 7694)
+++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009-09-07 20:05:29 UTC (rev 7695)
@@ -334,3 +334,25 @@
ax.set_xlim( t0 - 5.0*dt, tf + 5.0*dt )
fig.savefig( 'axvspan_epoch' )
+
+@image_comparison(baseline_images=['axhspan_epoch'])
+def test_axhspan_epoch():
+ """Test the axhspan method with Epochs."""
+ from datetime import datetime
+ import matplotlib.testing.jpl_units as units
+ units.register()
+
+ # generate some data
+ t0 = units.Epoch( "ET", dt=datetime(2009, 1, 20) )
+ tf = units.Epoch( "ET", dt=datetime(2009, 1, 21) )
+
+ dt = units.Duration( "ET", units.day.convert( "sec" ) )
+
+ fig = pylab.figure()
+
+ pylab.axhspan( t0, tf, facecolor="blue", alpha=0.25 )
+
+ ax = pylab.gca()
+ ax.set_ylim( t0 - 5.0*dt, tf + 5.0*dt )
+
+ fig.savefig( 'axhspan_epoch' )
Deleted: trunk/matplotlib/test/test_plots/TestSpan.py
===================================================================
--- trunk/matplotlib/test/test_plots/TestSpan.py 2009-09-07 20:05:12 UTC (rev 7694)
+++ trunk/matplotlib/test/test_plots/TestSpan.py 2009-09-07 20:05:29 UTC (rev 7695)
@@ -1,64 +0,0 @@
-#=======================================================================
-"""The Span unit-test class implementation."""
-#=======================================================================
-
-from mplTest import *
-
-#=======================================================================
-# Add import modules below.
-import matplotlib
-matplotlib.use( "Agg", warn = False )
-
-import pylab
-import numpy as npy
-from datetime import datetime
-#
-#=======================================================================
-
-#=======================================================================
-class TestSpan( MplTestCase ):
- """Test the various axes spanning methods."""
-
- # Uncomment any appropriate tags
- tags = [
- # 'gui', # requires the creation of a gui window
- 'agg', # uses agg in the backend
- 'agg-only', # uses only agg in the backend
- # 'wx', # uses wx in the backend
- # 'qt', # uses qt in the backend
- # 'ps', # uses the postscript backend
- # 'units', # uses units in the test
- 'PIL', # uses PIL for image comparison
- ]
-
- #--------------------------------------------------------------------
- def setUp( self ):
- """Setup any data needed for the unit test."""
- units.register()
-
- #--------------------------------------------------------------------
- def tearDown( self ):
- """Clean-up any generated files here."""
- pass
-
- #--------------------------------------------------------------------
- def test_axhspan_epoch( self ):
- """Test the axhspan method with Epochs."""
-
- fname = self.outFile( "axhspan_epoch.png" )
-
- # generate some data
- t0 = units.Epoch( "ET", dt=datetime(2009, 1, 20) )
- tf = units.Epoch( "ET", dt=datetime(2009, 1, 21) )
-
- dt = units.Duration( "ET", units.day.convert( "sec" ) )
-
- fig = pylab.figure()
-
- pylab.axhspan( t0, tf, facecolor="blue", alpha=0.25 )
-
- ax = pylab.gca()
- ax.set_ylim( t0 - 5.0*dt, tf + 5.0*dt )
-
- fig.savefig( fname )
- self.checkImage( fname )
Deleted: trunk/matplotlib/test/test_plots/baseline/TestSpan/axhspan_epoch.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:05:48
|
Revision: 7696
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7696&view=rev
Author: astraw
Date: 2009-09-07 20:05:42 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/__init__.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/test_agg.py
Removed Paths:
-------------
trunk/matplotlib/test/test_backends/TestAgg.py
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-07 20:05:29 UTC (rev 7695)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-07 20:05:42 UTC (rev 7696)
@@ -877,6 +877,7 @@
# we don't want to assume all -d flags are backends, eg -debug
default_test_modules = [
+ 'matplotlib.tests.test_agg',
'matplotlib.tests.test_basic',
'matplotlib.tests.test_transforms',
'matplotlib.tests.test_axes',
Added: trunk/matplotlib/lib/matplotlib/tests/test_agg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_agg.py (rev 0)
+++ trunk/matplotlib/lib/matplotlib/tests/test_agg.py 2009-09-07 20:05:42 UTC (rev 7696)
@@ -0,0 +1,64 @@
+import os
+
+def report_memory(i):
+ pid = os.getpid()
+ a2 = os.popen('ps -p %d -o rss,sz' % pid).readlines()
+ print i, ' ', a2[1],
+ return int(a2[1].split()[0])
+
+# This test is disabled -- it uses old API. -ADS 2009-09-07
+## def test_memleak():
+## """Test agg backend for memory leaks."""
+## from matplotlib.ft2font import FT2Font
+## from numpy.random import rand
+## from matplotlib.backend_bases import GraphicsContextBase
+## from matplotlib.backends._backend_agg import RendererAgg
+
+## fontname = '/usr/local/share/matplotlib/Vera.ttf'
+
+## N = 200
+## for i in range( N ):
+## gc = GraphicsContextBase()
+## gc.set_clip_rectangle( [20, 20, 20, 20] )
+## o = RendererAgg( 400, 400, 72 )
+
+## for j in range( 50 ):
+## xs = [ 400*int(rand()) for k in range(8) ]
+## ys = [ 400*int(rand()) for k in range(8) ]
+## rgb = (1, 0, 0)
+## pnts = zip( xs, ys )
+## o.draw_polygon( gc, rgb, pnts )
+## o.draw_polygon( gc, None, pnts )
+
+## for j in range( 50 ):
+## x = [ 400*int(rand()) for k in range(4) ]
+## y = [ 400*int(rand()) for k in range(4) ]
+## o.draw_lines( gc, x, y )
+
+## for j in range( 50 ):
+## args = [ 400*int(rand()) for k in range(4) ]
+## rgb = (1, 0, 0)
+## o.draw_rectangle( gc, rgb, *args )
+
+## if 1: # add text
+## font = FT2Font( fontname )
+## font.clear()
+## font.set_text( 'hi mom', 60 )
+## font.set_size( 12, 72 )
+## o.draw_text_image( font.get_image(), 30, 40, gc )
+
+## fname = "agg_memleak_%05d.png"
+## o.write_png( fname % i )
+## val = report_memory( i )
+## if i==1: start = val
+
+## end = val
+## avgMem = (end - start) / float(N)
+## print 'Average memory consumed per loop: %1.4f\n' % (avgMem)
+
+## #TODO: Verify the expected mem usage and approximate tolerance that should be used
+## #self.checkClose( 0.32, avgMem, absTol = 0.1 )
+
+## # w/o text and w/o write_png: Average memory consumed per loop: 0.02
+## # w/o text and w/ write_png : Average memory consumed per loop: 0.3400
+## # w/ text and w/ write_png : Average memory consumed per loop: 0.32
Deleted: trunk/matplotlib/test/test_backends/TestAgg.py
===================================================================
--- trunk/matplotlib/test/test_backends/TestAgg.py 2009-09-07 20:05:29 UTC (rev 7695)
+++ trunk/matplotlib/test/test_backends/TestAgg.py 2009-09-07 20:05:42 UTC (rev 7696)
@@ -1,106 +0,0 @@
-#=======================================================================
-"""The Agg backend unit-test class implementation."""
-#=======================================================================
-
-from mplTest import *
-
-#=======================================================================
-# Add import modules below.
-# import matplotlib
-# matplotlib.use( "Agg", warn = False )
-
-import sys, time, os
-from matplotlib.ft2font import FT2Font
-from numpy.random import rand
-from matplotlib.backend_bases import GraphicsContextBase
-from matplotlib.backends._backend_agg import RendererAgg
-
-#
-#=======================================================================
-
-#=======================================================================
-def report_memory(i):
- pid = os.getpid()
- a2 = os.popen('ps -p %d -o rss,sz' % pid).readlines()
- print i, ' ', a2[1],
- return int(a2[1].split()[0])
-
-#=======================================================================
-class TestAgg( MplTestCase ):
- """Agg backend unit test class."""
-
- # Uncomment any appropriate tags
- tags = [
- # 'gui', # requires the creation of a gui window
- 'agg', # uses agg in the backend
- 'agg-only', # uses only agg in the backend
- # 'wx', # uses wx in the backend
- # 'qt', # uses qt in the backend
- # 'ps', # uses the postscript backend
- # 'units', # uses units in the test
- # 'PIL', # uses PIL for image comparison
- ]
-
- #--------------------------------------------------------------------
- def setUp( self ):
- """Setup any data needed for the unit test."""
- pass
-
- #--------------------------------------------------------------------
- def tearDown( self ):
- """Clean-up any generated files here."""
- pass
-
- #--------------------------------------------------------------------
- def DISABLED_memleak( self ):
- """Test agg backend for memory leaks."""
-
- fontname = '/usr/local/share/matplotlib/Vera.ttf'
- fname = self.outFile( "agg_memleak_%05d.png" )
-
- N = 200
- for i in range( N ):
- gc = GraphicsContextBase()
- gc.set_clip_rectangle( [20, 20, 20, 20] )
- o = RendererAgg( 400, 400, 72 )
-
- for j in range( 50 ):
- xs = [ 400*int(rand()) for k in range(8) ]
- ys = [ 400*int(rand()) for k in range(8) ]
- rgb = (1, 0, 0)
- pnts = zip( xs, ys )
- o.draw_polygon( gc, rgb, pnts )
- o.draw_polygon( gc, None, pnts )
-
- for j in range( 50 ):
- x = [ 400*int(rand()) for k in range(4) ]
- y = [ 400*int(rand()) for k in range(4) ]
- o.draw_lines( gc, x, y )
-
- for j in range( 50 ):
- args = [ 400*int(rand()) for k in range(4) ]
- rgb = (1, 0, 0)
- o.draw_rectangle( gc, rgb, *args )
-
- if 1: # add text
- font = FT2Font( fontname )
- font.clear()
- font.set_text( 'hi mom', 60 )
- font.set_size( 12, 72 )
- o.draw_text_image( font.get_image(), 30, 40, gc )
-
-
- o.write_png( fname % i )
- val = report_memory( i )
- if i==1: start = val
-
- end = val
- avgMem = (end - start) / float(N)
- print 'Average memory consumed per loop: %1.4f\n' % (avgMem)
-
- #TODO: Verify the expected mem usage and approximate tolerance that should be used
- self.checkClose( 0.32, avgMem, absTol = 0.1 )
-
- # w/o text and w/o write_png: Average memory consumed per loop: 0.02
- # w/o text and w/ write_png : Average memory consumed per loop: 0.3400
- # w/ text and w/ write_png : Average memory consumed per loop: 0.32
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <as...@us...> - 2009-09-07 20:06:04
|
Revision: 7697
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7697&view=rev
Author: astraw
Date: 2009-09-07 20:05:54 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
test conversion: move old-style test to new-style test
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/__init__.py
Added Paths:
-----------
trunk/matplotlib/lib/matplotlib/tests/test_cbook.py
Removed Paths:
-------------
trunk/matplotlib/test/test_matplotlib/TestCookbook.py
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-07 20:05:42 UTC (rev 7696)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-07 20:05:54 UTC (rev 7697)
@@ -879,6 +879,7 @@
default_test_modules = [
'matplotlib.tests.test_agg',
'matplotlib.tests.test_basic',
+ 'matplotlib.tests.test_cbook',
'matplotlib.tests.test_transforms',
'matplotlib.tests.test_axes',
'matplotlib.tests.test_dates',
Added: trunk/matplotlib/lib/matplotlib/tests/test_cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/tests/test_cbook.py (rev 0)
+++ trunk/matplotlib/lib/matplotlib/tests/test_cbook.py 2009-09-07 20:05:54 UTC (rev 7697)
@@ -0,0 +1,14 @@
+import numpy as np
+import matplotlib.cbook as cbook
+from nose.tools import assert_equal
+
+def test_is_string_like():
+ y = np.arange( 10 )
+ assert_equal( cbook.is_string_like( y ), False )
+ y.shape = 10, 1
+ assert_equal( cbook.is_string_like( y ), False )
+ y.shape = 1, 10
+ assert_equal( cbook.is_string_like( y ), False )
+
+ assert cbook.is_string_like( "hello world" )
+ assert_equal( cbook.is_string_like(10), False )
Deleted: trunk/matplotlib/test/test_matplotlib/TestCookbook.py
===================================================================
--- trunk/matplotlib/test/test_matplotlib/TestCookbook.py 2009-09-07 20:05:42 UTC (rev 7696)
+++ trunk/matplotlib/test/test_matplotlib/TestCookbook.py 2009-09-07 20:05:54 UTC (rev 7697)
@@ -1,59 +0,0 @@
-#=======================================================================
-"""The Cookbook unit-test class implementation."""
-#=======================================================================
-
-from mplTest import *
-
-#=======================================================================
-# Add import modules below.
-import matplotlib
-matplotlib.use( "Agg", warn = False )
-
-import numpy as npy
-import matplotlib.cbook as cbook
-#
-#=======================================================================
-
-#=======================================================================
-class TestCookbook( MplTestCase ):
- """Cookbook unit test class."""
-
- # Uncomment any appropriate tags
- tags = [
- # 'gui', # requires the creation of a gui window
- # 'agg', # uses agg in the backend
- # 'agg-only', # uses only agg in the backend
- # 'wx', # uses wx in the backend
- # 'qt', # uses qt in the backend
- # 'ps', # uses the postscript backend
- # 'units', # uses units in the test
- # 'PIL', # uses PIL for image comparison
- ]
-
- #--------------------------------------------------------------------
- def setUp( self ):
- """Setup any data needed for the unit test."""
- pass
-
- #--------------------------------------------------------------------
- def tearDown( self ):
- """Clean-up any generated files here."""
- pass
-
- #--------------------------------------------------------------------
- def test_is_string_like( self ):
- """Test the 'is_string_like cookbook' function."""
- y = npy.arange( 10 )
- self.failUnless( cbook.is_string_like( y ) == False )
- y.shape = 10, 1
- self.failUnless( cbook.is_string_like( y ) == False )
- y.shape = 1, 10
- self.failUnless( cbook.is_string_like( y ) == False )
-
-
- self.failUnless( cbook.is_string_like( "hello world" ) )
- self.failUnless( cbook.is_string_like(10) == False )
-
- #--------------------------------------------------------------------
- #TODO: More cookbook tests
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-09-07 22:40:06
|
Revision: 7704
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7704&view=rev
Author: leejjoon
Date: 2009-09-07 22:39:44 +0000 (Mon, 07 Sep 2009)
Log Message:
-----------
Merged revisions 7703 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7703 | leejjoon | 2009-09-07 18:29:04 -0400 (Mon, 07 Sep 2009) | 1 line
fix a bug in lib/matplotlib/bezier.py
........
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/bezier.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/v0_99_maint:1-7633,7638 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253
+ /branches/mathtex:1-7263 /branches/v0_99_maint:1-7703 /branches/v0_98_5_maint:1-7253
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Modified: trunk/matplotlib/lib/matplotlib/bezier.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/bezier.py 2009-09-07 22:29:04 UTC (rev 7703)
+++ trunk/matplotlib/lib/matplotlib/bezier.py 2009-09-07 22:39:44 UTC (rev 7704)
@@ -474,7 +474,7 @@
"""
c = p.codes
if c is None:
- c = np.empty(p.vertices.shape, "i")
+ c = np.empty(p.vertices.shape[:1], "i")
c.fill(Path.LINETO)
c[0] = Path.MOVETO
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2009-09-08 15:17:38
|
Revision: 7712
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7712&view=rev
Author: mdboom
Date: 2009-09-08 15:17:20 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
Add an rcParam for hinting, and set it to False when running tests.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
trunk/matplotlib/lib/matplotlib/config/mplconfig.py
trunk/matplotlib/lib/matplotlib/config/rcsetup.py
trunk/matplotlib/lib/matplotlib/mathtext.py
trunk/matplotlib/lib/matplotlib/rcsetup.py
trunk/matplotlib/lib/matplotlib/text.py
trunk/matplotlib/matplotlibrc.template
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-08 15:17:20 UTC (rev 7712)
@@ -893,6 +893,8 @@
from testing.noseclasses import KnownFailure
from nose.plugins.manager import PluginManager
use('Agg') # use Agg backend for these tests
+ rcParams['font.family'] = 'Bitstream Vera Sans'
+ rcParams['text.hinting'] = False
plugins = []
plugins.append( KnownFailure() )
plugins.extend( [plugin() for plugin in nose.plugins.builtin.plugins] )
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_agg.py 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_agg.py 2009-09-08 15:17:20 UTC (rev 7712)
@@ -30,7 +30,7 @@
from matplotlib.cbook import is_string_like, maxdict
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont
-from matplotlib.ft2font import FT2Font, LOAD_FORCE_AUTOHINT
+from matplotlib.ft2font import FT2Font, LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING
from matplotlib.mathtext import MathTextParser
from matplotlib.path import Path
from matplotlib.transforms import Bbox, BboxBase
@@ -69,6 +69,12 @@
if __debug__: verbose.report('RendererAgg.__init__ done',
'debug-annoying')
+ def _get_hinting_flag(self):
+ if rcParams['text.hinting']:
+ return LOAD_FORCE_AUTOHINT
+ else:
+ return LOAD_NO_HINTING
+
def draw_markers(self, *kl, **kw):
# for filtering to work with rastrization, methods needs to be wrapped.
# maybe there is better way to do it.
@@ -132,14 +138,15 @@
if ismath:
return self.draw_mathtext(gc, x, y, s, prop, angle)
+ flags = self._get_hinting_flag()
font = self._get_agg_font(prop)
if font is None: return None
if len(s) == 1 and ord(s) > 127:
- font.load_char(ord(s), flags=LOAD_FORCE_AUTOHINT)
+ font.load_char(ord(s), flags=flags)
else:
# We pass '0' for angle here, since it will be rotated (in raster
# space) in the following call to draw_text_image).
- font.set_text(s, 0, flags=LOAD_FORCE_AUTOHINT)
+ font.set_text(s, 0, flags=flags)
font.draw_glyphs_to_bitmap()
#print x, y, int(x), int(y), s
@@ -168,8 +175,10 @@
ox, oy, width, height, descent, fonts, used_characters = \
self.mathtext_parser.parse(s, self.dpi, prop)
return width, height, descent
+
+ flags = self._get_hinting_flag()
font = self._get_agg_font(prop)
- font.set_text(s, 0.0, flags=LOAD_FORCE_AUTOHINT) # the width and height of unrotated string
+ font.set_text(s, 0.0, flags=flags) # the width and height of unrotated string
w, h = font.get_width_height()
d = font.get_descent()
w /= 64.0 # convert from subpixels
Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2009-09-08 15:17:20 UTC (rev 7712)
@@ -154,6 +154,7 @@
class text(TConfig):
color = T.Trait('black',mplT.ColorHandler())
usetex = T.false
+ hinting = T.true
class latex(TConfig):
unicode = T.false
@@ -338,6 +339,7 @@
'text.latex.unicode' : (self.tconfig.text.latex, 'unicode'),
'text.latex.preamble' : (self.tconfig.text.latex, 'preamble'),
'text.dvipnghack' : (self.tconfig.text.latex, 'dvipnghack'),
+ 'text.hinting' : (self.tconfig.text, 'hinting'),
'mathtext.cal' : (self.tconfig.mathtext, 'cal'),
'mathtext.rm' : (self.tconfig.mathtext, 'rm'),
Modified: trunk/matplotlib/lib/matplotlib/config/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/rcsetup.py 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/lib/matplotlib/config/rcsetup.py 2009-09-08 15:17:20 UTC (rev 7712)
@@ -361,6 +361,7 @@
'text.fontvariant' : ['normal', str],
'text.fontweight' : ['normal', str],
'text.fontsize' : ['medium', validate_fontsize],
+ 'text.hinting' : [True, validate_bool],
'mathtext.cal' : ['cursive', validate_font_properties],
'mathtext.rm' : ['serif', validate_font_properties],
Modified: trunk/matplotlib/lib/matplotlib/mathtext.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mathtext.py 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/lib/matplotlib/mathtext.py 2009-09-08 15:17:20 UTC (rev 7712)
@@ -222,7 +222,10 @@
self.fonts_object.get_used_characters())
def get_hinting_type(self):
- return LOAD_FORCE_AUTOHINT
+ if rcParams['text.hinting']:
+ return LOAD_FORCE_AUTOHINT
+ else:
+ return LOAD_NO_HINTING
def MathtextBackendAgg():
return MathtextBackendBbox(MathtextBackendAggRender())
Modified: trunk/matplotlib/lib/matplotlib/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/rcsetup.py 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/lib/matplotlib/rcsetup.py 2009-09-08 15:17:20 UTC (rev 7712)
@@ -404,6 +404,7 @@
'text.fontvariant' : ['normal', str],
'text.fontweight' : ['normal', str],
'text.fontsize' : ['medium', validate_fontsize],
+ 'text.hinting' : [True, validate_bool],
'mathtext.cal' : ['cursive', validate_font_properties],
'mathtext.rm' : ['serif', validate_font_properties],
Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/lib/matplotlib/text.py 2009-09-08 15:17:20 UTC (rev 7712)
@@ -25,7 +25,7 @@
from matplotlib.path import Path
import matplotlib.font_manager as font_manager
-from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, LOAD_NO_HINTING
+from matplotlib.ft2font import FT2Font
def _process_text_args(override, fontdict=None, **kwargs):
Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template 2009-09-08 15:13:33 UTC (rev 7711)
+++ trunk/matplotlib/matplotlibrc.template 2009-09-08 15:17:20 UTC (rev 7712)
@@ -167,6 +167,9 @@
# In that case, all text will be sent to TeX for
# processing.
+#text.hinting : True # If True, text will be hinted, otherwise not. This only
+ # affects the Agg backend.
+
# The following settings allow you to select the fonts in math mode.
# They map from a TeX font name to a fontconfig font pattern.
# These settings are only used if mathtext.fontset is 'custom'.
@@ -290,7 +293,7 @@
# A value of 20000 is probably a good
# starting point.
### SAVING FIGURES
-#path.simplify : False # When True, simplify paths by removing "invisible"
+#path.simplify : False # When True, simplify paths by removing "invisible"
# points to reduce file size and increase rendering
# speed
#path.simplify_threshold : 0.1 # The threshold of similarity below which
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-09-08 15:23:09
|
Revision: 7713
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7713&view=rev
Author: jdh2358
Date: 2009-09-08 15:23:02 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
add test_image to default suite
Modified Paths:
--------------
trunk/matplotlib/doc/devel/release_guide.rst
trunk/matplotlib/lib/matplotlib/__init__.py
Modified: trunk/matplotlib/doc/devel/release_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/release_guide.rst 2009-09-08 15:17:20 UTC (rev 7712)
+++ trunk/matplotlib/doc/devel/release_guide.rst 2009-09-08 15:23:02 UTC (rev 7713)
@@ -122,7 +122,7 @@
sftp> put matplotlib-0.98.2.tar.gz
Uploading matplotlib-0.98.2.tar.gz to /incoming/j/jd/jdh2358/uploads/matplotlib-0.98.2.tar.gz
-* go https://sourceforge.net/project/admin/editpackages.php?group_id=80706 and do a
+* go https://sourceforge.net/project/admin/explorer.php?group_id=80706 and do a
file release. Click on the "Admin" tab to log in as an admin, and
then the "File Releases" tab. Go to the bottom and click "add
release" and enter the package name but not the version number in
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-08 15:17:20 UTC (rev 7712)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-08 15:23:02 UTC (rev 7713)
@@ -884,6 +884,7 @@
'matplotlib.tests.test_axes',
'matplotlib.tests.test_dates',
'matplotlib.tests.test_spines',
+ 'matplotlib.tests.test_image',
]
def test(verbosity=0):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-09-08 17:43:08
|
Revision: 7721
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7721&view=rev
Author: leejjoon
Date: 2009-09-08 17:42:58 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
AxesGrid: implemented axisline style
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py
Added Paths:
-----------
trunk/matplotlib/examples/axes_grid/demo_axisline_style.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axisline_style.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2009-09-08 17:42:47 UTC (rev 7720)
+++ trunk/matplotlib/CHANGELOG 2009-09-08 17:42:58 UTC (rev 7721)
@@ -1,3 +1,6 @@
+2009-09-07 AxesGrid : implemented axisline style.
+ Added a demo examples/axes_grid/demo_axisline_style.py- JJL
+
2009-09-04 Make the textpath class as a separate moduel
(textpath.py). Add support for mathtext and tex.- JJL
Added: trunk/matplotlib/examples/axes_grid/demo_axisline_style.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axisline_style.py (rev 0)
+++ trunk/matplotlib/examples/axes_grid/demo_axisline_style.py 2009-09-08 17:42:58 UTC (rev 7721)
@@ -0,0 +1,21 @@
+
+from mpl_toolkits.axes_grid.axislines import SubplotZero
+import matplotlib.pyplot as plt
+import numpy as np
+
+if __name__ == "__main__":
+ fig = plt.figure(1)
+ ax = SubplotZero(fig, 111)
+ fig.add_subplot(ax)
+
+ for direction in ["xzero", "yzero"]:
+ ax.axis[direction].set_axisline_style("->")
+ ax.axis[direction].set_visible(True)
+
+ for direction in ["left", "right", "bottom", "top"]:
+ ax.axis[direction].set_visible(False)
+
+ x = np.linspace(-0.5, 1., 100)
+ ax.plot(x, np.sin(x*np.pi))
+
+ plt.show()
Added: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axisline_style.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axisline_style.py (rev 0)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axisline_style.py 2009-09-08 17:42:58 UTC (rev 7721)
@@ -0,0 +1,148 @@
+from matplotlib.patches import _Style, FancyArrowPatch
+from matplotlib.transforms import IdentityTransform
+from matplotlib.path import Path
+import numpy as np
+
+class AxislineStyle(_Style):
+ """
+ :class:`AxislineStyle` is a container class which defines style classes
+ for AxisArtists.
+
+ An instance of any axisline style class is an callable object,
+ whose call signature is ::
+
+ __call__(self, axis_artist, path, transform)
+
+ When called, this should return a mpl artist with following
+ methods implemented. ::
+
+ def set_path(self, path):
+ # set the path for axisline.
+
+ def set_line_mutation_scale(self, scale):
+ # set the scale
+
+ def draw(self, renderer):
+ # draw
+
+
+ """
+
+ _style_list = {}
+
+
+ class _Base(object):
+ # The derived classes are required to be able to be initialized
+ # w/o arguments, i.e., all its argument (except self) must have
+ # the default values.
+
+ def __init__(self):
+ """
+ initializtion.
+ """
+ super(AxislineStyle._Base, self).__init__()
+
+
+
+
+ def __call__(self, axis_artist, transform):
+ """
+ Given the AxisArtist instance, and transform for the path
+ (set_path method), return the mpl artist for drawing the axis line.
+ """
+
+ return self.new_line(axis_artist, transform)
+
+
+ class SimpleArrow(_Base):
+ """
+ A simple arrow.
+ """
+
+
+ class ArrowAxisline(FancyArrowPatch):
+ """
+ The artist class that will be returend for SimpleArrow style.
+ """
+ def __init__(self, axis_artist, line_path, transform,
+ line_mutation_scale):
+ self._axis_artist = axis_artist
+ self._line_transform = transform
+ self._line_path = line_path
+ self._line_mutation_scale = line_mutation_scale
+
+ FancyArrowPatch.__init__(self,
+ path=self._line_path,
+ arrowstyle="->",
+ arrow_transmuter=None,
+ patchA=None,
+ patchB=None,
+ shrinkA=0.,
+ shrinkB=0.,
+ mutation_scale=line_mutation_scale,
+ mutation_aspect=None,
+ transform=IdentityTransform(),
+ )
+
+ def set_line_mutation_scale(self, scale):
+ self.set_mutation_scale(scale*self._line_mutation_scale)
+
+ def _extend_path(self, path, mutation_size=10):
+ """
+ Extend the path to make a room for drawing arrow.
+ """
+ from matplotlib.bezier import get_cos_sin
+
+ x0, y0 = path.vertices[-2]
+ x1, y1 = path.vertices[-1]
+ cost, sint = get_cos_sin(x0, y0, x1, y1)
+
+ d = mutation_size * 1.
+ x2, y2 = x1 + cost*d, y1+sint*d
+
+ if path.codes is None:
+ _path = Path(np.concatenate([path.vertices, [[x2, y2]]]))
+ else:
+ _path = Path(np.concatenate([path.vertices, [[x2, y2]]]),
+ np.concatenate([path.codes, [Path.LINETO]]))
+
+ return _path
+
+ def set_path(self, path):
+ self._line_path = path
+
+ def draw(self, renderer):
+ """
+ Draw the axis line.
+ 1) transform the path to the display cooridnate.
+ 2) extend the path to make a room for arrow
+ 3) update the path of the FancyArrowPatch.
+ 4) draw
+ """
+ path_in_disp = self._line_transform.transform_path(self._line_path)
+ mutation_size = self.get_mutation_scale() #line_mutation_scale()
+ extented_path = self._extend_path(path_in_disp,
+ mutation_size=mutation_size)
+
+ self._path_original = extented_path
+ FancyArrowPatch.draw(self, renderer)
+
+
+ def __init__(self, size=1):
+ """
+ *size*
+ size of the arrow as a fraction of the ticklabel size.
+ """
+
+ self.size = size
+ super(AxislineStyle.SimpleArrow, self).__init__()
+
+ def new_line(self, axis_artist, transform):
+
+ linepath = Path([(0,0), (0, 1)])
+ axisline = self.ArrowAxisline(axis_artist, linepath, transform,
+ line_mutation_scale=self.size)
+ return axisline
+
+
+ _style_list["->"] = SimpleArrow
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py 2009-09-08 17:42:47 UTC (rev 7720)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py 2009-09-08 17:42:58 UTC (rev 7721)
@@ -63,9 +63,9 @@
import matplotlib.lines as mlines
+from axisline_style import AxislineStyle
-
class BezierPath(mlines.Line2D):
def __init__(self, path, *kl, **kw):
@@ -184,6 +184,8 @@
"""
self.label_direction = label_direction
+ self.delta1, self.delta2 = 0.00001, 0.00001
+
def update_lim(self, axes):
pass
@@ -463,8 +465,8 @@
# check if the tick point is inside axes
c2 = tr2ax.transform_point(c)
- delta=0.00001
- if 0. -delta<= c2[self.nth_coord] <= 1.+delta:
+ #delta=0.00001
+ if 0. -self.delta1<= c2[self.nth_coord] <= 1.+self.delta2:
yield c, angle, l
return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
@@ -551,7 +553,8 @@
c[self.nth_coord] = x
c1, c2 = tr2ax.transform_point(c)
if 0. <= c1 <= 1. and 0. <= c2 <= 1.:
- yield c, angle, l
+ if 0. - self.delta1 <= [c1, c2][self.nth_coord] <= 1. + self.delta2:
+ yield c, angle, l
return _f(majorLocs, majorLabels), _f(minorLocs, minorLabels)
@@ -964,6 +967,8 @@
if minor_tick_pad is None:
self.minor_tick_pad = rcParams['%s.minor.pad'%axis_name]
+ self._axisline_style = None
+
self._init_line()
self._init_ticks()
self._init_offsetText(self._axis_artist_helper.label_direction)
@@ -973,6 +978,7 @@
self._rotate_label_along_line = False
+
def set_rotate_label_along_line(self, b):
self._rotate_label_along_line = b
@@ -986,16 +992,61 @@
return self._axis_artist_helper
+ def set_axisline_style(self, axisline_style=None, **kw):
+ """
+ Set the axisline style.
+
+ *axislin_style* can be a string with axisline style name with optional
+ comma-separated attributes. Alternatively, the attrs can
+ be provided as keywords.
+
+ set_arrowstyle("->,size=1.5")
+ set_arrowstyle("->", size=1.5)
+
+ Old attrs simply are forgotten.
+
+ Without argument (or with arrowstyle=None), return
+ available styles as a list of strings.
+ """
+
+ if axisline_style==None:
+ return AxislineStyle.pprint_styles()
+
+ if isinstance(axisline_style, AxislineStyle._Base):
+ self._axisline_style = axisline_style
+ else:
+ self._axisline_style = AxislineStyle(axisline_style, **kw)
+
+
+ self._init_line()
+
+
+ def get_axisline_style(self):
+ """
+ return the current axisline style.
+ """
+ return self._axisline_style
+
def _init_line(self):
+ """
+ Initialize the *line* artist that is responsible to draw the axis line.
+ """
tran = self._axis_artist_helper.get_line_transform(self.axes) \
+ self.offset_transform
- self.line = BezierPath(self._axis_artist_helper.get_line(self.axes),
- color=rcParams['axes.edgecolor'],
- linewidth=rcParams['axes.linewidth'],
- transform=tran)
+ axisline_style = self.get_axisline_style()
+ if axisline_style is None:
+ self.line = BezierPath(self._axis_artist_helper.get_line(self.axes),
+ color=rcParams['axes.edgecolor'],
+ linewidth=rcParams['axes.linewidth'],
+ transform=tran)
+ else:
+ self.line = axisline_style(self, transform=tran)
+
def _draw_line(self, renderer):
self.line.set_path(self._axis_artist_helper.get_line(self.axes))
+ if self.get_axisline_style() is not None:
+ self.line.set_line_mutation_scale(self.major_ticklabels.get_size())
self.line.draw(renderer)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2009-09-09 20:01:14
|
Revision: 7729
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7729&view=rev
Author: mdboom
Date: 2009-09-09 20:01:03 +0000 (Wed, 09 Sep 2009)
Log Message:
-----------
Some more work on creating a "clean" rcParams environment for running tests.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/font_manager.py
trunk/matplotlib/test/matplotlibrc
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-09 19:55:52 UTC (rev 7728)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2009-09-09 20:01:03 UTC (rev 7729)
@@ -894,16 +894,20 @@
from testing.noseclasses import KnownFailure
from nose.plugins.manager import PluginManager
+ # Store the current backend and all rcParams for restoration later
backend = rcParams['backend']
+ original_params = rcParams.copy()
use('Agg') # use Agg backend for these tests
- # store the old values before overriding
- overrides = 'font.family', 'text.hinting'
- stored = dict([(k, rcParams[k]) for k in overrides])
-
+ # These settings *must* be hardcoded for running the comparison
+ # tests and are not necessarily the default values as specified in
+ # rcsetup.py
+ rcdefaults() # Start with all defaults
rcParams['font.family'] = 'Bitstream Vera Sans'
rcParams['text.hinting'] = False
+
+ # store the old values before overriding
plugins = []
plugins.append( KnownFailure() )
plugins.extend( [plugin() for plugin in nose.plugins.builtin.plugins] )
@@ -914,11 +918,10 @@
success = nose.run( defaultTest=default_test_modules,
config=config,
)
- # restore the old rc values
- rcParams.update(stored)
- # restore the old backend
+ # restore the old backend and rcParams
use(backend)
+ rcParams.update(original_params)
return success
test.__test__ = False # nose: this function is not a test
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py 2009-09-09 19:55:52 UTC (rev 7728)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py 2009-09-09 20:01:03 UTC (rev 7729)
@@ -642,8 +642,7 @@
The preferred usage of font sizes is to use the relative values,
e.g. 'large', instead of absolute font sizes, e.g. 12. This
approach allows all text sizes to be made larger or smaller based
- on the font manager's default font size, i.e. by using the
- :meth:`FontManager.set_default_size` method.
+ on the font manager's default font size.
This class will also accept a `fontconfig
<http://www.fontconfig.org/>`_ pattern, if it is the only argument
@@ -1022,9 +1021,7 @@
"""
Return the default font size.
"""
- if self.default_size is None:
- return rcParams['font.size']
- return self.default_size
+ return rcParams['font.size']
def set_default_weight(self, weight):
"""
@@ -1032,13 +1029,6 @@
"""
self.__default_weight = weight
- def set_default_size(self, size):
- """
- Set the default font size in points. The initial value is set
- by ``font.size`` in rc.
- """
- self.default_size = size
-
def update_fonts(self, filenames):
"""
Update the font dictionary with new font files.
Modified: trunk/matplotlib/test/matplotlibrc
===================================================================
--- trunk/matplotlib/test/matplotlibrc 2009-09-09 19:55:52 UTC (rev 7728)
+++ trunk/matplotlib/test/matplotlibrc 2009-09-09 20:01:03 UTC (rev 7729)
@@ -1,3 +1,3 @@
backend : Agg
-font.family : sans-serif
-font.sans-serif : Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
+font.family : Bitstream Vera Sans
+text.hinting : True
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-09-10 23:22:53
|
Revision: 7735
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7735&view=rev
Author: leejjoon
Date: 2009-09-10 23:22:40 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Merged revisions 7727-7728,7734 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7727 | ryanmay | 2009-09-09 14:41:43 -0400 (Wed, 09 Sep 2009) | 1 line
Include 'top' keyword argument in docstring for Figure.subplots_adjust().
........
r7728 | mdboom | 2009-09-09 15:55:52 -0400 (Wed, 09 Sep 2009) | 2 lines
Fix some documentation warnings.
........
r7734 | leejjoon | 2009-09-10 19:01:28 -0400 (Thu, 10 Sep 2009) | 1 line
fix a bug in Line2D.draw method that produces invalid svg when the line is invisible
........
Modified Paths:
--------------
trunk/matplotlib/doc/api/spine_api.rst
trunk/matplotlib/doc/mpl_toolkits/mplot3d/tutorial.rst
trunk/matplotlib/doc/users/image_tutorial.rst
trunk/matplotlib/doc/users/index.rst
trunk/matplotlib/doc/users/pyplot_tutorial.rst
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/figure.py
trunk/matplotlib/lib/matplotlib/lines.py
trunk/matplotlib/lib/matplotlib/mlab.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_99_maint:1-7703 /branches/v0_98_5_maint:1-7253
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7734
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Modified: trunk/matplotlib/doc/api/spine_api.rst
===================================================================
--- trunk/matplotlib/doc/api/spine_api.rst 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/doc/api/spine_api.rst 2009-09-10 23:22:40 UTC (rev 7735)
@@ -6,7 +6,7 @@
:mod:`matplotlib.spine`
========================
-.. automodule:: matplotlib.spine
+.. automodule:: matplotlib.spines
:members:
:undoc-members:
:show-inheritance:
Modified: trunk/matplotlib/doc/mpl_toolkits/mplot3d/tutorial.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/mplot3d/tutorial.rst 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/doc/mpl_toolkits/mplot3d/tutorial.rst 2009-09-10 23:22:40 UTC (rev 7735)
@@ -55,7 +55,7 @@
Polygon plots
====================
-.. automethod:: add_collection3d
+.. automethod:: Axes3D.add_collection3d
.. plot:: mpl_examples/mplot3d/polys3d_demo.py
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Modified: trunk/matplotlib/doc/users/image_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/image_tutorial.rst 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/doc/users/image_tutorial.rst 2009-09-10 23:22:40 UTC (rev 7735)
@@ -10,17 +10,20 @@
Startup commands
===================
-At the very least, you'll need to have access to the :func:`~matplotlib.pyplot.imshow` function. There are a couple of ways to do it. The easy way for an interactive environment::
+At the very least, you'll need to have access to the
+:func:`~matplotlib.pyplot.imshow` function. There are a couple of
+ways to do it. The easy way for an interactive environment::
- $ipython -pylab
-
+ $ipython -pylab
+
The imshow function is now directly accessible (it's in your
`namespace <http://bytebaker.com/2008/07/30/python-namespaces/>`_).
See also :ref:`pyplot-tutorial`.
The more expressive, easier to understand later method (use this in
your scripts to make it easier for others (including your future self)
-to read) is to use the matplotlib API (see :ref:`artist-tutorial`) where you use explicit namespaces and control object creation, etc...
+to read) is to use the matplotlib API (see :ref:`artist-tutorial`)
+where you use explicit namespaces and control object creation, etc...
.. sourcecode:: ipython
@@ -28,16 +31,22 @@
In [2]: import matplotlib.image as mpimg
In [3]: import numpy as np
-Examples below will use the latter method, for clarity. In these examples, if you use the -pylab method, you can skip the "mpimg." and "plt." prefixes.
+Examples below will use the latter method, for clarity. In these
+examples, if you use the -pylab method, you can skip the "mpimg." and
+"plt." prefixes.
.. _importing_data:
Importing image data into Numpy arrays
===============================================
-Plotting image data is supported by the Python Image Library (`PIL <http://www.pythonware.com/products/pil/>`_), . Natively, matplotlib only supports PNG images. The commands shown below fall back on PIL if the native read fails.
+Plotting image data is supported by the Python Image Library (`PIL
+<http://www.pythonware.com/products/pil/>`_), . Natively, matplotlib
+only supports PNG images. The commands shown below fall back on PIL
+if the native read fails.
-The image used in this example is a PNG file, but keep that PIL requirement in mind for your own data.
+The image used in this example is a PNG file, but keep that PIL
+requirement in mind for your own data.
Here's the image we're going to play with:
@@ -55,11 +64,11 @@
.. sourcecode:: ipython
In [4]: img=mpimg.imread('stinkbug.png')
- Out[4]:
+ Out[4]:
array([[[ 0.40784314, 0.40784314, 0.40784314],
[ 0.40784314, 0.40784314, 0.40784314],
[ 0.40784314, 0.40784314, 0.40784314],
- ...,
+ ...,
[ 0.42745098, 0.42745098, 0.42745098],
[ 0.42745098, 0.42745098, 0.42745098],
[ 0.42745098, 0.42745098, 0.42745098]],
@@ -67,7 +76,7 @@
[[ 0.41176471, 0.41176471, 0.41176471],
[ 0.41176471, 0.41176471, 0.41176471],
[ 0.41176471, 0.41176471, 0.41176471],
- ...,
+ ...,
[ 0.42745098, 0.42745098, 0.42745098],
[ 0.42745098, 0.42745098, 0.42745098],
[ 0.42745098, 0.42745098, 0.42745098]],
@@ -75,16 +84,16 @@
[[ 0.41960785, 0.41960785, 0.41960785],
[ 0.41568628, 0.41568628, 0.41568628],
[ 0.41568628, 0.41568628, 0.41568628],
- ...,
+ ...,
[ 0.43137255, 0.43137255, 0.43137255],
[ 0.43137255, 0.43137255, 0.43137255],
[ 0.43137255, 0.43137255, 0.43137255]],
- ...,
+ ...,
[[ 0.43921569, 0.43921569, 0.43921569],
[ 0.43529412, 0.43529412, 0.43529412],
[ 0.43137255, 0.43137255, 0.43137255],
- ...,
+ ...,
[ 0.45490196, 0.45490196, 0.45490196],
[ 0.4509804 , 0.4509804 , 0.4509804 ],
[ 0.4509804 , 0.4509804 , 0.4509804 ]],
@@ -92,7 +101,7 @@
[[ 0.44313726, 0.44313726, 0.44313726],
[ 0.44313726, 0.44313726, 0.44313726],
[ 0.43921569, 0.43921569, 0.43921569],
- ...,
+ ...,
[ 0.4509804 , 0.4509804 , 0.4509804 ],
[ 0.44705883, 0.44705883, 0.44705883],
[ 0.44705883, 0.44705883, 0.44705883]],
@@ -100,26 +109,46 @@
[[ 0.44313726, 0.44313726, 0.44313726],
[ 0.4509804 , 0.4509804 , 0.4509804 ],
[ 0.4509804 , 0.4509804 , 0.4509804 ],
- ...,
+ ...,
[ 0.44705883, 0.44705883, 0.44705883],
[ 0.44705883, 0.44705883, 0.44705883],
[ 0.44313726, 0.44313726, 0.44313726]]], dtype=float32)
-Note the dtype there - float32. Matplotlib has rescaled the 8 bit data from each channel to floating point data between 0.0 and 1.0. As a side note, the only datatype that PIL can work with is uint8. Matplotlib plotting can handle float32 and uint8, but image reading/writing for any format other than PNG is limited to uint8 data. Why 8 bits? Most displays can only render 8 bits per channel worth of color gradation. Why can they only render 8 bits/channel? Because that's about all the human eye can see. More here (from a photography standpoint): `Luminous Landscape bit depth tutorial <http://www.luminous-landscape.com/tutorials/bit-depth.shtml>`_
+Note the dtype there - float32. Matplotlib has rescaled the 8 bit
+data from each channel to floating point data between 0.0 and 1.0. As
+a side note, the only datatype that PIL can work with is uint8.
+Matplotlib plotting can handle float32 and uint8, but image
+reading/writing for any format other than PNG is limited to uint8
+data. Why 8 bits? Most displays can only render 8 bits per channel
+worth of color gradation. Why can they only render 8 bits/channel?
+Because that's about all the human eye can see. More here (from a
+photography standpoint): `Luminous Landscape bit depth tutorial
+<http://www.luminous-landscape.com/tutorials/bit-depth.shtml>`_.
-Each inner list represents a pixel. Here, with an RGB image, there are 3 values. Since it's a black and white image, R, G, and B are all similar. An RGBA (where A is alpha, or transparency), has 4 values per inner list, and a simple luminance image just has one value (and is thus only a 2-D array, not a 3-D array). For RGB and RGBA images, matplotlib supports float32 and uint8 data types. For grayscale, matplotlib supports only float32. If your array data does not meet one of these descriptions, you need to rescale it.
+Each inner list represents a pixel. Here, with an RGB image, there
+are 3 values. Since it's a black and white image, R, G, and B are all
+similar. An RGBA (where A is alpha, or transparency), has 4 values
+per inner list, and a simple luminance image just has one value (and
+is thus only a 2-D array, not a 3-D array). For RGB and RGBA images,
+matplotlib supports float32 and uint8 data types. For grayscale,
+matplotlib supports only float32. If your array data does not meet
+one of these descriptions, you need to rescale it.
.. _plotting_data:
Plotting numpy arrays as images
===================================
-So, you have your data in a numpy array (either by importing it, or by generating it). Let's render it. In Matplotlib, this is performed using the :func:`~matplotlib.pyplot.imshow` function. Here we'll grab the plot object. This object gives you an easy way to manipulate the plot from the prompt.
+So, you have your data in a numpy array (either by importing it, or by
+generating it). Let's render it. In Matplotlib, this is performed
+using the :func:`~matplotlib.pyplot.imshow` function. Here we'll grab
+the plot object. This object gives you an easy way to manipulate the
+plot from the prompt.
.. sourcecode:: ipython
In [5]: imgplot = plt.imshow(img)
-
+
.. plot::
import matplotlib.pyplot as plt
@@ -128,23 +157,31 @@
img = mpimg.imread('_static/stinkbug.png')
imgplot = plt.imshow(img)
-You can also plot any numpy array - just remember that the datatype must be float32 (and range from 0.0 to 1.0) or uint8.
+You can also plot any numpy array - just remember that the datatype
+must be float32 (and range from 0.0 to 1.0) or uint8.
.. _Pseudocolor:
-
+
Applying pseudocolor schemes to image plots
-------------------------------------------------
-Pseudocolor can be a useful tool for enhancing contrast and visualizing your data more easily. This is especially useful when making presentations of your data using projectors - their contrast is typically quite poor.
+Pseudocolor can be a useful tool for enhancing contrast and
+visualizing your data more easily. This is especially useful when
+making presentations of your data using projectors - their contrast is
+typically quite poor.
-Pseudocolor is only relevant to single-channel, grayscale, luminosity images. We currently have an RGB image. Since R, G, and B are all similar (see for yourself above or in your data), we can just pick on channel of our data:
+Pseudocolor is only relevant to single-channel, grayscale, luminosity
+images. We currently have an RGB image. Since R, G, and B are all
+similar (see for yourself above or in your data), we can just pick on
+channel of our data:
.. sourcecode:: ipython
In [6]: lum_img = img[:,:,0]
-
-This is array slicing. You can read more `here <http://www.scipy.org/Tentative_NumPy_Tutorial>`_
-
+
+This is array slicing. You can read more `here
+<http://www.scipy.org/Tentative_NumPy_Tutorial>`_.
+
.. sourcecode:: ipython
In [7]: imgplot = mpimg.imshow(lum_img)
@@ -158,7 +195,11 @@
lum_img = img[:,:,0]
plt.imshow(lum_img)
-Now, with a luminosity image, the default colormap (aka lookup table, LUT), is applied. The default is called jet. There are plenty of others to choose from. Let's set some others using the :meth:`~matplotlib.image.Image.set_cmap` method on our image plot object:
+Now, with a luminosity image, the default colormap (aka lookup table,
+LUT), is applied. The default is called jet. There are plenty of
+others to choose from. Let's set some others using the
+:meth:`~matplotlib.image.Image.set_cmap` method on our image plot
+object:
.. sourcecode:: ipython
@@ -173,11 +214,11 @@
lum_img = img[:,:,0]
imgplot = plt.imshow(lum_img)
imgplot.set_cmap('hot')
-
+
.. sourcecode:: ipython
In [9]: imgplot.set_cmap('spectral')
-
+
.. plot::
import matplotlib.pyplot as plt
@@ -188,18 +229,22 @@
imgplot = plt.imshow(lum_img)
imgplot.set_cmap('spectral')
-There are many other colormap schemes available. See a list and images of the colormaps `here <http://matplotlib.sourceforge.net/examples/pylab_examples/show_colormaps.html>`_
-
+There are many other colormap schemes available. See a list and
+images of the colormaps `here
+<http://matplotlib.sourceforge.net/examples/pylab_examples/show_colormaps.html>`_.
+
.. _Color Bars
Color scale reference
------------------------
-It's helpful to have an idea of what value a color represents. We can do that by adding color bars. It's as easy as one line:
+It's helpful to have an idea of what value a color represents. We can
+do that by adding color bars. It's as easy as one line:
.. sourcecode:: ipython
+
In [10]: plt.colorbar()
-
+
.. plot::
import matplotlib.pyplot as plt
@@ -210,15 +255,22 @@
imgplot = plt.imshow(lum_img)
imgplot.set_cmap('spectral')
plt.colorbar()
-
-This adds a colorbar to your existing figure. This won't automatically change if you change you switch to a different colormap - you have to re-create your plot, and add in the colorbar again.
+This adds a colorbar to your existing figure. This won't
+automatically change if you change you switch to a different
+colormap - you have to re-create your plot, and add in the colorbar
+again.
+
.. _Data ranges
Examining a specific data range
---------------------------------
-Sometimes you want to enhance the contrast in your image, or expand the contrast in a particular region while sacrificing the detail in colors that don't vary much, or don't matter. A good tool to find interesting regions is the histogram. To create a histogram of our image data, we use the :func:`~matplotlib.pyplot.hist` function.
+Sometimes you want to enhance the contrast in your image, or expand
+the contrast in a particular region while sacrificing the detail in
+colors that don't vary much, or don't matter. A good tool to find
+interesting regions is the histogram. To create a histogram of our
+image data, we use the :func:`~matplotlib.pyplot.hist` function.
.. sourcecode:: ipython
@@ -233,7 +285,14 @@
lum_img = img[:,:,0]
plt.hist(lum_img, range=(0.0,1.0))
-Most often, the "interesting" part of the image is around the peak, and you can get extra contrast by clipping the regions above and/or below the peak. In our histogram, it looks like there's not much useful information in the high end (not many white things in the image). Let's adjust the upper limit, so that we effectively "zoom in on" part of the histogram. We do this by calling the :meth:`~matplotlib.image.Image.set_clim` method of the image plot object.
+Most often, the "interesting" part of the image is around the peak,
+and you can get extra contrast by clipping the regions above and/or
+below the peak. In our histogram, it looks like there's not much
+useful information in the high end (not many white things in the
+image). Let's adjust the upper limit, so that we effectively "zoom in
+on" part of the histogram. We do this by calling the
+:meth:`~matplotlib.image.Image.set_clim` method of the image plot
+object.
.. sourcecode:: ipython
@@ -249,8 +308,8 @@
img = mpimg.imread('_static/stinkbug.png')
lum_img = img[:,:,0]
imgplot = plt.imshow(lum_img)
- a.set_title('Before')
- plt.colorbar(ticks=[0.1,0.3,0.5,0.7], orientation ='horizontal')
+ a.set_title('Before')
+ plt.colorbar(ticks=[0.1,0.3,0.5,0.7], orientation ='horizontal')
a=fig.add_subplot(1,2,2)
imgplot = plt.imshow(lum_img)
imgplot.set_clim(0.0,0.7)
@@ -260,9 +319,21 @@
.. _Interpolation:
Array Interpolation schemes
------------------------------------
-Interpolation calculates what the color or value of a pixel "should" be, according to different mathematical schemes. One common place that this happens is when you resize an image. The number of pixels change, but you want the same information. Since pixels are discrete, there's missing space. Interpolation is how you fill that space. This is why your images sometimes come out looking pixelated when you blow them up. The effect is more pronounced when the difference between the original image and the expanded image is greater. Let's take our image and shrink it. We're effectively discarding pixels, only keeping a select few. Now when we plot it, that data gets blown up to the size on your screen. The old pixels aren't there anymore, and the computer has to draw in pixels to fill that space.
+---------------------------
+Interpolation calculates what the color or value of a pixel "should"
+be, according to different mathematical schemes. One common place
+that this happens is when you resize an image. The number of pixels
+change, but you want the same information. Since pixels are discrete,
+there's missing space. Interpolation is how you fill that space.
+This is why your images sometimes come out looking pixelated when you
+blow them up. The effect is more pronounced when the difference
+between the original image and the expanded image is greater. Let's
+take our image and shrink it. We're effectively discarding pixels,
+only keeping a select few. Now when we plot it, that data gets blown
+up to the size on your screen. The old pixels aren't there anymore,
+and the computer has to draw in pixels to fill that space.
+
.. sourcecode:: ipython
In [8]: import Image
@@ -272,7 +343,7 @@
In [12]: imgplot = mpimg.imshow(rsizeArr)
.. plot::
-
+
import matplotlib.pyplot as plt
import matplotlib.image as mpimg
import numpy as np
@@ -283,7 +354,8 @@
lum_img = rsizeArr[:,:,0]
imgplot = plt.imshow(rsizeArr)
-Here we have the default interpolation, bilinear, since we did not give :func:`~matplotlib.pyplot.imshow` any interpolation argument.
+Here we have the default interpolation, bilinear, since we did not
+give :func:`~matplotlib.pyplot.imshow` any interpolation argument.
Let's try some others:
@@ -302,10 +374,10 @@
rsizeArr = np.asarray(rsize)
lum_img = rsizeArr[:,:,0]
imgplot = plt.imshow(rsizeArr)
- imgplot.set_interpolation('nearest')
-
+ imgplot.set_interpolation('nearest')
+
.. sourcecode:: ipython
-
+
In [10]: imgplot.set_interpolation('bicubic')
.. plot::
@@ -320,5 +392,6 @@
lum_img = rsizeArr[:,:,0]
imgplot = plt.imshow(rsizeArr)
imgplot.set_interpolation('bicubic')
-
-Bicubic interpolation is often used when blowing up photos - people tend to prefer blurry over pixelated.
\ No newline at end of file
+
+Bicubic interpolation is often used when blowing up photos - people
+tend to prefer blurry over pixelated.
Modified: trunk/matplotlib/doc/users/index.rst
===================================================================
--- trunk/matplotlib/doc/users/index.rst 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/doc/users/index.rst 2009-09-10 23:22:40 UTC (rev 7735)
@@ -23,7 +23,6 @@
artists.rst
legend_guide.rst
event_handling.rst
- legend.rst
transforms_tutorial.rst
path_tutorial.rst
annotations_guide.rst
Modified: trunk/matplotlib/doc/users/pyplot_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/pyplot_tutorial.rst 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/doc/users/pyplot_tutorial.rst 2009-09-10 23:22:40 UTC (rev 7735)
@@ -165,17 +165,17 @@
``figure(1)`` will be created by default, just as a ``subplot(111)``
will be created by default if you don't manually specify an axes. The
:func:`~matplotlib.pyplot.subplot` command specifies ``numrows,
- numcols, fignum`` where ``fignum`` ranges from 1 to
-``numrows*numcols``. The commas in the ``subplot`` command are optional
-if ``numrows*numcols<10``. So ``subplot(211)`` is identical to
-``subplot(2,1,1)``. You can create an arbitrary number of subplots
+numcols, fignum`` where ``fignum`` ranges from 1 to
+``numrows*numcols``. The commas in the ``subplot`` command are
+optional if ``numrows*numcols<10``. So ``subplot(211)`` is identical
+to ``subplot(2,1,1)``. You can create an arbitrary number of subplots
and axes. If you want to place an axes manually, ie, not on a
rectangular grid, use the :func:`~matplotlib.pyplot.axes` command,
which allows you to specify the location as ``axes([left, bottom,
width, height])`` where all values are in fractional (0 to 1)
coordinates. See :ref:`pylab_examples-axes_demo` for an example of
-placing axes manually and :ref:`pylab_examples-line_styles` for an example
-with lots-o-subplots.
+placing axes manually and :ref:`pylab_examples-line_styles` for an
+example with lots-o-subplots.
You can create multiple figures by using multiple
@@ -267,6 +267,6 @@
In this basic example, both the ``xy`` (arrow tip) and ``xytext``
locations (text location) are in data coordinates. There are a
variety of other coordinate systems one can choose -- see
-:ref:`annotations-tutorial` and :ref:`plotting-guide-annotation`
-for details. More examples can be found
-in :ref:`pylab_examples-annotation_demo`.
+:ref:`annotations-tutorial` and :ref:`plotting-guide-annotation` for
+details. More examples can be found in
+:ref:`pylab_examples-annotation_demo`.
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2009-09-10 23:22:40 UTC (rev 7735)
@@ -1360,7 +1360,7 @@
def add_artist(self, a):
'''
- Add any :class:`~matplotlib.artist.Artist` to the axes
+ Add any :class:`~matplotlib.artist.Artist` to the axes.
Returns the artist.
'''
@@ -1373,8 +1373,8 @@
def add_collection(self, collection, autolim=True):
'''
- add a :class:`~matplotlib.collections.Collection` instance
- to the axes
+ Add a :class:`~matplotlib.collections.Collection` instance
+ to the axes.
Returns the collection.
'''
@@ -3675,15 +3675,15 @@
*maxlags* is a positive integer detailing the number of lags
to show. The default value of *None* will return all
- :math:`2 \mathrm{len}(x) - 1` lags.
+ :math:`2 \times \mathrm{len}(x) - 1` lags.
The return value is a tuple (*lags*, *c*, *linecol*, *b*)
where
- - *linecol* is the
- :class:`~matplotlib.collections.LineCollection`
+ - *linecol* is the
+ :class:`~matplotlib.collections.LineCollection`
- - *b* is the *x*-axis.
+ - *b* is the *x*-axis.
.. seealso::
Modified: trunk/matplotlib/lib/matplotlib/figure.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/figure.py 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/lib/matplotlib/figure.py 2009-09-10 23:22:40 UTC (rev 7735)
@@ -1078,7 +1078,8 @@
def subplots_adjust(self, *args, **kwargs):
"""
- fig.subplots_adjust(left=None, bottom=None, right=None, wspace=None, hspace=None)
+ fig.subplots_adjust(left=None, bottom=None, right=None, top=None,
+ wspace=None, hspace=None)
Update the :class:`SubplotParams` with *kwargs* (defaulting to rc where
None) and update the subplot locations
Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/lib/matplotlib/lines.py 2009-09-10 23:22:40 UTC (rev 7735)
@@ -499,9 +499,10 @@
self._transform_path(subslice)
if self._transformed_path is None:
self._transform_path()
+
+ if not self.get_visible(): return
+
renderer.open_group('line2d', self.get_gid())
-
- if not self._visible: return
gc = renderer.new_gc()
self._set_gc_clip(gc)
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-10 23:01:28 UTC (rev 7734)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-10 23:22:40 UTC (rev 7735)
@@ -565,7 +565,7 @@
example script that shows that this :func:`cohere_pairs` and
:func:`cohere` give the same results for a given pair.
- .. sealso::
+ .. seealso::
:func:`psd`
For information about the methods used to compute
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703
+ /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-09-11 02:11:21
|
Revision: 7742
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7742&view=rev
Author: jdh2358
Date: 2009-09-11 02:11:11 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Merged revisions 7740-7741 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7740 | astraw | 2009-09-10 18:54:27 -0700 (Thu, 10 Sep 2009) | 2 lines
bugfix: bounds checking in hexbin with extent specified (SF#2856228)
........
r7741 | jdh2358 | 2009-09-10 19:06:30 -0700 (Thu, 10 Sep 2009) | 1 line
minor tweaks to licensing devel doc
........
Modified Paths:
--------------
trunk/matplotlib/doc/devel/coding_guide.rst
trunk/matplotlib/doc/users/credits.rst
trunk/matplotlib/lib/matplotlib/axes.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7734
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7741
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2009-09-11 02:06:30 UTC (rev 7741)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2009-09-11 02:11:11 UTC (rev 7742)
@@ -604,74 +604,7 @@
.. _license-discussion:
-Licenses
-========
-Matplotlib only uses BSD compatible code. If you bring in code from
-another project make sure it has a PSF, BSD, MIT or compatible license
-(see the Open Source Initiative `licenses page
-<http://www.opensource.org/licenses>`_ for details on individual
-licenses). If it doesn't, you may consider contacting the author and
-asking them to relicense it. GPL and LGPL code are not acceptable in
-the main code base, though we are considering an alternative way of
-distributing L/GPL code through an separate channel, possibly a
-toolkit. If you include code, make sure you include a copy of that
-code's license in the license directory if the code's license requires
-you to distribute the license with it. Non-BSD compatible licenses
-are acceptable in matplotlib toolkits (eg basemap), but make sure you
-clearly state the licenses you are using.
-
-Why BSD compatible?
--------------------
-
-The two dominant license variants in the wild are GPL-style and
-BSD-style. There are countless other licenses that place specific
-restrictions on code reuse, but there is an important different to be
-considered in the GPL and BSD variants. The best known and perhaps
-most widely used license is the GPL, which in addition to granting you
-full rights to the source code including redistribution, carries with
-it an extra obligation. If you use GPL code in your own code, or link
-with it, your product must be released under a GPL compatible
-license. I.e., you are required to give the source code to other
-people and give them the right to redistribute it as well. Many of the
-most famous and widely used open source projects are released under
-the GPL, including sagemath, linux, gcc and emacs.
-
-The second major class are the BSD-style licenses (which includes MIT
-and the python PSF license). These basically allow you to do whatever
-you want with the code: ignore it, include it in your own open source
-project, include it in your proprietary product, sell it,
-whatever. python itself is released under a BSD compatible license, in
-the sense that, quoting from the PSF license page::
-
- There is no GPL-like "copyleft" restriction. Distributing
- binary-only versions of Python, modified or not, is allowed. There
- is no requirement to release any of your source code. You can also
- write extension modules for Python and provide them only in binary
- form.
-
-Famous projects released under a BSD-style license in the permissive
-sense of the last paragraph are the BSD operating system, python and
-TeX.
-
-There are two primary reasons why early matplotlib developers selected
-a BSD compatible license. We wanted to attract as many users and
-developers as possible, and many software companies will not use GPL code
-in software they plan to distribute, even those that are highly
-committed to open source development, such as `enthought
-<http://enthought.com>`_, out of legitimate concern that use of the
-GPL will "infect" their code base by its viral nature. In effect, they
-want to retain the right to release some proprietary code. Companies,
-and institutions in general, who use matplotlib often make significant
-contributions, since they have the resources to get a job done, even a
-boring one, if they need it in their code. Two of the matplotlib
-backends (FLTK and WX) were contributed by private companies.
-
-The other reason is licensing compatibility with the other python
-extensions for scientific computing: ipython, numpy, scipy, the
-enthought tool suite and python itself are all distributed under BSD
-compatible licenses.
-
Testing
=======
@@ -784,3 +717,75 @@
``matplotlib.tests.test_whizbang_features``. To add this module to
the list of default tests, append its name to ``default_test_modules``
in :file:`lib/matplotlib/__init__.py`.
+
+Licenses
+========
+
+Matplotlib only uses BSD compatible code. If you bring in code from
+another project make sure it has a PSF, BSD, MIT or compatible license
+(see the Open Source Initiative `licenses page
+<http://www.opensource.org/licenses>`_ for details on individual
+licenses). If it doesn't, you may consider contacting the author and
+asking them to relicense it. GPL and LGPL code are not acceptable in
+the main code base, though we are considering an alternative way of
+distributing L/GPL code through an separate channel, possibly a
+toolkit. If you include code, make sure you include a copy of that
+code's license in the license directory if the code's license requires
+you to distribute the license with it. Non-BSD compatible licenses
+are acceptable in matplotlib toolkits (eg basemap), but make sure you
+clearly state the licenses you are using.
+
+Why BSD compatible?
+-------------------
+
+The two dominant license variants in the wild are GPL-style and
+BSD-style. There are countless other licenses that place specific
+restrictions on code reuse, but there is an important difference to be
+considered in the GPL and BSD variants. The best known and perhaps
+most widely used license is the GPL, which in addition to granting you
+full rights to the source code including redistribution, carries with
+it an extra obligation. If you use GPL code in your own code, or link
+with it, your product must be released under a GPL compatible
+license. I.e., you are required to give the source code to other
+people and give them the right to redistribute it as well. Many of the
+most famous and widely used open source projects are released under
+the GPL, including linux, gcc, emacs and sage.
+
+The second major class are the BSD-style licenses (which includes MIT
+and the python PSF license). These basically allow you to do whatever
+you want with the code: ignore it, include it in your own open source
+project, include it in your proprietary product, sell it,
+whatever. python itself is released under a BSD compatible license, in
+the sense that, quoting from the PSF license page::
+
+ There is no GPL-like "copyleft" restriction. Distributing
+ binary-only versions of Python, modified or not, is allowed. There
+ is no requirement to release any of your source code. You can also
+ write extension modules for Python and provide them only in binary
+ form.
+
+Famous projects released under a BSD-style license in the permissive
+sense of the last paragraph are the BSD operating system, python and
+TeX.
+
+There are several reasons why early matplotlib developers selected a
+BSD compatible license. matplotlib is a python extension, and we
+choose a license that was based on the python license (BSD
+compatible). Also, we wanted to attract as many users and developers
+as possible, and many software companies will not use GPL code in
+software they plan to distribute, even those that are highly committed
+to open source development, such as `enthought
+<http://enthought.com>`_, out of legitimate concern that use of the
+GPL will "infect" their code base by its viral nature. In effect, they
+want to retain the right to release some proprietary code. Companies
+and institutions who use matplotlib often make significant
+contributions, because they have the resources to get a job done, even
+a boring one. Two of the matplotlib backends (FLTK and WX) were
+contributed by private companies. The final reason behind the
+licensing choice is compatibility with the other python extensions for
+scientific computing: ipython, numpy, scipy, the enthought tool suite
+and python itself are all distributed under BSD compatible licenses.
+The other reason is licensing compatibility with the other python
+extensions for scientific computing: ipython, numpy, scipy, the
+enthought tool suite and python itself are all distributed under BSD
+compatible licenses.
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Modified: trunk/matplotlib/doc/users/credits.rst
===================================================================
--- trunk/matplotlib/doc/users/credits.rst 2009-09-11 02:06:30 UTC (rev 7741)
+++ trunk/matplotlib/doc/users/credits.rst 2009-09-11 02:11:11 UTC (rev 7742)
@@ -18,7 +18,11 @@
Andrew Straw provided much of the log scaling architecture, the fill
command, PIL support for imshow, and provided many examples. He
- also wrote the support for dropped axis spines.
+ also wrote the support for dropped axis spines and the `buildbot
+ <http://mpl-buildbot.code.astraw.com/>`_ unit testing infrastructure
+ which triggers the JPL/James Evans platform specific builds and
+ regression test image comparisons from svn matplotlib across
+ platforms on svn commits.
Charles Twardy
provided the impetus code for the legend class and has made
@@ -116,11 +120,14 @@
at `NOAA <http://www.boulder.noaa.gov>`_ wrote the
:ref:`toolkit_basemap` tookit
-Sigve Tjoraand, Ted Drain
+Sigve Tjoraand, Ted Drain, James Evans
and colleagues at the `JPL <http://www.jpl.nasa.gov>`_ collaborated
on the QtAgg backend and sponsored development of a number of
features including custom unit types, datetime support, scale free
- ellipses, broken bar plots and more.
+ ellipses, broken bar plots and more. The JPL team wrote the unit
+ testing image comparison `infrastructure
+ <http://matplotlib.svn.sourceforge.net/viewvc/matplotlib/trunk/matplotlib/test>`_
+ for regression test image comparisons.
James Amundson
did the initial work porting the qt backend to qt4
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2009-09-11 02:06:30 UTC (rev 7741)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2009-09-11 02:11:11 UTC (rev 7742)
@@ -5587,9 +5587,13 @@
for i in xrange(len(x)):
if bdist[i]:
- lattice1[ix1[i], iy1[i]]+=1
+ if ((ix1[i] >= 0) and (ix1[i] < nx1) and
+ (iy1[i] >= 0) and (iy1[i] < ny1)):
+ lattice1[ix1[i], iy1[i]]+=1
else:
- lattice2[ix2[i], iy2[i]]+=1
+ if ((ix2[i] >= 0) and (ix2[i] < nx2) and
+ (iy2[i] >= 0) and (iy2[i] < ny2)):
+ lattice2[ix2[i], iy2[i]]+=1
# threshold
if mincnt is not None:
@@ -5621,9 +5625,13 @@
for i in xrange(len(x)):
if bdist[i]:
- lattice1[ix1[i], iy1[i]].append( C[i] )
+ if ((ix1[i] >= 0) and (ix1[i] < nx1) and
+ (iy1[i] >= 0) and (iy1[i] < ny1)):
+ lattice1[ix1[i], iy1[i]].append( C[i] )
else:
- lattice2[ix2[i], iy2[i]].append( C[i] )
+ if ((ix2[i] >= 0) and (ix2[i] < nx2) and
+ (iy2[i] >= 0) and (iy2[i] < ny2)):
+ lattice2[ix2[i], iy2[i]].append( C[i] )
for i in xrange(nx1):
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734
+ /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-09-11 21:02:37
|
Revision: 7747
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7747&view=rev
Author: jdh2358
Date: 2009-09-11 21:02:27 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
some docstring cleanup on recs_join and align_iterators
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/cbook.py
trunk/matplotlib/lib/matplotlib/mlab.py
trunk/matplotlib/make.osx
Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py 2009-09-11 20:58:27 UTC (rev 7746)
+++ trunk/matplotlib/lib/matplotlib/cbook.py 2009-09-11 21:02:27 UTC (rev 7747)
@@ -390,7 +390,7 @@
for url, (fn, x, y) in cache.items():
if not os.path.isabs(fn):
cache[url] = (self.in_cache_dir(fn), x, y)
-
+
# If any files are deleted, drop them from the cache
for url, (fn, _, _) in cache.items():
if not os.path.exists(fn):
@@ -525,7 +525,7 @@
msg = 'file %s not in cache; received %s when trying to retrieve' \
% (fname, error)
raise KeyError(msg)
-
+
fname = cached[0]
if asfileobj:
@@ -1627,12 +1627,14 @@
return mlab.quad2cubic(q0x, q0y, q1x, q1y, q2x, q2y)
def align_iterators(func, *iterables):
- """
- This generator takes a bunch of iterables that are ordered by func
- It sends out ordered tuples (func(row), [rows from all iterators matching func(row)])
-
- It is used by mlab.recs_join to join record arrays
"""
+ This generator takes a bunch of iterables that are ordered by func
+ It sends out ordered tuples:
+
+ (func(row), [rows from all iterators matching func(row)])
+
+ It is used by :func:`matplotlib.mlab.recs_join` to join record arrays
+ """
class myiter:
def __init__(self, it):
self.it = it
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-11 20:58:27 UTC (rev 7746)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-11 21:02:27 UTC (rev 7747)
@@ -1884,16 +1884,27 @@
return newrec
def recs_join(key, name, recs,missing=0.):
- """
- *key* is the column name that acts as a key
- *name* is the name that we want to join
- *missing" is what the missing fields are replaced by
- *recarrays* is a list of record arrays to join
+ """
+ Join a sequence of record arrays on key
+ *key*
+ is the column name that acts as a key
+
+ *name*
+ is the name that we want to join
+
+ *missing"
+ is what the missing fields are replaced by
+
+ *recarrays*
+ is a list of record arrays to join
+
returns a record array with columns [rowkey, name1, name2, ... namen]
- >>> r = recs_join("date", "close", recs=[r0, r1], missing=0.)
+ Example::
+ r = recs_join("date", "close", recs=[r0, r1], missing=0.)
+
"""
results = []
def extract(r):
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx 2009-09-11 20:58:27 UTC (rev 7746)
+++ trunk/matplotlib/make.osx 2009-09-11 21:02:27 UTC (rev 7747)
@@ -61,7 +61,7 @@
cd freetype-${FREETYPEVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
+ export LDFLAGS=${LDFLAGS_DEPS} &&\python/svn/bison/scripts/
./configure --prefix=${PREFIX} &&\
make -j3 install &&\
cp objs/.libs/libfreetype.a . &&\
@@ -76,8 +76,6 @@
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS_DEPS} &&\
export LDFLAGS=${LDFLAGS_DEPS} &&\
- export LD_LIBRARY_PATH=${PREFIX}/lib &&\
- export DYLD_LIBRARY_PATH=${PREFIX}/lib &&\
python setup.py build
mpl_install:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2009-09-11 21:04:43
|
Revision: 7748
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7748&view=rev
Author: efiring
Date: 2009-09-11 21:04:33 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Merged revisions 7745 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7745 | efiring | 2009-09-11 10:48:10 -1000 (Fri, 11 Sep 2009) | 2 lines
Fix bug in quiver angle kwarg, found when input angle array is not 1-D
........
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/quiver.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7741
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Modified: trunk/matplotlib/lib/matplotlib/quiver.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/quiver.py 2009-09-11 21:02:27 UTC (rev 7747)
+++ trunk/matplotlib/lib/matplotlib/quiver.py 2009-09-11 21:04:33 UTC (rev 7748)
@@ -512,6 +512,7 @@
theta = np.angle(uv)
else:
theta = ma.masked_invalid(self.angles, copy=False).filled(0)
+ theta = theta.ravel()
theta *= (np.pi/180.0)
theta.shape = (theta.shape[0], 1) # for broadcasting
xy = (X+Y*1j) * np.exp(1j*theta)*self.width
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741
+ /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-09-13 05:44:31
|
Revision: 7753
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7753&view=rev
Author: leejjoon
Date: 2009-09-13 05:44:21 +0000 (Sun, 13 Sep 2009)
Log Message:
-----------
AxesGrid: add modified version of colorbar
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py
Added Paths:
-----------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py
trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py
trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/CHANGELOG 2009-09-13 05:44:21 UTC (rev 7753)
@@ -1,3 +1,6 @@
+2009-09-13 AxesGrid : add modified version of colorbar. Add colorbar
+ location howto. - JJL
+
2009-09-07 AxesGrid : implemented axisline style.
Added a demo examples/axes_grid/demo_axisline_style.py- JJL
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_of_inset_axes.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -0,0 +1,49 @@
+import matplotlib.pyplot as plt
+
+from mpl_toolkits.axes_grid.inset_locator import inset_axes, zoomed_inset_axes
+from mpl_toolkits.axes_grid.colorbar import colorbar
+
+def get_demo_image():
+ from matplotlib.cbook import get_sample_data
+ import numpy as np
+ f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
+ z = np.load(f)
+ # z is a numpy array of 15x15
+ return z, (-3,4,-4,3)
+
+
+fig = plt.figure(1, [5,4])
+ax = fig.add_subplot(111)
+
+Z, extent = get_demo_image()
+
+ax.set(aspect=1,
+ xlim=(-15, 15),
+ ylim=(-20, 5))
+
+
+axins = zoomed_inset_axes(ax, 2, loc=2) # zoom = 6
+im = axins.imshow(Z, extent=extent, interpolation="nearest",
+ origin="lower")
+
+plt.xticks(visible=False)
+plt.yticks(visible=False)
+
+
+# colorbar
+cax = inset_axes(axins,
+ width="5%", # width = 10% of parent_bbox width
+ height="100%", # height : 50%
+ loc=3,
+ bbox_to_anchor=(1.05, 0., 1, 1),
+ bbox_transform=axins.transAxes,
+ borderpad=0,
+ )
+
+
+colorbar(im, cax=cax) #, ticks=[1,2,3])
+
+
+plt.draw()
+plt.show()
+
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_axes_divider.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -0,0 +1,25 @@
+import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid.axes_divider import make_axes_locatable
+
+from mpl_toolkits.axes_grid.colorbar import colorbar
+# from matplotlib.pyplot import colorbar
+
+fig = plt.figure(1, figsize=(6, 3))
+fig.subplots_adjust(wspace=0.5)
+
+ax1 = fig.add_subplot(121)
+im1 = ax1.imshow([[1,2],[3,4]])
+
+ax1_divider = make_axes_locatable(ax1)
+cax1 = ax1_divider.append_axes("right", size="7%", pad="2%")
+cb1 = colorbar(im1, cax=cax1)
+
+ax2 = fig.add_subplot(122)
+im2 = ax2.imshow([[1,2],[3,4]])
+
+ax2_divider = make_axes_locatable(ax2)
+cax2 = ax2_divider.append_axes("top", size="7%", pad="2%")
+cb2 = colorbar(im2, cax=cax2, orientation="horizontal")
+cax2.xaxis.set_ticks_position("top")
+plt.show()
+
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -0,0 +1,40 @@
+import matplotlib.pyplot as plt
+
+from mpl_toolkits.axes_grid.inset_locator import inset_axes
+from mpl_toolkits.axes_grid.colorbar import colorbar
+
+fig = plt.figure(1, [6, 3])
+
+# first subplot
+ax1 = fig.add_subplot(121)
+
+axins1 = inset_axes(ax1,
+ width="50%", # width = 10% of parent_bbox width
+ height="5%", # height : 50%
+ loc=1)
+
+im1=ax1.imshow([[1,2],[2, 3]])
+colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3])
+axins1.xaxis.set_ticks_position("bottom")
+
+# first subplot
+ax = fig.add_subplot(122)
+
+axins = inset_axes(ax,
+ width="5%", # width = 10% of parent_bbox width
+ height="50%", # height : 50%
+ loc=3,
+ bbox_to_anchor=(1.05, 0., 1, 1),
+ bbox_transform=ax.transAxes,
+ borderpad=0,
+ )
+
+# Controlling the placement of the inset axes is basically same as that
+# of the legend. you may want to play with the borderpad value and
+# the bbox_to_anchor coordinate.
+
+im=ax.imshow([[1,2],[2, 3]])
+colorbar(im, cax=axins, ticks=[1,2,3])
+
+plt.draw()
+plt.show()
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_new_colorbar.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -0,0 +1,21 @@
+import matplotlib.pyplot as plt
+
+plt.rcParams["text.usetex"]=False
+
+fig = plt.figure(1, figsize=(6, 3))
+
+ax1 = fig.add_subplot(121)
+im1 = ax1.imshow([[1,2],[3,4]])
+cb1 = plt.colorbar(im1)
+cb1.ax.set_yticks([1, 3])
+ax1.set_title("Original MPL's colorbar w/\nset_yticks([1,3])", size=10)
+
+from mpl_toolkits.axes_grid.colorbar import colorbar
+ax2 = fig.add_subplot(122)
+im2 = ax2.imshow([[1,2],[3,4]])
+cb2 = colorbar(im2)
+cb2.ax.set_yticks([1, 3])
+ax2.set_title("AxesGrid's colorbar w/\nset_yticks([1,3])", size=10)
+
+plt.show()
+
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/index.rst 2009-09-13 05:44:21 UTC (rev 7753)
@@ -8,10 +8,12 @@
ease displaying multiple images in matplotlib. While the aspect
parameter in matplotlib adjust the position of the single axes,
AxesGrid toolkit provides a framework to adjust the position of
-multiple axes according to their aspects.
+multiple axes according to their aspects.
+.. image:: ../../_static/demo_axes_grid.png
+
Documentation
=============
@@ -19,4 +21,5 @@
:maxdepth: 2
users/index.rst
+ howtos/index.rst
api/index.rst
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2009-09-13 05:44:21 UTC (rev 7753)
@@ -81,12 +81,12 @@
See the example,
-.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider2.py
+.. plot:: mpl_toolkits/axes_grid/examples/simple_axes_divider2.py
:include-source:
You can adjust the size of the each axes accroding to their x or y
data limits (AxesX and AxesY), similar to the axes aspect parameter.
-.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider3.py
+.. plot:: mpl_toolkits/axes_grid/examples/simple_axes_divider3.py
:include-source:
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst 2009-09-13 05:44:21 UTC (rev 7753)
@@ -29,7 +29,7 @@
* a curvelinear grid.
* a floating axis
-.. plot:: mpl_toolkits/axes_grid/figures/demo_floating_axis.py
+.. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py
*axes_grid.axislines.Axes* defines a *axis* attribute, which is a
@@ -211,7 +211,7 @@
ax1.parasites.append(ax2)
-.. plot:: mpl_toolkits/axes_grid/figures/demo_curvelinear_grid.py
+.. plot:: mpl_toolkits/axes_grid/examples/demo_curvelinear_grid.py
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2009-09-13 05:44:21 UTC (rev 7753)
@@ -35,7 +35,7 @@
padding between them cannot be easily done in matplotlib. AxesGrid is
used in such case.
-.. plot:: mpl_toolkits/axes_grid/figures/simple_axesgrid.py
+.. plot:: mpl_examples/axes_grid/simple_axesgrid.py
:include-source:
* The postion of each axes is determined at the drawing time (see
@@ -49,7 +49,7 @@
height. The widths (height) of the axes in the same row (column) are
scaled according to their view limits (xlim or ylim).
- .. plot:: mpl_toolkits/axes_grid/figures/simple_axesgrid2.py
+ .. plot:: mpl_toolkits/axes_grid/examples/simple_axesgrid2.py
:include-source:
* xaxis are shared among axes in a same column. Similarly, yaxis are
@@ -137,7 +137,7 @@
The examples below show what you can do with AxesGrid.
-.. plot:: mpl_toolkits/axes_grid/figures/demo_axes_grid.py
+.. plot:: mpl_toolkits/axes_grid/examples/demo_axes_grid.py
RGB Axes
@@ -158,7 +158,7 @@
origin="lower", interpolation="nearest")
-.. plot:: mpl_toolkits/axes_grid/figures/simple_rgb.py
+.. plot:: mpl_toolkits/axes_grid/examples/simple_rgb.py
@@ -219,7 +219,7 @@
See the full source code below.
-.. plot:: mpl_toolkits/axes_grid/figures/scatter_hist.py
+.. plot:: mpl_toolkits/axes_grid/examples/scatter_hist.py
The scatter_hist using the AxesDivider has some advantage over the
@@ -246,7 +246,7 @@
Example 1. twinx
----------------
-.. plot:: mpl_toolkits/axes_grid/figures/parasite_simple.py
+.. plot:: mpl_toolkits/axes_grid/examples/parasite_simple.py
:include-source:
Example 2. twin
@@ -257,7 +257,7 @@
accordingly.
-.. plot:: mpl_toolkits/axes_grid/figures/parasite_simple2.py
+.. plot:: mpl_toolkits/axes_grid/examples/parasite_simple2.py
@@ -290,13 +290,13 @@
ax.axis["top"].set_visible(False)
-.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline3.py
+.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline3.py
SubplotZero gives you two more additional (floating?) axis of x=0 and
y=0 (in data coordinate)
-.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline2.py
+.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline2.py
:include-source:
@@ -315,7 +315,7 @@
r"$\pi$", r"$\frac{3}{2}\pi$", r"$2\pi$"])
-.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline4.py
+.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline4.py
AxisLine Axes lets you create a custom axis, ::
@@ -330,7 +330,7 @@
And, you can use it with parasiteAxes.
-.. plot:: mpl_toolkits/axes_grid/figures/demo_parasite_axes2.py
+.. plot:: mpl_toolkits/axes_grid/examples/demo_parasite_axes2.py
AnchoredArtists
@@ -343,7 +343,7 @@
in the example below will have width and height in the data
coordinate.
-.. plot:: mpl_toolkits/axes_grid/figures/simple_anchored_artists.py
+.. plot:: mpl_toolkits/axes_grid/examples/simple_anchored_artists.py
:include-source:
@@ -377,7 +377,7 @@
creates an inset axes whose data scale is half of the parent axes.
Here is complete examples.
-.. plot:: mpl_toolkits/axes_grid/figures/inset_locator_demo.py
+.. plot:: mpl_toolkits/axes_grid/examples/inset_locator_demo.py
For example, :func:`zoomed_inset_axes` can be used when you want the
inset represents the zoom-up of the small portion in the parent axes.
@@ -385,7 +385,7 @@
function :func:`mark_inset` to mark the location of the area
represented by the inset axes.
-.. plot:: mpl_toolkits/axes_grid/figures/inset_locator_demo2.py
+.. plot:: mpl_toolkits/axes_grid/examples/inset_locator_demo2.py
:include-source:
@@ -395,6 +395,6 @@
You can draw a cuvelinear grid and ticks. Also a floating axis can be
created. See :ref:`axislines-manual` for more details.
-.. plot:: mpl_toolkits/axes_grid/figures/demo_floating_axis.py
+.. plot:: mpl_toolkits/axes_grid/examples/demo_floating_axis.py
Modified: trunk/matplotlib/examples/axes_grid/demo_axes_grid.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axes_grid.py 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_grid.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -44,7 +44,7 @@
Z, extent = get_demo_image()
for i in range(4):
im = grid[i].imshow(Z, extent=extent, interpolation="nearest")
- plt.colorbar(im, cax = grid.cbar_axes[0])
+ #plt.colorbar(im, cax = grid.cbar_axes[0])
grid.cbar_axes[0].colorbar(im)
# This affects all axes as share_all = True.
Added: trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py (rev 0)
+++ trunk/matplotlib/examples/axes_grid/demo_axes_grid2.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -0,0 +1,124 @@
+import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid import ImageGrid
+import numpy as np
+
+def get_demo_image():
+ from matplotlib.cbook import get_sample_data
+ f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
+ z = np.load(f)
+ # z is a numpy array of 15x15
+ return z, (-3,4,-4,3)
+
+
+def add_inner_title(ax, title, loc, size=None, **kwargs):
+ from matplotlib.offsetbox import AuxTransformBox, AnchoredOffsetbox
+ from matplotlib.font_manager import FontProperties
+ from matplotlib.patches import PathPatch
+ from matplotlib.textpath import TextPath
+ from matplotlib.transforms import IdentityTransform
+ if size is None:
+ size = FontProperties(size=plt.rcParams['legend.fontsize'])
+ text_path = TextPath((0, 0), title, size=10)
+ p1 = PathPatch(text_path, ec="w", lw=3, transform=IdentityTransform())
+ p2 = PathPatch(text_path, ec="none", fc="k", transform=IdentityTransform())
+
+ offsetbox = AuxTransformBox(IdentityTransform())
+ offsetbox.add_artist(p1)
+ offsetbox.add_artist(p2)
+
+ ao = AnchoredOffsetbox(loc=loc, child=offsetbox,
+ pad=0., borderpad=0.5,
+ frameon=False, **kwargs)
+ ax.add_artist(ao)
+
+ return ao
+
+if __name__ == "__main__":
+ F = plt.figure(1, (6, 6))
+ F.clf()
+
+ # prepare images
+ Z, extent = get_demo_image()
+ ZS = [Z[i::3,:] for i in range(3)]
+ extent = extent[0], extent[1]/3., extent[2], extent[3]
+
+ # demo 1 : colorbar at each axes
+
+ grid = ImageGrid(F, 211, # similar to subplot(111)
+ nrows_ncols = (1, 3),
+ direction="row",
+ axes_pad = 0.05,
+ add_all=True,
+ label_mode = "1",
+ share_all = True,
+ cbar_location="top",
+ cbar_mode="each",
+ cbar_size="7%",
+ cbar_pad="1%",
+ )
+
+
+ for ax, z in zip(grid, ZS):
+ im = ax.imshow(z, origin="lower", extent=extent, interpolation="nearest")
+ ax.cax.colorbar(im)
+
+ for ax, im_title in zip(grid, ["Image 1", "Image 2", "Image 3"]):
+ t = add_inner_title(ax, im_title, loc=3)
+ t.patch.set_alpha(0.5)
+
+ for ax, z in zip(grid, ZS):
+ ax.cax.toggle_label(True)
+ axis = ax.cax.axis[ax.cax.orientation]
+ axis.label.set_text("counts s$^{-1}$")
+ axis.label.set_size(10)
+ axis.major_ticklabels.set_size(6)
+
+ # changing the colorbar ticks
+ grid[1].cax.set_xticks([-1, 0, 1])
+ grid[2].cax.set_xticks([-1, 0, 1])
+
+ grid[0].set_xticks([-2, 0])
+ grid[0].set_yticks([-2, 0, 2])
+
+
+ # demo 2 : shared colorbar
+
+ grid2 = ImageGrid(F, 212,
+ nrows_ncols = (1, 3),
+ direction="row",
+ axes_pad = 0.05,
+ add_all=True,
+ label_mode = "1",
+ share_all = True,
+ cbar_location="right",
+ cbar_mode="single",
+ cbar_size="10%",
+ cbar_pad=0.05,
+ )
+
+ grid2[0].set_xlabel("X")
+ grid2[0].set_ylabel("Y")
+
+ vmax, vmin = np.max(ZS), np.min(ZS)
+ import matplotlib.colors
+ norm = matplotlib.colors.normalize(vmax=vmax, vmin=vmin)
+
+ for ax, z in zip(grid2, ZS):
+ im = ax.imshow(z, norm=norm,
+ origin="lower", extent=extent,
+ interpolation="nearest")
+
+ # With cbar_mode="single", cax attribute of all axes are identical.
+ ax.cax.colorbar(im)
+ ax.cax.toggle_label(True)
+
+ for ax, im_title in zip(grid2, ["(a)", "(b)", "(c)"]):
+ t = add_inner_title(ax, im_title, loc=2)
+ t.patch.set_ec("none")
+ t.patch.set_alpha(0.5)
+
+ grid2[0].set_xticks([-2, 0])
+ grid2[0].set_yticks([-2, 0, 2])
+
+ plt.draw()
+ plt.show()
Added: trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py (rev 0)
+++ trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -0,0 +1,44 @@
+import matplotlib.pyplot as plt
+
+from mpl_toolkits.axes_grid.inset_locator import inset_axes
+#from mpl_toolkits.axes_grid.colorbar import colorbar
+
+fig = plt.figure(1, [6, 3])
+
+# first subplot
+ax1 = fig.add_subplot(121)
+
+axins1 = inset_axes(ax1,
+ width="50%", # width = 10% of parent_bbox width
+ height="5%", # height : 50%
+ loc=1)
+
+locator1=axins1.get_axes_locator()
+
+im1=ax1.imshow([[1,2],[2, 3]])
+colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3])
+axins1.xaxis.set_ticks_position("bottom")
+
+# first subplot
+ax = fig.add_subplot(122)
+
+axins = inset_axes(ax,
+ width="5%", # width = 10% of parent_bbox width
+ height="50%", # height : 50%
+ loc=3,
+ bbox_to_anchor=(1.05, 0., 1, 1),
+ bbox_transform=ax.transAxes,
+ borderpad=0,
+ )
+
+
+locator=axins.get_axes_locator()
+# Controlling the placement of the inset axes is basically same as that
+# of the legend. you may want to play with the borderpad value and
+# the bbox_to_anchor coordinate.
+
+im=ax.imshow([[1,2],[2, 3]])
+colorbar(im, cax=axins)
+
+plt.draw()
+plt.show()
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -502,6 +502,31 @@
return ax
+ def append_axes(self, position, size, pad=None, **kwargs):
+ """
+ create an axes at the given *position* with the same height
+ (or width) of the main axes.
+
+ *position*
+ ["left"|"right"|"bottom"|"top"]
+
+ *size* and *pad* should be axes_grid.axes_size compatible.
+ """
+
+ if position == "left":
+ ax = self.new_horizontal(size, pad, pack_start=True, **kwargs)
+ elif position == "right":
+ ax = self.new_horizontal(size, pad, pack_start=False, **kwargs)
+ elif position == "bottom":
+ ax = self.new_vertical(size, pad, pack_start=True, **kwargs)
+ elif position == "top":
+ ax = self.new_vertical(size, pad, pack_start=False, **kwargs)
+ else:
+ raise ValueError("the position must be one of left, right, bottom, or top")
+
+ self._fig.add_axes(ax)
+ return ax
+
def get_aspect(self):
if self._aspect is None:
aspect = self._axes.get_aspect()
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py 2009-09-13 05:42:01 UTC (rev 7752)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_grid.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -2,7 +2,8 @@
import matplotlib.pyplot as plt
import matplotlib.axes as maxes
-import matplotlib.colorbar as mcolorbar
+#import matplotlib.colorbar as mcolorbar
+import colorbar as mcolorbar
import matplotlib as mpl
import matplotlib.patches as mpatches
import matplotlib.lines as mlines
@@ -10,8 +11,8 @@
from axes_divider import Size, SubplotDivider, LocatableAxes, Divider
+import numpy as np
-
def _tick_only(ax, bottom_on, left_on):
bottom_off = not bottom_on
left_off = not left_on
@@ -28,7 +29,7 @@
ax.axis["left"].label.set_visible(left_off)
class Colorbar(mcolorbar.Colorbar):
- def _config_axes(self, X, Y):
+ def _config_axes_deprecated(self, X, Y):
'''
Make an axes patch and outline.
'''
@@ -431,6 +432,7 @@
cbar_location="right",
cbar_pad=None,
cbar_size="5%",
+ cbar_set_cax=True,
axes_class=None,
):
"""
@@ -456,9 +458,13 @@
cbar_location "right" [ "right" | "top" ]
cbar_pad None
cbar_size "5%"
+ cbar_set_cax True [ True | False ]
axes_class None a type object which must be a subclass
of :class:`~matplotlib.axes.Axes`
================ ======== =========================================
+
+ *cbar_set_cax* : if True, each axes in the grid has a cax
+ attribute that is bind to associated cbar_axes.
"""
self._nrows, self._ncols = nrows_ncols
@@ -568,6 +574,14 @@
for ax in self.axes_all+self.cbar_axes:
fig.add_axes(ax)
+ if cbar_set_cax:
+ if self._colorbar_mode == "single":
+ for ax in self.axes_all:
+ ax.cax = self.cbar_axes[0]
+ else:
+ for ax, cax in zip(self.axes_all, self.cbar_axes):
+ ax.cax = cax
+
self.set_label_mode(label_mode)
@@ -683,8 +697,8 @@
-if __name__ == "__main__":
-#if 0:
+#if __name__ == "__main__":
+if 0:
from axes_divider import get_demo_image
F = plt.figure(1, (9, 3.5))
F.clf()
@@ -761,3 +775,5 @@
plt.ion()
plt.draw()
+
+
Added: trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py (rev 0)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/colorbar.py 2009-09-13 05:44:21 UTC (rev 7753)
@@ -0,0 +1,816 @@
+'''
+Colorbar toolkit with two classes and a function:
+
+ :class:`ColorbarBase`
+ the base class with full colorbar drawing functionality.
+ It can be used as-is to make a colorbar for a given colormap;
+ a mappable object (e.g., image) is not needed.
+
+ :class:`Colorbar`
+ the derived class for use with images or contour plots.
+
+ :func:`make_axes`
+ a function for resizing an axes and adding a second axes
+ suitable for a colorbar
+
+The :meth:`~matplotlib.figure.Figure.colorbar` method uses :func:`make_axes`
+and :class:`Colorbar`; the :func:`~matplotlib.pyplot.colorbar` function
+is a thin wrapper over :meth:`~matplotlib.figure.Figure.colorbar`.
+
+'''
+
+import numpy as np
+import matplotlib as mpl
+import matplotlib.colors as colors
+import matplotlib.cm as cm
+from matplotlib import docstring
+import matplotlib.ticker as ticker
+import matplotlib.cbook as cbook
+import matplotlib.collections as collections
+import matplotlib.contour as contour
+from matplotlib.path import Path
+from matplotlib.patches import PathPatch
+from matplotlib.transforms import Bbox
+
+
+make_axes_kw_doc = '''
+
+ ============= ====================================================
+ 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
+ ============= ====================================================
+
+'''
+
+colormap_kw_doc = '''
+
+ =========== ====================================================
+ Property Description
+ =========== ====================================================
+ *extend* [ 'neither' | 'both' | 'min' | 'max' ]
+ If not 'neither', make pointed end(s) for out-of-
+ range values. These are set for a given colormap
+ using the colormap set_under and set_over methods.
+ *spacing* [ 'uniform' | 'proportional' ]
+ Uniform spacing gives each discrete color the same
+ space; proportional makes the space proportional to
+ the data interval.
+ *ticks* [ None | list of ticks | Locator object ]
+ If None, ticks are determined automatically from the
+ input.
+ *format* [ None | format string | Formatter object ]
+ If None, the
+ :class:`~matplotlib.ticker.ScalarFormatter` is used.
+ If a format string is given, e.g. '%.3f', that is
+ used. An alternative
+ :class:`~matplotlib.ticker.Formatter` object may be
+ given instead.
+ *drawedges* [ False | True ] If true, draw lines at color
+ boundaries.
+ =========== ====================================================
+
+ The following will probably be useful only in the context of
+ indexed colors (that is, when the mappable has norm=NoNorm()),
+ or other unusual circumstances.
+
+ ============ ===================================================
+ Property Description
+ ============ ===================================================
+ *boundaries* None or a sequence
+ *values* None or a sequence which must be of length 1 less
+ than the sequence of *boundaries*. For each region
+ delimited by adjacent entries in *boundaries*, the
+ color mapped to the corresponding value in values
+ will be used.
+ ============ ===================================================
+
+'''
+
+colorbar_doc = '''
+
+Add a colorbar to a plot.
+
+Function signatures for the :mod:`~matplotlib.pyplot` interface; all
+but the first are also method signatures for the
+:meth:`~matplotlib.figure.Figure.colorbar` method::
+
+ colorbar(**kwargs)
+ colorbar(mappable, **kwargs)
+ colorbar(mappable, cax=cax, **kwargs)
+ colorbar(mappable, ax=ax, **kwargs)
+
+arguments:
+
+ *mappable*
+ the :class:`~matplotlib.image.Image`,
+ :class:`~matplotlib.contour.ContourSet`, etc. to
+ which the colorbar applies; this argument is mandatory for the
+ :meth:`~matplotlib.figure.Figure.colorbar` method but optional for the
+ :func:`~matplotlib.pyplot.colorbar` function, which sets the
+ default to the current image.
+
+keyword arguments:
+
+ *cax*
+ None | axes object into which the colorbar will be drawn
+ *ax*
+ None | parent axes object from which space for a new
+ colorbar axes will be stolen
+
+
+Additional keyword arguments are of two kinds:
+
+ axes properties:
+%s
+ colorbar properties:
+%s
+
+If *mappable* is a :class:`~matplotlib.contours.ContourSet`, its *extend*
+kwarg is included automatically.
+
+Note that the *shrink* kwarg provides a simple way to keep a vertical
+colorbar, for example, from being taller than the axes of the mappable
+to which the colorbar is attached; but it is a manual method requiring
+some trial and error. If the colorbar is too tall (or a horizontal
+colorbar is too wide) use a smaller value of *shrink*.
+
+For more precise control, you can manually specify the positions of
+the axes objects in which the mappable and the colorbar are drawn. In
+this case, do not use any of the axes properties kwargs.
+
+returns:
+ :class:`~matplotlib.colorbar.Colorbar` instance; see also its base class,
+ :class:`~matplotlib.colorbar.ColorbarBase`. Call the
+ :meth:`~matplotlib.colorbar.ColorbarBase.set_label` method
+ to label the colorbar.
+
+
+The transData of the *cax* is adjusted so that the limits in the
+longest axis actually corresponds to the limits in colorbar range. On
+the other hand, the shortest axis has a data limits of [1,2], whose
+unconventional value is to prevent underflow when log scale is used.
+''' % (make_axes_kw_doc, colormap_kw_doc)
+
+docstring.interpd.update(colorbar_doc=colorbar_doc)
+
+
+class CbarAxesLocator(object):
+ """
+ CbarAxesLocator is a axes_locator for colobar axes. It adjust the
+ position of the axes to make a room for extended ends, i.e., the
+ extended ends are located outside the axes area.
+ """
+
+ def __init__(self, locator=None, extend="neither", orientation="vertical"):
+ """
+ *locator* : the bbox returned from the locator is used as a
+ initial axes location. If None, axes.bbox is used.
+
+ *extend* : same as in ColorbarBase
+ *orientation* : same as in ColorbarBase
+
+ """
+ self._locator = locator
+ self.extesion_fraction = 0.05
+ self.extend = extend
+ self.orientation = orientation
+
+ def get_original_position(self, axes, renderer):
+ """
+ get the original position of the axes.
+ """
+ if self._locator is None:
+ bbox = axes.get_position(original=True)
+ else:
+ bbox = self._locator(axes, renderer)
+ return bbox
+
+ def get_end_vertices(self):
+ """
+ return a tuple of two vertices for the colorbar extended ends.
+ The first vertives is for min. end, and the second is for
+ max. end.
+ """
+ # Note that concatenating two vertices needs to make a
+ # vertices for the frame.
+ extesion_fraction = self.extesion_fraction
+
+ corx = extesion_fraction*2.
+ cory = 1./(1. - corx)
+ x1, y1, w, h = 0, 0, 1, 1
+ x2, y2 = x1 + w, y1 + h
+ dw, dh = w*extesion_fraction, h*extesion_fraction*cory
+
+ if self.extend in ["min", "both"]:
+ bottom = [(x1, y1),
+ (x1+w/2., y1-dh),
+ (x2, y1)]
+ else:
+ bottom = [(x1, y1),
+ (x2, y1)]
+
+ if self.extend in ["max", "both"]:
+ top = [(x2, y2),
+ (x1+w/2., y2+dh),
+ (x1, y2)]
+ else:
+ top = [(x2, y2),
+ (x1, y2)]
+
+ if self.orientation == "horizontal":
+ bottom = [(y,x) for (x,y) in bottom]
+ top = [(y,x) for (x,y) in top]
+
+ return bottom, top
+
+
+ def get_path_patch(self):
+ """
+ get the path for axes patch
+ """
+ end1, end2 = self.get_end_vertices()
+
+ verts = [] + end1 + end2 + end1[:1]
+
+ return Path(verts)
+
+
+ def get_path_ends(self):
+ """
+ get the paths for extended ends
+ """
+
+ end1, end2 = self.get_end_vertices()
+
+ return Path(end1), Path(end2)
+
+
+ def __call__(self, axes, renderer):
+ """
+ Return the adjusted position of the axes
+ """
+ bbox0 = self.get_original_position(axes, renderer)
+ bbox = bbox0
+
+ x1, y1, w, h = bbox.bounds
+ extesion_fraction = self.extesion_fraction
+ dw, dh = w*extesion_fraction, h*extesion_fraction
+
+ if self.extend in ["min", "both"]:
+ if self.orientation == "horizontal":
+ x1 = x1 + dw
+ else:
+ y1 = y1+dh
+
+ if self.extend in ["max", "both"]:
+ if self.orientation == "horizontal":
+ w = w-2*dw
+ else:
+ h = h-2*dh
+
+ return Bbox.from_bounds(x1, y1, w, h)
+
+
+
+class ColorbarBase(cm.ScalarMappable):
+ '''
+ Draw a colorbar in an existing axes.
+
+ This is a base class for the :class:`Colorbar` class, which is the
+ basis for the :func:`~matplotlib.pyplot.colorbar` method and pylab
+ function.
+
+ It is also useful by itself for showing a colormap. If the *cmap*
+ kwarg is given but *boundaries* and *values* are left as None,
+ then the colormap will be displayed on a 0-1 scale. To show the
+ under- and over-value colors, specify the *norm* as::
+
+ colors.Normalize(clip=False)
+
+ To show the colors versus index instead of on the 0-1 scale,
+ use::
+
+ norm=colors.NoNorm.
+
+ Useful attributes:
+
+ :attr:`ax`
+ the Axes instance in which the colorbar is drawn
+
+ :attr:`lines`
+ a LineCollection if lines were drawn, otherwise None
+
+ :attr:`dividers`
+ a LineCollection if *drawedges* is True, otherwise None
+
+ Useful public methods are :meth:`set_label` and :meth:`add_lines`.
+
+ '''
+
+ def __init__(self, ax, cmap=None,
+ norm=None,
+ alpha=1.0,
+ values=None,
+ boundaries=None,
+ orientation='vertical',
+ extend='neither',
+ spacing='uniform', # uniform or proportional
+ ticks=None,
+ format=None,
+ drawedges=False,
+ filled=True,
+ ):
+ self.ax = ax
+
+ if cmap is None: cmap = cm.get_cmap()
+ if norm is None: norm = colors.Normalize()
+ self.alpha = alpha
+ cm.ScalarMappable.__init__(self, cmap=cmap, norm=norm)
+ self.values = values
+ self.boundaries = boundaries
+ self.extend = extend
+ self.spacing = spacing
+ self.orientation = orientation
+ self.drawedges = drawedges
+ self.filled = filled
+
+ # artists
+ self.solids = None
+ self.lines = None
+ self.dividers = None
+ self.extension_patch1 = None
+ self.extension_patch2 = None
+
+ if orientation == "vertical":
+ self.cbar_axis = self.ax.yaxis
+ else:
+ self.cbar_axis = self.ax.xaxis
+
+
+ if format is None:
+ if isinstance(self.norm, colors.LogNorm):
+ # change both axis for proper aspect
+ self.ax.xaxis.set_scale("log")
+ self.ax.yaxis.set_scale("log")
+ self.ax._update_transScale()
+ self.cbar_axis.set_minor_locator(ticker.NullLocator())
+ formatter = ticker.LogFormatter()
+ else:
+ formatter = None
+ elif cbook.is_string_like(format):
+ formatter = ticker.FormatStrFormatter(format)
+ else:
+ formatter = format # Assume it is a Formatter
+
+ if formatter is None:
+ formatter = self.cbar_axis.get_major_formatter()
+ else:
+ self.cbar_axis.set_major_formatter(formatter)
+
+ if cbook.iterable(ticks):
+ self.cbar_axis.set_ticks(ticks)
+ elif ticks is not None:
+ self.cbar_axis.set_major_locator(ticks)
+ else:
+ self._select_locator(formatter)
+
+
+ self._config_axes()
+
+ self.update_artists()
+
+ self.set_label_text('')
+
+
+ def _get_colorbar_limits(self):
+ """
+ initial limits for colorbar range. The returne min, max values
+ will be used to create colorbar solid(?) and etc.
+ """
+ if self.boundaries is not None:
+ C = self.boundaries
+ if self.extend in ["min", "both"]:
+ C = C[1:]
+
+ if self.extend in ["max", "both"]:
+ C = C[:-1]
+ return min(C), max(C)
+ else:
+ return self.get_clim()
+
+
+ def _config_axes(self):
+ '''
+ Adjust the properties of the axes to be adquate for colorbar display.
+ '''
+ ax = self.ax
+
+ axes_locator = CbarAxesLocator(ax.get_axes_locator(),
+ extend=self.extend,
+ orientation=self.orientation)
+ ax.set_axes_locator(axes_locator)
+
+ # overide the get_data_ratio for the aspect works.
+ def _f():
+ return 1.
+ ax.get_data_ratio = _f
+ ax.get_data_ratio_log = _f
+
+ ax.set_frame_on(True)
+ ax.set_navigate(False)
+
+ self.ax.set_autoscalex_on(False)
+ self.ax.set_autoscaley_on(False)
+
+ if self.orientation == 'horizontal':
+ ax.xaxis.set_label_position('bottom')
+ ax.set_yticks([])
+ else:
+ ax.set_xticks([])
+ ax.yaxis.set_label_position('right')
+ ax.yaxis.set_ticks_position('right')
+
+
+
+ def update_artists(self):
+ """
+ Update the colorbar associated artists, *filled* and
+ *ends*. Note that *lines* are not updated. This needs to be
+ called whenever clim of associated image changes.
+ """
+ self._process_values()
+ self._add_ends()
+
+ X, Y = self._mesh()
+ if self.filled:
+ C = self._values[:,np.newaxis]
+ self._add_solids(X, Y, C)
+
+ ax = self.ax
+ vmin, vmax = self._get_colorbar_limits()
+ if self.orientation == 'horizontal':
+ ax.set_ylim(1, 2)
+ ax.set_xlim(vmin, vmax)
+ else:
+ ax.set_xlim(1, 2)
+ ax.set_ylim(vmin, vmax)
+
+
+ def _add_ends(self):
+ """
+ Create patches from extended ends and add them to the axes.
+ """
+
+ del self.extension_patch1
+ del self.extension_patch2
+
+ path1, path2 = self.ax.get_axes_locator().get_path_ends()
+ fc=mpl.rcParams['axes.facecolor']
+ ec=mpl.rcParams['axes.edgecolor']
+ linewidths=0.5*mpl.rcParams['axes.linewidth']
+ self.extension_patch1 = PathPatch(path1,
+ fc=fc, ec=ec, lw=linewidths,
+ zorder=2.,
+ transform=self.ax.transAxes,
+ clip_on=False)
+ self.extension_patch2 = PathPatch(path2,
+ fc=fc, ec=ec, lw=linewidths,
+ zorder=2.,
+ transform=self.ax.transAxes,
+ clip_on=False)
+ self.ax.add_artist(self.extension_patch1)
+ self.ax.add_artist(self.extension_patch2)
+
+
+
+ def _set_label_text(self):
+ """
+ set label.
+ """
+ self.cbar_axis.set_label_text(self._label, **self._labelkw)
+
+ def set_label_text(self, label, **kw):
+ '''
+ Label the long axis of the colorbar
+ '''
+ self._label = label
+ self._labelkw = kw
+ self._set_label_text()
+
+
+ def _edges(self, X, Y):
+ '''
+ Return the separator line segments; helper for _add_solids.
+ '''
+ N = X.shape[0]
+ # Using the non-array form of these line segments is much
+ # simpler than making them into arrays.
+ if self.orientation == 'vertical':
+ return [zip(X[i], Y[i]) for i in range(1, N-1)]
+ else:
+ return [zip(Y[i], X[i]) for i in range(1, N-1)]
+
+ def _add_solids(self, X, Y, C):
+ '''
+ Draw the colors using :meth:`~matplotlib.axes.Axes.pcolor`;
+ optionally add separators.
+ '''
+ ## Change to pcolorfast after fixing bugs in some backends...
+
+ if self.extend in ["min", "both"]:
+ cc = self.to_rgba([C[0][0]])
+ self.extension_patch1.set_fc(cc[0])
+ X, Y, C = X[1:], Y[1:], C[1:]
+
+ if self.extend in ["max", "both"]:
+ cc = self.to_rgba([C[-1][0]])
+ self.extension_patch2.set_fc(cc[0])
+ X, Y, C = X[:-1], Y[:-1], C[:-1]
+
+ if self.orientation == 'vertical':
+ args = (X, Y, C)
+ else:
+ args = (np.transpose(Y), np.transpose(X), np.transpose(C))
+ kw = {'cmap':self.cmap, 'norm':self.norm,
+ 'shading':'flat', 'alpha':self.alpha,
+ }
+
+ del self.solids
+ del self.dividers
+
+ col = self.ax.pcolor(*args, **kw)
+ self.solids = col
+ if self.drawedges:
+ self.dividers = collections.LineCollection(self._edges(X,Y),
+ colors=(mpl.rcParams['axes.edgecolor'],),
+ linewidths=(0.5*mpl.rcParams['axes.linewidth'],),
+ )
+ self.ax.add_collection(self.dividers)
+ else:
+ self.dividers = None
+
+ def add_lines(self, levels, colors, linewidths):
+ '''
+ Draw lines on the colorbar. It deletes preexting lines.
+ '''
+ del self.lines
+
+ N = len(levels)
+ x = np.array([1.0, 2.0])
+ X, Y = np.meshgrid(x,levels)
+ if self.orientation == 'vertical':
+ xy = [zip(X[i], Y[i]) for i in range(N)]
+ else:
+ xy = [zip(Y[i], X[i]) for i in range(N)]
+ col = collections.LineCollection(xy, linewidths=linewidths,
+ )
+ self.lines = col
+ col.set_color(colors)
+ self.ax.add_collection(col)
+
+
+ def _select_locator(self, formatter):
+ '''
+ select a suitable locator
+ '''
+ if self.boundaries is None:
+ if isinstance(self.norm, colors.NoNorm):
+ nv = len(self._values)
+ base = 1 + int(nv/10)
+ locator = ticker.IndexLocator(base=base, offset=0)
+ elif isinstance(self.norm, colors.BoundaryNorm):
+ b = self.norm.boundaries
+ locator = ticker.FixedLocator(b, nbins=10)
+ elif isinstance(self.norm, colors.LogNorm):
+ locator = ticker.LogLocator()
+ else:
+ locator = ticker.MaxNLocator(nbins=5)
+ else:
+ b = self._boundaries[self._inside]
+ locator = ticker.FixedLocator(b) #, nbins=10)
+
+ self.cbar_axis.set_major_locator(locator)
+
+
+ def _process_values(self, b=None):
+ '''
+ Set the :attr:`_boundaries` and :attr:`_values` attributes
+ based on the input boundaries and values. Input boundaries
+ can be *self.boundaries* or the argument *b*.
+ '''
+ if b is None:
+ b = self.boundaries
+ if b is not None:
+ self._boundaries = np.asarray(b, dtype=float)
+ if self.values is None:
+ self._values = 0.5*(self._boundaries[:-1]
+ + self._boundaries[1:])
+ if isinstance(self.norm, colors.NoNorm):
+ self._values = (self._values + 0.00001).astype(np.int16)
+ return
+ self._values = np.array(self.values)
+ return
+ if self.values is not None:
+ self._values = np.array(self.values)
+ if self.boundaries is None:
+ b = np.zeros(len(self.values)+1, 'd')
+ b[1:-1] = 0.5*(self._values[:-1] - self._values[1:])
+ b[0] = 2.0*b[1] - b[2]
+ b[-1] = 2.0*b[-2] - b[-3]
+ self._boundaries = b
+ return
+ self._boundaries = np.array(self.boundaries)
+ return
+ # Neither boundaries nor values are specified;
+ # make reasonable ones based on cmap and norm.
+ if isinstance(self.norm, colors.NoNorm):
+ b = self._uniform_y(self.cmap.N+1) * self.cmap.N - 0.5
+ v = np.zeros((len(b)-1,), dtype=np.int16)
+ v = np.arange(self.cmap.N, dtype=np.int16)
+ self._boundaries = b
+ self._values = v
+ return
+ elif isinstance(self.norm, colors.BoundaryNorm):
+ b = np.array(self.norm.boundaries)
+ v = np.zeros((len(b)-1,), dtype=float)
+ bi = self.norm.boundaries
+ v = 0.5*(bi[:-1] + bi[1:])
+ self._boundaries = b
+ self._values = v
+ return
+ else:
+ b = self._uniform_y(self.cmap.N+1)
+
+ self._process_values(b)
+
+
+ def _uniform_y(self, N):
+ '''
+ Return colorbar data coordinates for *N* uniformly
+ spaced boundaries.
+ '''
+ vmin, vmax = self._get_colorbar_limits()
+ if isinstance(self.norm, colors.LogNorm):
+ y = np.logspace(np.log10(vmin), np.log10(vmax), N)
+ else:
+ y = np.linspace(vmin, vmax, N)
+ return y
+
+ def _mesh(self):
+ '''
+ Return X,Y, the coordinate arrays for the colorbar pcolormesh.
+ These are suitable for a vertical colorbar; swapping and
+ transposition for a horizontal colorbar are done outside
+ this function.
+ '''
+ x = np.array([1.0, 2.0])
+ if self.spacing == 'uniform':
+ y = self._uniform_y(len(self._boundaries))
+ else:
+ y = self._boundaries
+ self._y = y
+
+ X, Y = np.meshgrid(x,y)
+ return X, Y
+
+
+ def set_alpha(self, alpha):
+ """
+ set alpha value.
+ """
+ self.alpha = alpha
+
+
+class Colorbar(ColorbarBase):
+ def __init__(self, ax, mappable, **kw):
+ mappable.autoscale_None() # Ensure mappable.norm.vmin, vmax
+ # are set when colorbar is called,
+ # even if mappable.draw has not yet
+ # been called. This will not change
+ # vmin, vmax if they are already set.
+ self.mappable = mappable
+ kw['cmap'] = mappable.cmap
+ kw['norm'] = mappable.norm
+ kw['alpha'] = mappable.get_alpha()
+ if isinstance(mappable, contour.ContourSet):
+ CS = mappable
+ kw['boundaries'] = CS._levels
+ kw['values'] = CS.cvalues
+ kw['extend'] = CS.extend
+ #kw['ticks'] = CS._levels
+ kw.setdefault('ticks', ticker.FixedLocator(CS.levels, nbins=10))
+ kw['filled'] = CS.filled
+ ColorbarBase.__init__(self, ax, **kw)
+ if not CS.filled:
+ self.add_lines(CS)
+ else:
+ ColorbarBase.__init__(self, ax, **kw)
+
+
+ def add_lines(self, CS):
+ '''
+ Add the lines from a non-filled
+ :class:`~matplotlib.contour.ContourSet` to the colorbar.
+ '''
+ if not isinstance(CS, contour.ContourSet) or CS.filled:
+ raise ValueError('add_lines is only for a ContourSet of lines')
+ tcolors = [c[0] for c in CS.tcolors]
+ tlinewidths = [t[0] for t in CS.tlinewidths]
+ # The following was an attempt to get the colorbar lines
+ # to follow subsequent changes in the contour lines,
+ # but more work is needed: specifically, a careful
+ # look at event sequences, and at how
+ # to make one object track another automatically.
+ #tcolors = [col.get_colors()[0] for col in CS.collections]
+ #tlinewidths = [col.get_linewidth()[0] for lw in CS.collections]
+ #print 'tlinewidths:', tlinewidths
+ ColorbarBase.add_lines(self, CS.levels, tcolors, tlinewidths)
+
+ def update_bruteforce(self, mappable):
+ """
+ Update the colorbar artists to reflect the change of the
+ assocaited mappable.
+ """
+ self.update_artists()
+
+ if isinstance(mappable, contour.ContourSet):
+ if not mappable.filled:
+ self.add_lines(mappable)
+
+...@do...bstitution(make_axes_kw_doc)
+def make_axes(parent, **kw):
+ '''
+ Resize and reposition a parent axes, and return a child
+ axes suitable for a colorbar::
+
+ cax, kw = make_axes(parent, **kw)
+
+ Keyword arguments may include the following (with defaults):
+
+ *orientation*
+ 'vertical' or 'horizontal'
+
+ %s
+
+ All but the first of these are stripped from the input kw set.
+
+ Returns (cax, kw), the child axes and the reduced kw dictionary.
+ '''
+ orientation = kw.setdefault('orientation', 'vertical')
+ fraction = kw.pop('fraction', 0.15)
+ shrink = kw.pop('shrink', 1.0)
+ aspect = kw.pop('aspect', 20)
+ #pb = transforms.PBox(parent.get_position())
+ pb = parent.get_position(original=True).frozen()
+ if orientation == 'vertical':
+ pad = kw.pop('pad', 0.05)
+ x1 = 1.0-fraction
+ pb1, pbx, pbcb = pb.splitx(x1-pad, x1)
+ pbcb = pbcb.shrunk(1.0, shrink).anchored('C', pbcb)
+ anchor = (0.0, 0.5)
+ panchor = (1.0, 0.5)
+ else:
+ pad = kw.pop('pad', 0.15)
+ pbcb, pbx, pb1 = pb.splity(fraction, fraction+pad)
+ pbcb = pbcb.shrunk(shrink, 1.0).anchored('C', pbcb)
+ aspect = 1.0/aspect
+ anchor = (0.5, 1.0)
+ panchor = (0.5, 0.0)
+ parent.set_position(pb1)
+ parent.set_anchor(panchor)
+ fig = parent.get_figure()
+ cax = fig.add_axes(pbcb)
+ cax.set_aspect(aspect, anchor=anchor, adjustable='box')
+ return cax, kw
+
+
+def colorbar(mappable, cax=None, ax=None, **kw):
+ """
+ Create a colorbar for a ScalarMappable instance.
+
+ Documentation for the pylab thin wrapper:
+ %(colorbar_doc)s
+ """
+ import matplotlib.pyplot as plt
+ if ax is None:
+ ax = plt.gca()
+ if cax is None:
+ cax, kw = make_axes(ax, **kw)
+ cax.hold(True)
+ cb = Colorbar(cax, mappable, **kw)
+
+ def on_changed(m):
+ cb.set_cmap(m.get_cmap())
+ cb.set_clim(m.get_clim())
+ cb.update_bruteforce(m)
+
+ cbid = mappable.callbacksSM.connect('changed', on_changed)
+ mappable.set_colorbar(cb, cax)
+ ax.figure.sca(ax)
+ return cb
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2009-09-14 17:02:49
|
Revision: 7755
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7755&view=rev
Author: mdboom
Date: 2009-09-14 17:02:32 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Minor documentation fixes.
Modified Paths:
--------------
trunk/matplotlib/examples/api/watermark_image.py
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/pyplot.py
Modified: trunk/matplotlib/examples/api/watermark_image.py
===================================================================
--- trunk/matplotlib/examples/api/watermark_image.py 2009-09-14 13:28:43 UTC (rev 7754)
+++ trunk/matplotlib/examples/api/watermark_image.py 2009-09-14 17:02:32 UTC (rev 7755)
@@ -3,7 +3,6 @@
"""
import numpy as np
import matplotlib
-matplotlib.use('Agg')
import matplotlib.cbook as cbook
import matplotlib.image as image
import matplotlib.pyplot as plt
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2009-09-14 13:28:43 UTC (rev 7754)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2009-09-14 17:02:32 UTC (rev 7755)
@@ -5519,6 +5519,7 @@
**Example:**
.. plot:: mpl_examples/pylab_examples/hexbin_demo.py
+
"""
if not self._hold: self.cla()
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py 2009-09-14 13:28:43 UTC (rev 7754)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py 2009-09-14 17:02:32 UTC (rev 7755)
@@ -1596,7 +1596,7 @@
def autogen_docstring(base):
"""Autogenerated wrappers will get their docstring from a base function
with an addendum."""
- msg = "Additional kwargs: hold = [True|False] overrides default hold state"
+ msg = "\n\nAdditional kwargs: hold = [True|False] overrides default hold state"
addendum = docstring.Appender(msg, '\n\n')
return lambda func: addendum(docstring.copy_dedent(base)(func))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2009-09-14 17:12:33
|
Revision: 7757
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7757&view=rev
Author: mdboom
Date: 2009-09-14 17:12:19 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Merged revisions 7751 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint
........
r7751 | jdh2358 | 2009-09-12 17:11:42 -0400 (Sat, 12 Sep 2009) | 1 line
tagging for 99.1 release candiate
........
Modified Paths:
--------------
trunk/matplotlib/README.txt
trunk/matplotlib/make.osx
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7745,7749
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7755
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Modified: trunk/matplotlib/README.txt
===================================================================
--- trunk/matplotlib/README.txt 2009-09-14 17:11:06 UTC (rev 7756)
+++ trunk/matplotlib/README.txt 2009-09-14 17:12:19 UTC (rev 7757)
@@ -1,61 +1,45 @@
-Overview of the matplotlib src tree
-===================================
+matplotlib for MacOS X 10.3.9 or later and Python 2.5 and Python 2.6
-This is the source directory for matplotlib, which contains the
-following files and directories.
+matplotlib is a python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive
+environments across platforms. matplotlib can be used in python
+scripts, the python and ipython shell (ala matlab or mathematica), web
+application servers, and various graphical user interface toolkits.
-* doc - the matplotlib documentation. See doc/users for the user's
- documentation and doc/devel for the developers documentation
+Home page: <http://matplotlib.sourceforge.net/>
-* examples - a bunch of examples using matplotib. See
- examples/README.txt for information
+Before running matplotlib, you must install numpy. Binary installers
+for all these packages are available here:
-* setup.cfg.template - used to configure the matplotlib build process.
- Copy this file to setup.cfg if you want to override the default
- build behavior
+ <http://pythonmac.org/packages/py25-fat/index.html>.
-* matplotlibrc.template - a template file used to generate the
- matplotlibrc config file at build time. The matplotlibrc file will
- be installed in matplotlib/mpl-data/matplotlibrc
+*** Back Ends ***
-* lib - the python src code. matplotlib ships several third party
- packages here. The subdirectory lib/matplotlib contains the python
- src code for matplotlib
+You may use TkAgg or WXAgg back ends; Qt and GTK support is not
+provided in this package. By default this matplotlib uses TkAgg
+because Tcl/Tk is included with MacOS X.
-* src - the matplotlib extension code, mostly C++
+If you wish to use WXAgg then:
+* Install wxPython from:
+ <http://pythonmac.org/packages/py25-fat/index.html>.
+* Configure a matplotlibrc file, as described below.
-* ttconv - some truetype font utilities
+For TkAgg you may use Apple's built-in Tcl/Tk or install your own 8.4.x
-* license - all the licenses for code included with matplotlib.
- matplotlib uses only BSD compatible code
+*** Configuring a matplotlibrc file ***
-* unit - some unit tests
+If you wish to change any matplotlib settings, create a file:
+ ~/.matplotlib/matplotlibrc
-* CHANGELOG - all the significant changes to matplotlib, organized by
- release. The top of this file will show you the most recent changes
-* API_CHANGES - any change that alters the API is listed here. The
- entries are organized by release, with most recent entries first
+that contains at least the following information. The values shown are
+the defaults in the internal matplotlibrc file; change them as you see
+fit:
-* MIGRATION.txt - instructions on moving from the 0.91 code to the
- 0.98 trunk.
+# the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg WXAgg
+# Agg Cairo GD GDK Paint PS PDF SVG Template
+backend : TkAgg
+interactive : False # see http://matplotlib.sourceforge.net/interactive.html
-* SEGFAULTS - some tips for how to diagnose and debug segfaults
-
-* setup.py - the matplotlib build script
-
-* setupext.py - some helper code for setup.py to build the matplotlib
- extensions
-
-* boilerplate.py - some code to automatically generate the pyplot
- wrappers
-
-* DEVNOTES - deprecated developer notes. TODO: update and move to the
- doc/devel framework
-
-* FILETYPES - This is a table of the output formats supported by each
- backend. TODO: move to doc/users
-
-* INTERACTIVE - instructions on using matplotlib interactively, eg
- from the python shell. TODO: update and move to doc/users.
-
+See also
+<http://matplotlib.sourceforge.net/users/customizing.html>
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745
+ /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx 2009-09-14 17:11:06 UTC (rev 7756)
+++ trunk/matplotlib/make.osx 2009-09-14 17:12:19 UTC (rev 7757)
@@ -1,6 +1,7 @@
# build mpl into a local install dir with
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+MPLVERSION=0.99.1rc1
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
@@ -11,8 +12,8 @@
## You shouldn't need to configure past this point
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
-CFLAGS_DEPS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_DEPS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
clean:
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
@@ -34,10 +35,10 @@
tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
cd zlib-${ZLIBVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
./configure --prefix=${PREFIX}&&\
- MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 install&& \
+ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} make -j3 install&& \
unset MACOSX_DEPLOYMENT_TARGET
png: zlib
@@ -46,8 +47,8 @@
tar xvfj libpng-${PNGVERSION}.tar.bz2
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
./configure --disable-dependency-tracking --prefix=${PREFIX} &&\
make -j3 install&&\
cp .libs/libpng.a . &&\
@@ -60,8 +61,8 @@
tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
cd freetype-${FREETYPEVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\python/svn/bison/scripts/
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
./configure --prefix=${PREFIX} &&\
make -j3 install &&\
cp objs/.libs/libfreetype.a . &&\
@@ -74,15 +75,23 @@
mpl_build:
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
- python setup.py build
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
+ ${PYTHON} setup.py build
mpl_install:
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
- export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
- export LD_LIBRARY_PATH=${PREFIX}/lib &&\
- export DYLD_LIBRARY_PATH=${PREFIX}/lib &&\
- python setup.py install --prefix=${PREFIX}
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
+ ${PYTHON} setup.py install --prefix=${PREFIX}
+
+
+binaries:
+ unset PKG_CONFIG_PATH &&\
+ cp release/osx/data/setup.cfg release/osx/data/ReadMe.txt . &&\
+ export CFLAGS=${CFLAGS} &&\
+ export LDFLAGS=${LDFLAGS} &&\
+ /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
+ hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
+ ${PYTHON} setupegg.py bdist_egg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2009-09-14 17:16:51
|
Revision: 7758
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7758&view=rev
Author: mdboom
Date: 2009-09-14 17:16:41 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Merged revisions 7756 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint
........
r7756 | mdboom | 2009-09-14 13:11:06 -0400 (Mon, 14 Sep 2009) | 1 line
Minor doc fixes
........
Modified Paths:
--------------
trunk/matplotlib/doc/users/image_tutorial.rst
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/font_manager.py
trunk/matplotlib/lib/matplotlib/mlab.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7755
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7757
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Modified: trunk/matplotlib/doc/users/image_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/image_tutorial.rst 2009-09-14 17:12:19 UTC (rev 7757)
+++ trunk/matplotlib/doc/users/image_tutorial.rst 2009-09-14 17:16:41 UTC (rev 7758)
@@ -179,7 +179,7 @@
In [6]: lum_img = img[:,:,0]
-This is array slicing. You can read more `here
+This is array slicing. You can read more in the `Numpy tutorial
<http://www.scipy.org/Tentative_NumPy_Tutorial>`_.
.. sourcecode:: ipython
@@ -229,8 +229,8 @@
imgplot = plt.imshow(lum_img)
imgplot.set_cmap('spectral')
-There are many other colormap schemes available. See a list and
-images of the colormaps `here
+There are many other colormap schemes available. See the `list and
+images of the colormaps
<http://matplotlib.sourceforge.net/examples/pylab_examples/show_colormaps.html>`_.
.. _Color Bars
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2009-09-14 17:12:19 UTC (rev 7757)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2009-09-14 17:16:41 UTC (rev 7758)
@@ -7399,8 +7399,8 @@
window = mlab.window_hanning, noverlap=0, pad_to=None,
sides='default', scale_by_freq=None, **kwargs)
- cohere the coherence between *x* and *y*. Coherence is the normalized
- cross spectral density:
+ :meth:`cohere` the coherence between *x* and *y*. Coherence
+ is the normalized cross spectral density:
.. math::
Modified: trunk/matplotlib/lib/matplotlib/font_manager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/font_manager.py 2009-09-14 17:12:19 UTC (rev 7757)
+++ trunk/matplotlib/lib/matplotlib/font_manager.py 2009-09-14 17:16:41 UTC (rev 7758)
@@ -12,12 +12,12 @@
font specification <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_.
Future versions may implement the Level 2 or 2.1 specifications.
-Experimental support is included for using `fontconfig
-<http://www.fontconfig.org>`_ on Unix variant plaforms (Linux, OS X,
-Solaris). To enable it, set the constant ``USE_FONTCONFIG`` in this
-file to ``True``. Fontconfig has the advantage that it is the
-standard way to look up fonts on X11 platforms, so if a font is
-installed, it is much more likely to be found.
+Experimental support is included for using `fontconfig` on Unix
+variant platforms (Linux, OS X, Solaris). To enable it, set the
+constant ``USE_FONTCONFIG`` in this file to ``True``. Fontconfig has
+the advantage that it is the standard way to look up fonts on X11
+platforms, so if a font is installed, it is much more likely to be
+found.
"""
"""
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-14 17:12:19 UTC (rev 7757)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-14 17:16:41 UTC (rev 7758)
@@ -366,12 +366,16 @@
*x*
Array or sequence containing the data
+
%(PSD)s
+
Returns the tuple (*Pxx*, *freqs*).
Refs:
+
Bendat & Piersol -- Random Data: Analysis and Measurement
Procedures, John Wiley & Sons (1986)
+
"""
Pxx,freqs = csd(x, x, NFFT, Fs, detrend, window, noverlap, pad_to, sides,
scale_by_freq)
@@ -394,7 +398,9 @@
*x*, *y*
Array or sequence containing the data
+
%(PSD)s
+
Returns the tuple (*Pxy*, *freqs*).
Refs:
@@ -420,7 +426,9 @@
If *x* is real (i.e. non-complex) only the spectrum of the positive
frequencie is returned. If *x* is complex then the complete
spectrum is returned.
+
%(PSD)s
+
Returns a tuple (*Pxx*, *freqs*, *t*):
- *Pxx*: 2-D array, columns are the periodograms of
@@ -463,11 +471,13 @@
*x*, *y*
Array or sequence containing the data
+
%(PSD)s
+
The return value is the tuple (*Cxy*, *f*), where *f* are the
frequencies of the coherence vector. For cohere, scaling the
- individual densities by the sampling frequency has no effect, since
- the factors cancel out.
+ individual densities by the sampling frequency has no effect,
+ since the factors cancel out.
.. seealso::
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751
+ /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751,7756
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2009-09-14 21:52:36
|
Revision: 7761
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7761&view=rev
Author: leejjoon
Date: 2009-09-14 21:52:24 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
axes_grid: examples directory reorganization
Modified Paths:
--------------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py
Added Paths:
-----------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_fixed_size_axes.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_parasite_axes.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/parasite_simple.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider1.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider2.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider3.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline2.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline3.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_rgb.py
Removed Paths:
-------------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py
trunk/matplotlib/examples/axes_grid/demo_fixed_size_axes.py
trunk/matplotlib/examples/axes_grid/demo_parasite_axes.py
trunk/matplotlib/examples/axes_grid/parasite_simple.py
trunk/matplotlib/examples/axes_grid/simple_axes_divider1.py
trunk/matplotlib/examples/axes_grid/simple_axes_divider2.py
trunk/matplotlib/examples/axes_grid/simple_axes_divider3.py
trunk/matplotlib/examples/axes_grid/simple_axisline.py
trunk/matplotlib/examples/axes_grid/simple_axisline2.py
trunk/matplotlib/examples/axes_grid/simple_axisline3.py
trunk/matplotlib/examples/axes_grid/simple_rgb.py
Deleted: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_colorbar_with_inset_locator.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,40 +0,0 @@
-import matplotlib.pyplot as plt
-
-from mpl_toolkits.axes_grid.inset_locator import inset_axes
-from mpl_toolkits.axes_grid.colorbar import colorbar
-
-fig = plt.figure(1, [6, 3])
-
-# first subplot
-ax1 = fig.add_subplot(121)
-
-axins1 = inset_axes(ax1,
- width="50%", # width = 10% of parent_bbox width
- height="5%", # height : 50%
- loc=1)
-
-im1=ax1.imshow([[1,2],[2, 3]])
-colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3])
-axins1.xaxis.set_ticks_position("bottom")
-
-# first subplot
-ax = fig.add_subplot(122)
-
-axins = inset_axes(ax,
- width="5%", # width = 10% of parent_bbox width
- height="50%", # height : 50%
- loc=3,
- bbox_to_anchor=(1.05, 0., 1, 1),
- bbox_transform=ax.transAxes,
- borderpad=0,
- )
-
-# Controlling the placement of the inset axes is basically same as that
-# of the legend. you may want to play with the borderpad value and
-# the bbox_to_anchor coordinate.
-
-im=ax.imshow([[1,2],[2, 3]])
-colorbar(im, cax=axins, ticks=[1,2,3])
-
-plt.draw()
-plt.show()
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_fixed_size_axes.py (from rev 7760, trunk/matplotlib/examples/axes_grid/demo_fixed_size_axes.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_fixed_size_axes.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_fixed_size_axes.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,57 @@
+import matplotlib.pyplot as plt
+
+from mpl_toolkits.axes_grid \
+ import Divider, LocatableAxes, Size
+
+def demo_fixed_size_axes():
+
+ fig1 = plt.figure(1, (6, 6))
+
+ # The first items are for padding and the second items are for the axes.
+ # sizes are in inch.
+ h = [Size.Fixed(1.0), Size.Fixed(4.5)]
+ v = [Size.Fixed(0.7), Size.Fixed(5.)]
+
+ divider = Divider(fig1, (0.0, 0.0, 1., 1.), h, v, aspect=False)
+ # the width and height of the rectangle is ignored.
+
+ ax = LocatableAxes(fig1, divider.get_position())
+ ax.set_axes_locator(divider.new_locator(nx=1, ny=1))
+
+ fig1.add_axes(ax)
+
+ ax.plot([1,2,3])
+
+
+
+
+def demo_fixed_pad_axes():
+
+ fig = plt.figure(2, (6, 6))
+
+ # The first & third items are for padding and the second items are for the axes.
+ # sizes are in inch.
+ h = [Size.Fixed(1.0), Size.Scaled(1.), Size.Fixed(.2),]
+ v = [Size.Fixed(0.7), Size.Scaled(1.), Size.Fixed(.5),]
+
+ divider = Divider(fig, (0.0, 0.0, 1., 1.), h, v, aspect=False)
+ # the width and height of the rectangle is ignored.
+
+ ax = LocatableAxes(fig, divider.get_position())
+ ax.set_axes_locator(divider.new_locator(nx=1, ny=1))
+
+ fig.add_axes(ax)
+
+ ax.plot([1,2,3])
+
+
+
+
+
+
+if __name__ == "__main__":
+ demo_fixed_size_axes()
+ demo_fixed_pad_axes()
+
+ plt.draw()
+ plt.show()
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_parasite_axes.py (from rev 7760, trunk/matplotlib/examples/axes_grid/demo_parasite_axes.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_parasite_axes.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_parasite_axes.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,54 @@
+from mpl_toolkits.axes_grid.parasite_axes import HostAxes, ParasiteAxes
+import matplotlib.pyplot as plt
+
+if __name__ == "__main__":
+ fig = plt.figure(1)
+
+ host = HostAxes(fig, [0.15, 0.1, 0.65, 0.8])
+ par1 = ParasiteAxes(host, sharex=host)
+ par2 = ParasiteAxes(host, sharex=host)
+ host.parasites.append(par1)
+ host.parasites.append(par2)
+
+ host.set_ylabel("Density")
+ host.set_xlabel("Distance")
+
+ host.axis["right"].set_visible(False)
+ par1.axis["right"].set_visible(True)
+ par1.set_ylabel("Temperature")
+
+ par1.axis["right"].major_ticklabels.set_visible(True)
+ par1.axis["right"].label.set_visible(True)
+
+ par2.set_ylabel("Velocity")
+ offset = (60, 0)
+ new_axisline = par2._grid_helper.new_fixed_axis
+ par2.axis["right2"] = new_axisline(loc="right",
+ axes=par2,
+ offset=offset)
+
+
+ fig.add_axes(host)
+
+ host.set_xlim(0, 2)
+ host.set_ylim(0, 2)
+
+ host.set_xlabel("Distance")
+ host.set_ylabel("Density")
+ par1.set_ylabel("Temperature")
+
+ p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
+ p2, = par1.plot([0, 1, 2], [0, 3, 2], label="Temperature")
+ p3, = par2.plot([0, 1, 2], [50, 30, 15], label="Velocity")
+
+ par1.set_ylim(0, 4)
+ par2.set_ylim(1, 65)
+
+ host.legend()
+
+ host.axis["left"].label.set_color(p1.get_color())
+ par1.axis["right"].label.set_color(p2.get_color())
+ par2.axis["right2"].label.set_color(p3.get_color())
+
+ plt.draw()
+ plt.show()
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/parasite_simple.py (from rev 7760, trunk/matplotlib/examples/axes_grid/parasite_simple.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/parasite_simple.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/parasite_simple.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,24 @@
+from mpl_toolkits.axes_grid.parasite_axes import SubplotHost
+import matplotlib.pyplot as plt
+
+fig = plt.figure(1)
+
+host = SubplotHost(fig, 111)
+fig.add_subplot(host)
+
+par = host.twinx()
+
+host.set_xlabel("Distance")
+host.set_ylabel("Density")
+par.set_ylabel("Temperature")
+
+p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
+p2, = par.plot([0, 1, 2], [0, 3, 2], label="Temperature")
+
+host.axis["left"].label.set_color(p1.get_color())
+par.axis["right"].label.set_color(p2.get_color())
+
+host.legend()
+
+plt.show()
+
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider1.py (from rev 7760, trunk/matplotlib/examples/axes_grid/simple_axes_divider1.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider1.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider1.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,30 @@
+from mpl_toolkits.axes_grid import Size, Divider
+import matplotlib.pyplot as plt
+
+
+fig1 = plt.figure(1, (6, 6))
+
+# fixed size in inch
+horiz = [Size.Fixed(1.), Size.Fixed(.5), Size.Fixed(1.5),
+ Size.Fixed(.5)]
+vert = [Size.Fixed(1.5), Size.Fixed(.5), Size.Fixed(1.)]
+
+rect = (0.1, 0.1, 0.8, 0.8)
+# divide the axes rectangle into grid whose size is specified by horiz * vert
+divider = Divider(fig1, rect, horiz, vert, aspect=False)
+
+# the rect parameter will be ignore as we will set axes_locator
+ax1 = fig1.add_axes(rect, label="1")
+ax2 = fig1.add_axes(rect, label="2")
+ax3 = fig1.add_axes(rect, label="3")
+ax4 = fig1.add_axes(rect, label="4")
+
+ax1.set_axes_locator(divider.new_locator(nx=0, ny=0))
+ax2.set_axes_locator(divider.new_locator(nx=0, ny=2))
+ax3.set_axes_locator(divider.new_locator(nx=2, ny=2))
+ax4.set_axes_locator(divider.new_locator(nx=2, nx1=4, ny=0))
+
+
+
+plt.draw()
+plt.show()
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider2.py (from rev 7760, trunk/matplotlib/examples/axes_grid/simple_axes_divider2.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider2.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider2.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,29 @@
+import mpl_toolkits.axes_grid.axes_size as Size
+from mpl_toolkits.axes_grid import Divider
+import matplotlib.pyplot as plt
+
+fig1 = plt.figure(1, (5.5, 4.))
+
+# the rect parameter will be ignore as we will set axes_locator
+rect = (0.1, 0.1, 0.8, 0.8)
+ax = [fig1.add_axes(rect, label="%d"%i) for i in range(4)]
+
+horiz = [Size.Scaled(1.5), Size.Fixed(.5), Size.Scaled(1.),
+ Size.Scaled(.5)]
+
+vert = [Size.Scaled(1.), Size.Fixed(.5), Size.Scaled(1.5)]
+
+# divide the axes rectangle into grid whose size is specified by horiz * vert
+divider = Divider(fig1, rect, horiz, vert, aspect=False)
+
+ax[0].set_axes_locator(divider.new_locator(nx=0, ny=0))
+ax[1].set_axes_locator(divider.new_locator(nx=0, ny=2))
+ax[2].set_axes_locator(divider.new_locator(nx=2, ny=2))
+ax[3].set_axes_locator(divider.new_locator(nx=2, nx1=4, ny=0))
+
+for ax1 in ax:
+ plt.setp(ax1.get_xticklabels()+ax1.get_yticklabels(),
+ visible=False)
+
+plt.draw()
+plt.show()
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider3.py (from rev 7760, trunk/matplotlib/examples/axes_grid/simple_axes_divider3.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider3.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axes_divider3.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,38 @@
+import mpl_toolkits.axes_grid.axes_size as Size
+from mpl_toolkits.axes_grid import Divider
+import matplotlib.pyplot as plt
+
+
+fig1 = plt.figure(1, (5.5, 4))
+
+# the rect parameter will be ignore as we will set axes_locator
+rect = (0.1, 0.1, 0.8, 0.8)
+ax = [fig1.add_axes(rect, label="%d"%i) for i in range(4)]
+
+
+horiz = [Size.AxesX(ax[0]), Size.Fixed(.5), Size.AxesX(ax[1])]
+vert = [Size.AxesY(ax[0]), Size.Fixed(.5), Size.AxesY(ax[2])]
+
+# divide the axes rectangle into grid whose size is specified by horiz * vert
+divider = Divider(fig1, rect, horiz, vert, aspect=False)
+
+
+ax[0].set_axes_locator(divider.new_locator(nx=0, ny=0))
+ax[1].set_axes_locator(divider.new_locator(nx=2, ny=0))
+ax[2].set_axes_locator(divider.new_locator(nx=0, ny=2))
+ax[3].set_axes_locator(divider.new_locator(nx=2, ny=2))
+
+ax[0].set_xlim(0, 2)
+ax[1].set_xlim(0, 1)
+
+ax[0].set_ylim(0, 1)
+ax[2].set_ylim(0, 2)
+
+divider.set_aspect(1.)
+
+for ax1 in ax:
+ plt.setp(ax1.get_xticklabels()+ax1.get_yticklabels(),
+ visible=False)
+
+plt.draw()
+plt.show()
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline.py (from rev 7760, trunk/matplotlib/examples/axes_grid/simple_axisline.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,39 @@
+import matplotlib.pyplot as plt
+
+from mpl_toolkits.axes_grid.axislines import SubplotZero
+
+if 1:
+
+ fig = plt.figure(1)
+ fig.subplots_adjust(right=0.85)
+ ax = SubplotZero(fig, 1, 1, 1)
+ fig.add_subplot(ax)
+
+ # make right and top axis invisible
+ ax.axis["right"].set_visible(False)
+ ax.axis["top"].set_visible(False)
+
+ # make xzero axis (horizontal axis line through y=0) visible.
+ ax.axis["xzero"].set_visible(True)
+ ax.axis["xzero"].label.set_text("Axis Zero")
+
+ ax.set_ylim(-2, 4)
+ ax.set_xlabel("Label X")
+ ax.set_ylabel("Label Y")
+ # or
+ #ax.axis["bottom"].label.set_text("Label X")
+ #ax.axis["left"].label.set_text("Label Y")
+
+ # make new (right-side) yaxis, but wth some offset
+ offset = (20, 0)
+ new_axisline = ax.get_grid_helper().new_fixed_axis
+
+ ax.axis["right2"] = new_axisline(loc="right",
+ offset=offset,
+ axes=ax)
+ ax.axis["right2"].label.set_text("Label Y2")
+
+ ax.plot([-2,3,2])
+ plt.draw()
+ plt.show()
+
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline2.py (from rev 7760, trunk/matplotlib/examples/axes_grid/simple_axisline2.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline2.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline2.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,24 @@
+import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid.axislines import SubplotZero
+import numpy as np
+
+fig = plt.figure(1, (4,3))
+
+# a subplot with two additiona axis, "xzero" and "yzero". "xzero" is
+# y=0 line, and "yzero" is x=0 line.
+ax = SubplotZero(fig, 1, 1, 1)
+fig.add_subplot(ax)
+
+# make xzero axis (horizontal axis line through y=0) visible.
+ax.axis["xzero"].set_visible(True)
+ax.axis["xzero"].label.set_text("Axis Zero")
+
+# make other axis (bottom, top, right) invisible.
+for n in ["bottom", "top", "right"]:
+ ax.axis[n].set_visible(False)
+
+xx = np.arange(0, 2*np.pi, 0.01)
+ax.plot(xx, np.sin(xx))
+
+plt.show()
+
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline3.py (from rev 7760, trunk/matplotlib/examples/axes_grid/simple_axisline3.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline3.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axisline3.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,13 @@
+import matplotlib.pyplot as plt
+from mpl_toolkits.axes_grid.axislines import Subplot
+
+fig = plt.figure(1, (3,3))
+
+ax = Subplot(fig, 111)
+fig.add_subplot(ax)
+
+ax.axis["right"].set_visible(False)
+ax.axis["top"].set_visible(False)
+
+plt.show()
+
Copied: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_rgb.py (from rev 7760, trunk/matplotlib/examples/axes_grid/simple_rgb.py)
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_rgb.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_rgb.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -0,0 +1,38 @@
+import matplotlib.pyplot as plt
+
+from mpl_toolkits.axes_grid.axes_rgb import RGBAxes
+
+def get_demo_image():
+ import numpy as np
+ from matplotlib.cbook import get_sample_data
+ f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
+ z = np.load(f)
+ # z is a numpy array of 15x15
+ return z, (-3,4,-4,3)
+
+def get_rgb():
+ Z, extent = get_demo_image()
+
+ Z[Z<0] = 0.
+ Z = Z/Z.max()
+
+ R = Z[:13,:13]
+ G = Z[2:,2:]
+ B = Z[:13,2:]
+
+ return R, G, B
+
+
+fig = plt.figure(1)
+ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
+
+r, g, b = get_rgb()
+kwargs = dict(origin="lower", interpolation="nearest")
+ax.imshow_rgb(r, g, b, **kwargs)
+
+ax.RGB.set_xlim(0., 9.5)
+ax.RGB.set_ylim(0.9, 10.6)
+
+
+plt.draw()
+plt.show()
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axes_divider.rst 2009-09-14 21:52:24 UTC (rev 7761)
@@ -81,12 +81,12 @@
See the example,
-.. plot:: mpl_toolkits/axes_grid/examples/simple_axes_divider2.py
+.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider2.py
:include-source:
You can adjust the size of the each axes accroding to their x or y
data limits (AxesX and AxesY), similar to the axes aspect parameter.
-.. plot:: mpl_toolkits/axes_grid/examples/simple_axes_divider3.py
+.. plot:: mpl_toolkits/axes_grid/figures/simple_axes_divider3.py
:include-source:
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/overview.rst 2009-09-14 21:52:24 UTC (rev 7761)
@@ -158,7 +158,7 @@
origin="lower", interpolation="nearest")
-.. plot:: mpl_toolkits/axes_grid/examples/simple_rgb.py
+.. plot:: mpl_toolkits/axes_grid/figures/simple_rgb.py
@@ -246,7 +246,7 @@
Example 1. twinx
----------------
-.. plot:: mpl_toolkits/axes_grid/examples/parasite_simple.py
+.. plot:: mpl_toolkits/axes_grid/figures/parasite_simple.py
:include-source:
Example 2. twin
@@ -290,13 +290,13 @@
ax.axis["top"].set_visible(False)
-.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline3.py
+.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline3.py
SubplotZero gives you two more additional (floating?) axis of x=0 and
y=0 (in data coordinate)
-.. plot:: mpl_toolkits/axes_grid/examples/simple_axisline2.py
+.. plot:: mpl_toolkits/axes_grid/figures/simple_axisline2.py
:include-source:
Modified: trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/demo_colorbar_with_inset_locator.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,7 +1,7 @@
import matplotlib.pyplot as plt
from mpl_toolkits.axes_grid.inset_locator import inset_axes
-#from mpl_toolkits.axes_grid.colorbar import colorbar
+from mpl_toolkits.axes_grid.colorbar import colorbar
fig = plt.figure(1, [6, 3])
@@ -13,8 +13,6 @@
height="5%", # height : 50%
loc=1)
-locator1=axins1.get_axes_locator()
-
im1=ax1.imshow([[1,2],[2, 3]])
colorbar(im1, cax=axins1, orientation="horizontal", ticks=[1,2,3])
axins1.xaxis.set_ticks_position("bottom")
@@ -31,14 +29,12 @@
borderpad=0,
)
-
-locator=axins.get_axes_locator()
# Controlling the placement of the inset axes is basically same as that
# of the legend. you may want to play with the borderpad value and
# the bbox_to_anchor coordinate.
im=ax.imshow([[1,2],[2, 3]])
-colorbar(im, cax=axins)
+colorbar(im, cax=axins, ticks=[1,2,3])
plt.draw()
plt.show()
Deleted: trunk/matplotlib/examples/axes_grid/demo_fixed_size_axes.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_fixed_size_axes.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/demo_fixed_size_axes.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,57 +0,0 @@
-import matplotlib.pyplot as plt
-
-from mpl_toolkits.axes_grid \
- import Divider, LocatableAxes, Size
-
-def demo_fixed_size_axes():
-
- fig1 = plt.figure(1, (6, 6))
-
- # The first items are for padding and the second items are for the axes.
- # sizes are in inch.
- h = [Size.Fixed(1.0), Size.Fixed(4.5)]
- v = [Size.Fixed(0.7), Size.Fixed(5.)]
-
- divider = Divider(fig1, (0.0, 0.0, 1., 1.), h, v, aspect=False)
- # the width and height of the rectangle is ignored.
-
- ax = LocatableAxes(fig1, divider.get_position())
- ax.set_axes_locator(divider.new_locator(nx=1, ny=1))
-
- fig1.add_axes(ax)
-
- ax.plot([1,2,3])
-
-
-
-
-def demo_fixed_pad_axes():
-
- fig = plt.figure(2, (6, 6))
-
- # The first & third items are for padding and the second items are for the axes.
- # sizes are in inch.
- h = [Size.Fixed(1.0), Size.Scaled(1.), Size.Fixed(.2),]
- v = [Size.Fixed(0.7), Size.Scaled(1.), Size.Fixed(.5),]
-
- divider = Divider(fig, (0.0, 0.0, 1., 1.), h, v, aspect=False)
- # the width and height of the rectangle is ignored.
-
- ax = LocatableAxes(fig, divider.get_position())
- ax.set_axes_locator(divider.new_locator(nx=1, ny=1))
-
- fig.add_axes(ax)
-
- ax.plot([1,2,3])
-
-
-
-
-
-
-if __name__ == "__main__":
- demo_fixed_size_axes()
- demo_fixed_pad_axes()
-
- plt.draw()
- plt.show()
Deleted: trunk/matplotlib/examples/axes_grid/demo_parasite_axes.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/demo_parasite_axes.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/demo_parasite_axes.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,54 +0,0 @@
-from mpl_toolkits.axes_grid.parasite_axes import HostAxes, ParasiteAxes
-import matplotlib.pyplot as plt
-
-if __name__ == "__main__":
- fig = plt.figure(1)
-
- host = HostAxes(fig, [0.15, 0.1, 0.65, 0.8])
- par1 = ParasiteAxes(host, sharex=host)
- par2 = ParasiteAxes(host, sharex=host)
- host.parasites.append(par1)
- host.parasites.append(par2)
-
- host.set_ylabel("Density")
- host.set_xlabel("Distance")
-
- host.axis["right"].set_visible(False)
- par1.axis["right"].set_visible(True)
- par1.set_ylabel("Temperature")
-
- par1.axis["right"].major_ticklabels.set_visible(True)
- par1.axis["right"].label.set_visible(True)
-
- par2.set_ylabel("Velocity")
- offset = (60, 0)
- new_axisline = par2._grid_helper.new_fixed_axis
- par2.axis["right2"] = new_axisline(loc="right",
- axes=par2,
- offset=offset)
-
-
- fig.add_axes(host)
-
- host.set_xlim(0, 2)
- host.set_ylim(0, 2)
-
- host.set_xlabel("Distance")
- host.set_ylabel("Density")
- par1.set_ylabel("Temperature")
-
- p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
- p2, = par1.plot([0, 1, 2], [0, 3, 2], label="Temperature")
- p3, = par2.plot([0, 1, 2], [50, 30, 15], label="Velocity")
-
- par1.set_ylim(0, 4)
- par2.set_ylim(1, 65)
-
- host.legend()
-
- host.axis["left"].label.set_color(p1.get_color())
- par1.axis["right"].label.set_color(p2.get_color())
- par2.axis["right2"].label.set_color(p3.get_color())
-
- plt.draw()
- plt.show()
Deleted: trunk/matplotlib/examples/axes_grid/parasite_simple.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/parasite_simple.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/parasite_simple.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,24 +0,0 @@
-from mpl_toolkits.axes_grid.parasite_axes import SubplotHost
-import matplotlib.pyplot as plt
-
-fig = plt.figure(1)
-
-host = SubplotHost(fig, 111)
-fig.add_subplot(host)
-
-par = host.twinx()
-
-host.set_xlabel("Distance")
-host.set_ylabel("Density")
-par.set_ylabel("Temperature")
-
-p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
-p2, = par.plot([0, 1, 2], [0, 3, 2], label="Temperature")
-
-host.axis["left"].label.set_color(p1.get_color())
-par.axis["right"].label.set_color(p2.get_color())
-
-host.legend()
-
-plt.show()
-
Deleted: trunk/matplotlib/examples/axes_grid/simple_axes_divider1.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/simple_axes_divider1.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/simple_axes_divider1.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,30 +0,0 @@
-from mpl_toolkits.axes_grid import Size, Divider
-import matplotlib.pyplot as plt
-
-
-fig1 = plt.figure(1, (6, 6))
-
-# fixed size in inch
-horiz = [Size.Fixed(1.), Size.Fixed(.5), Size.Fixed(1.5),
- Size.Fixed(.5)]
-vert = [Size.Fixed(1.5), Size.Fixed(.5), Size.Fixed(1.)]
-
-rect = (0.1, 0.1, 0.8, 0.8)
-# divide the axes rectangle into grid whose size is specified by horiz * vert
-divider = Divider(fig1, rect, horiz, vert, aspect=False)
-
-# the rect parameter will be ignore as we will set axes_locator
-ax1 = fig1.add_axes(rect, label="1")
-ax2 = fig1.add_axes(rect, label="2")
-ax3 = fig1.add_axes(rect, label="3")
-ax4 = fig1.add_axes(rect, label="4")
-
-ax1.set_axes_locator(divider.new_locator(nx=0, ny=0))
-ax2.set_axes_locator(divider.new_locator(nx=0, ny=2))
-ax3.set_axes_locator(divider.new_locator(nx=2, ny=2))
-ax4.set_axes_locator(divider.new_locator(nx=2, nx1=4, ny=0))
-
-
-
-plt.draw()
-plt.show()
Deleted: trunk/matplotlib/examples/axes_grid/simple_axes_divider2.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/simple_axes_divider2.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/simple_axes_divider2.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,29 +0,0 @@
-import mpl_toolkits.axes_grid.axes_size as Size
-from mpl_toolkits.axes_grid import Divider
-import matplotlib.pyplot as plt
-
-fig1 = plt.figure(1, (5.5, 4.))
-
-# the rect parameter will be ignore as we will set axes_locator
-rect = (0.1, 0.1, 0.8, 0.8)
-ax = [fig1.add_axes(rect, label="%d"%i) for i in range(4)]
-
-horiz = [Size.Scaled(1.5), Size.Fixed(.5), Size.Scaled(1.),
- Size.Scaled(.5)]
-
-vert = [Size.Scaled(1.), Size.Fixed(.5), Size.Scaled(1.5)]
-
-# divide the axes rectangle into grid whose size is specified by horiz * vert
-divider = Divider(fig1, rect, horiz, vert, aspect=False)
-
-ax[0].set_axes_locator(divider.new_locator(nx=0, ny=0))
-ax[1].set_axes_locator(divider.new_locator(nx=0, ny=2))
-ax[2].set_axes_locator(divider.new_locator(nx=2, ny=2))
-ax[3].set_axes_locator(divider.new_locator(nx=2, nx1=4, ny=0))
-
-for ax1 in ax:
- plt.setp(ax1.get_xticklabels()+ax1.get_yticklabels(),
- visible=False)
-
-plt.draw()
-plt.show()
Deleted: trunk/matplotlib/examples/axes_grid/simple_axes_divider3.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/simple_axes_divider3.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/simple_axes_divider3.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,38 +0,0 @@
-import mpl_toolkits.axes_grid.axes_size as Size
-from mpl_toolkits.axes_grid import Divider
-import matplotlib.pyplot as plt
-
-
-fig1 = plt.figure(1, (5.5, 4))
-
-# the rect parameter will be ignore as we will set axes_locator
-rect = (0.1, 0.1, 0.8, 0.8)
-ax = [fig1.add_axes(rect, label="%d"%i) for i in range(4)]
-
-
-horiz = [Size.AxesX(ax[0]), Size.Fixed(.5), Size.AxesX(ax[1])]
-vert = [Size.AxesY(ax[0]), Size.Fixed(.5), Size.AxesY(ax[2])]
-
-# divide the axes rectangle into grid whose size is specified by horiz * vert
-divider = Divider(fig1, rect, horiz, vert, aspect=False)
-
-
-ax[0].set_axes_locator(divider.new_locator(nx=0, ny=0))
-ax[1].set_axes_locator(divider.new_locator(nx=2, ny=0))
-ax[2].set_axes_locator(divider.new_locator(nx=0, ny=2))
-ax[3].set_axes_locator(divider.new_locator(nx=2, ny=2))
-
-ax[0].set_xlim(0, 2)
-ax[1].set_xlim(0, 1)
-
-ax[0].set_ylim(0, 1)
-ax[2].set_ylim(0, 2)
-
-divider.set_aspect(1.)
-
-for ax1 in ax:
- plt.setp(ax1.get_xticklabels()+ax1.get_yticklabels(),
- visible=False)
-
-plt.draw()
-plt.show()
Deleted: trunk/matplotlib/examples/axes_grid/simple_axisline.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/simple_axisline.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/simple_axisline.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,39 +0,0 @@
-import matplotlib.pyplot as plt
-
-from mpl_toolkits.axes_grid.axislines import SubplotZero
-
-if 1:
-
- fig = plt.figure(1)
- fig.subplots_adjust(right=0.85)
- ax = SubplotZero(fig, 1, 1, 1)
- fig.add_subplot(ax)
-
- # make right and top axis invisible
- ax.axis["right"].set_visible(False)
- ax.axis["top"].set_visible(False)
-
- # make xzero axis (horizontal axis line through y=0) visible.
- ax.axis["xzero"].set_visible(True)
- ax.axis["xzero"].label.set_text("Axis Zero")
-
- ax.set_ylim(-2, 4)
- ax.set_xlabel("Label X")
- ax.set_ylabel("Label Y")
- # or
- #ax.axis["bottom"].label.set_text("Label X")
- #ax.axis["left"].label.set_text("Label Y")
-
- # make new (right-side) yaxis, but wth some offset
- offset = (20, 0)
- new_axisline = ax.get_grid_helper().new_fixed_axis
-
- ax.axis["right2"] = new_axisline(loc="right",
- offset=offset,
- axes=ax)
- ax.axis["right2"].label.set_text("Label Y2")
-
- ax.plot([-2,3,2])
- plt.draw()
- plt.show()
-
Deleted: trunk/matplotlib/examples/axes_grid/simple_axisline2.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/simple_axisline2.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/simple_axisline2.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,24 +0,0 @@
-import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid.axislines import SubplotZero
-import numpy as np
-
-fig = plt.figure(1, (4,3))
-
-# a subplot with two additiona axis, "xzero" and "yzero". "xzero" is
-# y=0 line, and "yzero" is x=0 line.
-ax = SubplotZero(fig, 1, 1, 1)
-fig.add_subplot(ax)
-
-# make xzero axis (horizontal axis line through y=0) visible.
-ax.axis["xzero"].set_visible(True)
-ax.axis["xzero"].label.set_text("Axis Zero")
-
-# make other axis (bottom, top, right) invisible.
-for n in ["bottom", "top", "right"]:
- ax.axis[n].set_visible(False)
-
-xx = np.arange(0, 2*np.pi, 0.01)
-ax.plot(xx, np.sin(xx))
-
-plt.show()
-
Deleted: trunk/matplotlib/examples/axes_grid/simple_axisline3.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/simple_axisline3.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/simple_axisline3.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,13 +0,0 @@
-import matplotlib.pyplot as plt
-from mpl_toolkits.axes_grid.axislines import Subplot
-
-fig = plt.figure(1, (3,3))
-
-ax = Subplot(fig, 111)
-fig.add_subplot(ax)
-
-ax.axis["right"].set_visible(False)
-ax.axis["top"].set_visible(False)
-
-plt.show()
-
Deleted: trunk/matplotlib/examples/axes_grid/simple_rgb.py
===================================================================
--- trunk/matplotlib/examples/axes_grid/simple_rgb.py 2009-09-14 19:32:27 UTC (rev 7760)
+++ trunk/matplotlib/examples/axes_grid/simple_rgb.py 2009-09-14 21:52:24 UTC (rev 7761)
@@ -1,38 +0,0 @@
-import matplotlib.pyplot as plt
-
-from mpl_toolkits.axes_grid.axes_rgb import RGBAxes
-
-def get_demo_image():
- import numpy as np
- from matplotlib.cbook import get_sample_data
- f = get_sample_data("axes_grid/bivariate_normal.npy", asfileobj=False)
- z = np.load(f)
- # z is a numpy array of 15x15
- return z, (-3,4,-4,3)
-
-def get_rgb():
- Z, extent = get_demo_image()
-
- Z[Z<0] = 0.
- Z = Z/Z.max()
-
- R = Z[:13,:13]
- G = Z[2:,2:]
- B = Z[:13,2:]
-
- return R, G, B
-
-
-fig = plt.figure(1)
-ax = RGBAxes(fig, [0.1, 0.1, 0.8, 0.8])
-
-r, g, b = get_rgb()
-kwargs = dict(origin="lower", interpolation="nearest")
-ax.imshow_rgb(r, g, b, **kwargs)
-
-ax.RGB.set_xlim(0., 9.5)
-ax.RGB.set_ylim(0.9, 10.6)
-
-
-plt.draw()
-plt.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-09-15 12:38:05
|
Revision: 7763
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7763&view=rev
Author: jouni
Date: 2009-09-15 12:37:55 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
Merged revisions 7762 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7762 | jouni | 2009-09-15 15:12:19 +0300 (Ti, 15 Syy 2009) | 1 line
Don't fail on AFM files containing floating-point bounding boxes
........
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/afm.py
Property Changed:
----------------
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/examples/misc/multiprocess.py
trunk/matplotlib/examples/mplot3d/contour3d_demo.py
trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
trunk/matplotlib/examples/mplot3d/polys3d_demo.py
trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
trunk/matplotlib/examples/mplot3d/surface3d_demo.py
trunk/matplotlib/examples/mplot3d/wire3d_demo.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
- /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7757
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7757,7762
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2009-09-15 12:12:19 UTC (rev 7762)
+++ trunk/matplotlib/CHANGELOG 2009-09-15 12:37:55 UTC (rev 7763)
@@ -1,3 +1,5 @@
+2009-09-15 Don't fail on AFM files containing floating-point bounding boxes - JKS
+
2009-09-13 AxesGrid : add modified version of colorbar. Add colorbar
location howto. - JJL
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Modified: trunk/matplotlib/lib/matplotlib/afm.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/afm.py 2009-09-15 12:12:19 UTC (rev 7762)
+++ trunk/matplotlib/lib/matplotlib/afm.py 2009-09-15 12:37:55 UTC (rev 7763)
@@ -165,7 +165,8 @@
num = _to_int(vals[0].split()[1])
wx = _to_float(vals[1].split()[1])
name = vals[2].split()[1]
- bbox = _to_list_of_ints(vals[3][2:])
+ bbox = _to_list_of_floats(vals[3][2:])
+ bbox = map(int, bbox)
# Workaround: If the character name is 'Euro', give it the corresponding
# character code, according to WinAnsiEncoding (see PDF Reference).
if name == 'Euro':
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751,7756
+ /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7703,7727-7734,7740-7741,7745,7751,7756,7762
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X