matplotlib-checkins Mailing List for matplotlib (Page 4)

Revision: 7547
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7547&view=rev
Author: astraw
Date: 2009年08月23日 19:19:03 +0000 (2009年8月23日)
Log Message:
-----------
keep failed images
Modified Paths:
--------------
 trunk/matplotlib/test/_buildbot_test.py
Modified: trunk/matplotlib/test/_buildbot_test.py
===================================================================
--- trunk/matplotlib/test/_buildbot_test.py	2009年08月23日 19:14:04 UTC (rev 7546)
+++ trunk/matplotlib/test/_buildbot_test.py	2009年08月23日 19:19:03 UTC (rev 7547)
@@ -13,5 +13,5 @@
 TARGET_py = os.path.join(TARGET,'bin','python')
 check_call('%s -c "import shutil,matplotlib; x=matplotlib.get_configdir(); shutil.rmtree(x)"'%TARGET_py)
 
-check_call('%s run-mpl-test.py --all'%TARGET_py,
+check_call('%s run-mpl-test.py --all --keep-failed'%TARGET_py,
 cwd='test')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7546
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7546&view=rev
Author: astraw
Date: 2009年08月23日 19:14:04 +0000 (2009年8月23日)
Log Message:
-----------
erase /home/astraw/.matplotlib before testing (fix)
Modified Paths:
--------------
 trunk/matplotlib/test/_buildbot_test.py
Modified: trunk/matplotlib/test/_buildbot_test.py
===================================================================
--- trunk/matplotlib/test/_buildbot_test.py	2009年08月23日 19:12:30 UTC (rev 7545)
+++ trunk/matplotlib/test/_buildbot_test.py	2009年08月23日 19:14:04 UTC (rev 7546)
@@ -10,9 +10,8 @@
 if not os.path.exists(TARGET):
 raise RuntimeError('the virtualenv target directory was not found')
 
+TARGET_py = os.path.join(TARGET,'bin','python')
 check_call('%s -c "import shutil,matplotlib; x=matplotlib.get_configdir(); shutil.rmtree(x)"'%TARGET_py)
 
-shutil.rmtree( os.expanduser( os.path.join('~','.matplotlib')))
-TARGET_py = os.path.join(TARGET,'bin','python')
 check_call('%s run-mpl-test.py --all'%TARGET_py,
 cwd='test')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7545
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7545&view=rev
Author: jdh2358
Date: 2009年08月23日 19:12:30 +0000 (2009年8月23日)
Log Message:
-----------
flush config dir and use rc on build slaves
Modified Paths:
--------------
 trunk/matplotlib/test/_buildbot_mac_sage.sh
 trunk/matplotlib/test/matplotlibrc
Modified: trunk/matplotlib/test/_buildbot_mac_sage.sh
===================================================================
--- trunk/matplotlib/test/_buildbot_mac_sage.sh	2009年08月23日 19:12:20 UTC (rev 7544)
+++ trunk/matplotlib/test/_buildbot_mac_sage.sh	2009年08月23日 19:12:30 UTC (rev 7545)
@@ -1,9 +1,11 @@
 #!/bin/bash
 set -e
-export PYTHON=/Users/jdh2358/dev/bin/python
-export PREFIX=/Users/jdh2358/devbb 
-export PYTHONPATH=${PREFIX}/lib/python2.6/site-packages:/Users/jdh2358/dev/lib/python2.6/site-packages
+rm -rf ${HOME}/.matplotlib/*
 
+export PYTHON=${HOME}/dev/bin/python
+export PREFIX=${HOME}/devbb 
+export PYTHONPATH=${PREFIX}/lib/python2.6/site-packages:${HOME}/dev/lib/python2.6/site-packages
+
 make -f make.osx mpl_install
 echo ${PYTHONPATH}
 
Modified: trunk/matplotlib/test/matplotlibrc
===================================================================
--- trunk/matplotlib/test/matplotlibrc	2009年08月23日 19:12:20 UTC (rev 7544)
+++ trunk/matplotlib/test/matplotlibrc	2009年08月23日 19:12:30 UTC (rev 7545)
@@ -1,3 +1,3 @@
-#This is an empty matplotlibrc so that the tests use the
-#matplotlib default config and not the user's config. This keeps
-#settings like font sizes from causing the image comparison tests to fail.
+backend : Agg
+font.family : sans-serif
+font.sans-serif : Bitstream Vera Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7544
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7544&view=rev
Author: astraw
Date: 2009年08月23日 19:12:20 +0000 (2009年8月23日)
Log Message:
-----------
erase /home/astraw/.matplotlib before testing
Modified Paths:
--------------
 trunk/matplotlib/test/_buildbot_test.py
Modified: trunk/matplotlib/test/_buildbot_test.py
===================================================================
--- trunk/matplotlib/test/_buildbot_test.py	2009年08月23日 18:59:07 UTC (rev 7543)
+++ trunk/matplotlib/test/_buildbot_test.py	2009年08月23日 19:12:20 UTC (rev 7544)
@@ -10,6 +10,9 @@
 if not os.path.exists(TARGET):
 raise RuntimeError('the virtualenv target directory was not found')
 
+check_call('%s -c "import shutil,matplotlib; x=matplotlib.get_configdir(); shutil.rmtree(x)"'%TARGET_py)
+
+shutil.rmtree( os.expanduser( os.path.join('~','.matplotlib')))
 TARGET_py = os.path.join(TARGET,'bin','python')
 check_call('%s run-mpl-test.py --all'%TARGET_py,
 cwd='test')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7543
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7543&view=rev
Author: jdh2358
Date: 2009年08月23日 18:59:07 +0000 (2009年8月23日)
Log Message:
-----------
fixes to sage build slave
Modified Paths:
--------------
 trunk/matplotlib/test/README.build_slaves
 trunk/matplotlib/test/_buildbot_mac_sage.sh
Modified: trunk/matplotlib/test/README.build_slaves
===================================================================
--- trunk/matplotlib/test/README.build_slaves	2009年08月23日 18:44:35 UTC (rev 7542)
+++ trunk/matplotlib/test/README.build_slaves	2009年08月23日 18:59:07 UTC (rev 7543)
@@ -2,3 +2,9 @@
 python source install with clean installs of numpy and mpl. Both of
 these will need nose installed.
 
+Dependencies
+===================
+buildbot and twisted
+nose
+pil
+virtualenv
Modified: trunk/matplotlib/test/_buildbot_mac_sage.sh
===================================================================
--- trunk/matplotlib/test/_buildbot_mac_sage.sh	2009年08月23日 18:44:35 UTC (rev 7542)
+++ trunk/matplotlib/test/_buildbot_mac_sage.sh	2009年08月23日 18:59:07 UTC (rev 7543)
@@ -1,2 +1,10 @@
-#!/bin/sh
-PREFIX=/Users/jdh2358/devbb make -f make.osx mpl_install
+#!/bin/bash
+set -e
+export PYTHON=/Users/jdh2358/dev/bin/python
+export PREFIX=/Users/jdh2358/devbb 
+export PYTHONPATH=${PREFIX}/lib/python2.6/site-packages:/Users/jdh2358/dev/lib/python2.6/site-packages
+
+make -f make.osx mpl_install
+echo ${PYTHONPATH}
+
+cd test && python run-mpl-test.py --all --keep-failed
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7542
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7542&view=rev
Author: jdh2358
Date: 2009年08月23日 18:44:35 +0000 (2009年8月23日)
Log Message:
-----------
Merged revisions 7536,7541 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
 r7536 | jdh2358 | 2009年08月23日 00:27:40 -0500 (2009年8月23日) | 1 line
 
 fix some typos in the docs
........
 r7541 | jdh2358 | 2009年08月23日 13:42:37 -0500 (2009年8月23日) | 1 line
 
 more harness around locale
........
Modified Paths:
--------------
 trunk/matplotlib/doc/users/annotations_guide.rst
 trunk/matplotlib/doc/users/event_handling.rst
 trunk/matplotlib/doc/users/installing.rst
 trunk/matplotlib/doc/users/path_tutorial.rst
 trunk/matplotlib/doc/users/shell.rst
 trunk/matplotlib/doc/users/transforms_tutorial.rst
 trunk/matplotlib/lib/matplotlib/cbook.py
Added Paths:
-----------
 trunk/matplotlib/examples/animation/animate_decay_tk_blit.py
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7533
 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7541
Modified: trunk/matplotlib/doc/users/annotations_guide.rst
===================================================================
--- trunk/matplotlib/doc/users/annotations_guide.rst	2009年08月23日 18:42:37 UTC (rev 7541)
+++ trunk/matplotlib/doc/users/annotations_guide.rst	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -4,7 +4,7 @@
 Annotating Axes
 ****************
 
-Do not proceed unless you already have read 
+Do not proceed unless you already have read
 :func:`~matplotlib.pyplot.text` and :func:`~matplotlib.pyplot.annotate`!
 
 
@@ -38,7 +38,7 @@
 bb.set_boxstyle("rarrow", pad=0.6)
 
 The arguments are the name of the box style with its attributes as
-keyword arguments. Currently, followign box styles are implemented.
+keyword arguments. Currently, following box styles are implemented.
 
 ========== ============== ==========================
 Class Name Attrs
@@ -55,7 +55,7 @@
 .. plot:: mpl_examples/pylab_examples/fancybox_demo2.py
 
 
-Note that the attrubutes arguments can be specified within the style
+Note that the attributes arguments can be specified within the style
 name with separating comma (this form can be used as "boxstyle" value
 of bbox argument when initializing the text instance) ::
 
@@ -103,7 +103,7 @@
 2. If patch object is given (*patchA* & *patchB*), the path is clipped to
 avoid the patch.
 
-3. The path is further shrinked by given amount of pixels (*shirnkA*
+3. The path is further shrunk by given amount of pixels (*shirnkA*
 & *shrinkB*)
 
 4. The path is transmuted to arrow patch, which is controlled by the
@@ -114,7 +114,7 @@
 
 
 The creation of the connecting path between two points is controlled by
-``connectionstyle`` key and follwing styles are available.
+``connectionstyle`` key and following styles are available.
 
 ========== =============================================
 Name Attrs
@@ -197,7 +197,7 @@
 ax2.add_artist(con)
 
 The above code connects point xy in data coordinate of ``ax1`` to
-point xy int data coordiante of ``ax2``. Here is a simple example.
+point xy int data coordinate of ``ax2``. Here is a simple example.
 
 .. plot:: users/plotting/examples/connect_simple01.py
 
@@ -230,7 +230,7 @@
 The *loc* keyword has same meaning as in the legend command.
 
 A simple application is when the size of the artist (or collection of
-artists) is knwon in pixel size during the time of creation. For
+artists) is known in pixel size during the time of creation. For
 example, If you want to draw a circle with fixed size of 20 pixel x 20
 pixel (radius = 10 pixel), you can utilize
 ``AnchoredDrawingArea``. The instance is created with a size of the
@@ -280,7 +280,7 @@
 .. plot:: users/plotting/examples/anchored_box04.py
 
 Note that unlike the legend, the ``bbox_transform`` is set
-to IdentityTransform by default. 
+to IdentityTransform by default.
 
 Advanced Topics
 ***************
@@ -288,7 +288,7 @@
 Zoom effect between Axes
 ========================
 
-mpl_toolkits.axes_grid.inset_locator defines some patch classs useful
+mpl_toolkits.axes_grid.inset_locator defines some patch classes useful
 for interconnect two axes. Understanding the code requires some
 knowledge of how mpl's transform works. But, utilizing it will be
 straight forward.
@@ -327,6 +327,6 @@
 :include-source:
 
 
-Similarly, you can define custom ConnectionStyle and Custome ArrowStyle.
+Similarly, you can define custom ConnectionStyle and custom ArrowStyle.
 See the source code of ``lib/matplotlib/patches.py`` and check
 how each style class is defined.
Modified: trunk/matplotlib/doc/users/event_handling.rst
===================================================================
--- trunk/matplotlib/doc/users/event_handling.rst	2009年08月23日 18:42:37 UTC (rev 7541)
+++ trunk/matplotlib/doc/users/event_handling.rst	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -5,7 +5,7 @@
 **************************
 
 matplotlib works with 6 user interface toolkits (wxpython, tkinter,
-qt, gtk, fltk abd macosx) and in order to support features like interactive
+qt, gtk, fltk and macosx) and in order to support features like interactive
 panning and zooming of figures, it is helpful to the developers to
 have an API for interacting with the figure via key presses and mouse
 movements that is "GUI neutral" so we don't have to repeat a lot of
@@ -150,7 +150,7 @@
 
 Write draggable rectangle class that is initialized with a
 :class:`~matplotlib.patches.Rectangle` instance but will move its x,y
-location when dragged. Hint: you will need to store the orginal
+location when dragged. Hint: you will need to store the original
 ``xy`` location of the rectangle which is stored as rect.xy and
 connect to the press, motion and release mouse events. When the mouse
 is pressed, check to see if the click occurs over your rectangle (see
Modified: trunk/matplotlib/doc/users/installing.rst
===================================================================
--- trunk/matplotlib/doc/users/installing.rst	2009年08月23日 18:42:37 UTC (rev 7541)
+++ trunk/matplotlib/doc/users/installing.rst	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -22,7 +22,7 @@
 
 One single click installer and you are done.
 
-Ok, so you want to do it the hard way?
+OK, so you want to do it the hard way?
 ======================================
 
 For some people, the prepackaged pythons discussed above are not an
@@ -109,7 +109,7 @@
 packaging matplotlib.
 
 
-.. _install_requrements:
+.. _install_requirements:
 
 Build requirements
 ==================
@@ -152,7 +152,7 @@
 The Qt3 widgets library python wrappers for the QtAgg backend
 
 :term:`pyqt` 4.0 or later
- The Qt4 widgets library python wrappersfor the Qt4Agg backend
+ The Qt4 widgets library python wrappers for the Qt4Agg backend
 
 :term:`pygtk` 2.2 or later
 The python wrappers for the GTK widgets library for use with the GTK or GTKAgg backend
@@ -201,5 +201,5 @@
 instruction in the README. This directory has a Makefile which will
 automatically grab the zlib, png and freetype dependencies from the
 web, build them with the right flags to make universal libraries, and
-then build the matplotlib source and binary installers. 
- 
\ No newline at end of file
+then build the matplotlib source and binary installers.
+
Modified: trunk/matplotlib/doc/users/path_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/path_tutorial.rst	2009年08月23日 18:42:37 UTC (rev 7541)
+++ trunk/matplotlib/doc/users/path_tutorial.rst	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -71,7 +71,7 @@
 control point and one end point, and CURVE4 has three vertices for the
 two control points and the end point. The example below shows a
 CURVE4 Bézier spline -- the bézier curve will be contained in the
-convex hul of the start point, the two control points, and the end
+convex hull of the start point, the two control points, and the end
 point
 
 .. plot::
@@ -123,7 +123,7 @@
 like :meth:`~matplotlib.axes.Axes.hist` and
 :meth:`~matplotlib.axes.Axes.bar`, which create a number of
 primitives, eg a bunch of Rectangles, can usually be implemented more
-efficiently using a compund path. The reason ``bar`` creates a list
+efficiently using a compound path. The reason ``bar`` creates a list
 of rectangles and not a compound path is largely historical: the
 :class:`~matplotlib.path.Path` code is comparatively new and ``bar``
 predates it. While we could change it now, it would break old code,
Modified: trunk/matplotlib/doc/users/shell.rst
===================================================================
--- trunk/matplotlib/doc/users/shell.rst	2009年08月23日 18:42:37 UTC (rev 7541)
+++ trunk/matplotlib/doc/users/shell.rst	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -66,7 +66,7 @@
 =========================
 
 If you can't use ipython, and still want to use matplotlib/pylab from
-an interactive python shell, eg the plain-ol standard python
+an interactive python shell, eg the plain-ole standard python
 interactive interpreter, or the interpreter in your favorite IDE, you
 are going to need to understand what a matplotlib backend is
 :ref:`what-is-a-backend`.
Modified: trunk/matplotlib/doc/users/transforms_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/transforms_tutorial.rst	2009年08月23日 18:42:37 UTC (rev 7541)
+++ trunk/matplotlib/doc/users/transforms_tutorial.rst	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -225,7 +225,7 @@
 :meth:`~matplotlib.axes.Axes.axvspan`) but for didactic purposes we
 will implement the horizontal span here using a blended
 transformation. This trick only works for separable transformations,
-like you see in normal cartesian coordinate systems, but not on
+like you see in normal Cartesian coordinate systems, but not on
 inseparable transformations like the
 :class:`~matplotlib.projections.polar.PolarAxes.PolarTransform`.
 
@@ -301,7 +301,7 @@
 shadow_transform = ax.transData + offset
 
 showing that can chain transformations using the addition operator.
-This code says: first appy the data transformation ``ax.transData`` and
+This code says: first apply the data transformation ``ax.transData`` and
 then translate the data by `dx` and `dy` points.
 
 .. plot::
@@ -352,7 +352,7 @@
 in your axes which affects the affine transformation, but you may not
 need to compute the potentially expensive nonlinear scales or
 projections on simple navigation events. It is also possible to
-multiply affine transformation matrices togeter, and then apply them
+multiply affine transformation matrices together, and then apply them
 to coordinates in one step. This is not true of all possible
 transformations.
 
@@ -404,7 +404,7 @@
 
 The final piece is the ``self.transScale`` attribute, which is
 responsible for the optional non-linear scaling of the data, eg. for
-logarithmic axes. When an Axes is initally setup, this is just set to
+logarithmic axes. When an Axes is initially setup, this is just set to
 the identity transform, since the basic matplotlib axes has linear
 scale, but when you call a logarithmic scaling function like
 :meth:`~matplotlib.axes.Axes.semilogx` or explicitly set the scale to
@@ -426,7 +426,7 @@
 
 ``transProjection`` handles the projection from the space,
 eg. latitude and longitude for map data, or radius and theta for polar
-data, to a separable cartesian coordinate system. There are several
+data, to a separable Cartesian coordinate system. There are several
 projection examples in the ``matplotlib.projections`` package, and the
 best way to learn more is to open the source for those packages and
 see how to make your own, since matplotlib supports extensible axes
Copied: trunk/matplotlib/examples/animation/animate_decay_tk_blit.py (from rev 7541, branches/v0_99_maint/examples/animation/animate_decay_tk_blit.py)
===================================================================
--- trunk/matplotlib/examples/animation/animate_decay_tk_blit.py	 (rev 0)
+++ trunk/matplotlib/examples/animation/animate_decay_tk_blit.py	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -0,0 +1,58 @@
+import time, sys
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+def data_gen():
+ t = data_gen.t
+ data_gen.t += 0.05
+ return np.sin(2*np.pi*t) * np.exp(-t/10.)
+data_gen.t = 0
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+line, = ax.plot([], [], animated=True, lw=2)
+ax.set_ylim(-1.1, 1.1)
+ax.set_xlim(0, 5)
+ax.grid()
+xdata, ydata = [], []
+def run(*args):
+ background = fig.canvas.copy_from_bbox(ax.bbox)
+ # for profiling
+ tstart = time.time()
+
+ while 1:
+ # restore the clean slate background
+ fig.canvas.restore_region(background)
+ # update the data
+ t = data_gen.t
+ y = data_gen()
+ xdata.append(t)
+ ydata.append(y)
+ xmin, xmax = ax.get_xlim()
+ if t>=xmax:
+ ax.set_xlim(xmin, 2*xmax)
+ fig.canvas.draw()
+ background = fig.canvas.copy_from_bbox(ax.bbox)
+
+ line.set_data(xdata, ydata)
+
+ # just draw the animated artist
+ ax.draw_artist(line)
+ # just redraw the axes rectangle
+ fig.canvas.blit(ax.bbox)
+
+ if run.cnt==1000:
+ # print the timing info and quit
+ print 'FPS:' , 1000/(time.time()-tstart)
+ sys.exit()
+
+ run.cnt += 1
+run.cnt = 0
+
+
+
+manager = plt.get_current_fig_manager()
+manager.window.after(100, run)
+
+plt.show()
Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py	2009年08月23日 18:42:37 UTC (rev 7541)
+++ trunk/matplotlib/lib/matplotlib/cbook.py	2009年08月23日 18:44:35 UTC (rev 7542)
@@ -26,7 +26,7 @@
 
 try:
 preferredencoding = locale.getpreferredencoding()
-except ValueError:
+except (ValueError, ImportError):
 preferredencoding = None
 
 def unicode_safe(s):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7541
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7541&view=rev
Author: jdh2358
Date: 2009年08月23日 18:42:37 +0000 (2009年8月23日)
Log Message:
-----------
more harness around locale
Modified Paths:
--------------
 branches/v0_99_maint/lib/matplotlib/cbook.py
Modified: branches/v0_99_maint/lib/matplotlib/cbook.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/cbook.py	2009年08月23日 18:37:08 UTC (rev 7540)
+++ branches/v0_99_maint/lib/matplotlib/cbook.py	2009年08月23日 18:42:37 UTC (rev 7541)
@@ -20,7 +20,7 @@
 
 try:
 preferredencoding = locale.getpreferredencoding()
-except ValueError:
+except (ValueError, ImportError):
 preferredencoding = None
 
 def unicode_safe(s):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7540
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7540&view=rev
Author: jdh2358
Date: 2009年08月23日 18:37:08 +0000 (2009年8月23日)
Log Message:
-----------
added buildbot script for sage box
Added Paths:
-----------
 trunk/matplotlib/test/_buildbot_mac_sage.sh
Added: trunk/matplotlib/test/_buildbot_mac_sage.sh
===================================================================
--- trunk/matplotlib/test/_buildbot_mac_sage.sh	 (rev 0)
+++ trunk/matplotlib/test/_buildbot_mac_sage.sh	2009年08月23日 18:37:08 UTC (rev 7540)
@@ -0,0 +1,2 @@
+#!/bin/sh
+PREFIX=/Users/jdh2358/devbb make -f make.osx mpl_install
Property changes on: trunk/matplotlib/test/_buildbot_mac_sage.sh
___________________________________________________________________
Added: svn:executable
 + *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7539
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7539&view=rev
Author: astraw
Date: 2009年08月23日 07:25:37 +0000 (2009年8月23日)
Log Message:
-----------
Remove trailing whitespace.
(This is most a touch of a file to test the buildbot.)
Modified Paths:
--------------
 trunk/matplotlib/test/_buildbot_util.py
Modified: trunk/matplotlib/test/_buildbot_util.py
===================================================================
--- trunk/matplotlib/test/_buildbot_util.py	2009年08月23日 06:43:53 UTC (rev 7538)
+++ trunk/matplotlib/test/_buildbot_util.py	2009年08月23日 07:25:37 UTC (rev 7539)
@@ -13,7 +13,7 @@
 # This use of Popen is copied from matplotlib.texmanager (Use of
 # close_fds seems a bit mysterious.)
 
- p = Popen(args, shell=True, 
+ p = Popen(args, shell=True,
 close_fds=(sys.platform!='win32'),**kwargs)
 p.wait()
 if p.returncode!=0:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7538
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7538&view=rev
Author: astraw
Date: 2009年08月23日 06:43:53 +0000 (2009年8月23日)
Log Message:
-----------
Remove trailing whitespace from source code file.
(This is mostly just a touch of the file to test the buildbot change detector.)
Modified Paths:
--------------
 trunk/matplotlib/make.osx
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx	2009年08月23日 05:36:23 UTC (rev 7537)
+++ trunk/matplotlib/make.osx	2009年08月23日 06:43:53 UTC (rev 7538)
@@ -1,4 +1,4 @@
-# build mpl into a local install dir with 
+# build mpl into a local install dir with
 # PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
 
 PYVERSION=2.6
@@ -21,7 +21,7 @@
 	rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
 	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
 	bdist_mpkg-${BDISTMPKGVERSION} \
-	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} 
+	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION}
 
 fetch:
 	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
@@ -78,7 +78,7 @@
 	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
 	export CFLAGS=${CFLAGS_DEPS} &&\
 	export LDFLAGS=${LDFLAGS_DEPS} &&\
-	python setup.py build 
+	python setup.py build
 
 mpl_install:
 	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7537
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7537&view=rev
Author: astraw
Date: 2009年08月23日 05:36:23 +0000 (2009年8月23日)
Log Message:
-----------
test script exits with non-zero exit code upon failure
Modified Paths:
--------------
 trunk/matplotlib/test/run-mpl-test.py
Modified: trunk/matplotlib/test/run-mpl-test.py
===================================================================
--- trunk/matplotlib/test/run-mpl-test.py	2009年08月23日 05:27:40 UTC (rev 7536)
+++ trunk/matplotlib/test/run-mpl-test.py	2009年08月23日 05:36:23 UTC (rev 7537)
@@ -89,8 +89,8 @@
 sys.exit( 0 )
 
 ### Run nose
-nose.run( argv = args,
- plugins = [ MplNosePlugin() ] )
+success = nose.run( argv = args,
+ plugins = [ MplNosePlugin() ] )
 
 ### do other stuff here
 
@@ -104,3 +104,4 @@
 sys.stdout = originalStdout
 sys.stderr = originalStderr
 
+sys.exit(not success)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7536
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7536&view=rev
Author: jdh2358
Date: 2009年08月23日 05:27:40 +0000 (2009年8月23日)
Log Message:
-----------
fix some typos in the docs
Modified Paths:
--------------
 branches/v0_99_maint/doc/users/annotations_guide.rst
 branches/v0_99_maint/doc/users/event_handling.rst
 branches/v0_99_maint/doc/users/installing.rst
 branches/v0_99_maint/doc/users/path_tutorial.rst
 branches/v0_99_maint/doc/users/shell.rst
 branches/v0_99_maint/doc/users/transforms_tutorial.rst
Added Paths:
-----------
 branches/v0_99_maint/examples/animation/animate_decay_tk_blit.py
Modified: branches/v0_99_maint/doc/users/annotations_guide.rst
===================================================================
--- branches/v0_99_maint/doc/users/annotations_guide.rst	2009年08月23日 05:18:45 UTC (rev 7535)
+++ branches/v0_99_maint/doc/users/annotations_guide.rst	2009年08月23日 05:27:40 UTC (rev 7536)
@@ -4,7 +4,7 @@
 Annotating Axes
 ****************
 
-Do not proceed unless you already have read 
+Do not proceed unless you already have read
 :func:`~matplotlib.pyplot.text` and :func:`~matplotlib.pyplot.annotate`!
 
 
@@ -38,7 +38,7 @@
 bb.set_boxstyle("rarrow", pad=0.6)
 
 The arguments are the name of the box style with its attributes as
-keyword arguments. Currently, followign box styles are implemented.
+keyword arguments. Currently, following box styles are implemented.
 
 ========== ============== ==========================
 Class Name Attrs
@@ -55,7 +55,7 @@
 .. plot:: mpl_examples/pylab_examples/fancybox_demo2.py
 
 
-Note that the attrubutes arguments can be specified within the style
+Note that the attributes arguments can be specified within the style
 name with separating comma (this form can be used as "boxstyle" value
 of bbox argument when initializing the text instance) ::
 
@@ -103,7 +103,7 @@
 2. If patch object is given (*patchA* & *patchB*), the path is clipped to
 avoid the patch.
 
-3. The path is further shrinked by given amount of pixels (*shirnkA*
+3. The path is further shrunk by given amount of pixels (*shirnkA*
 & *shrinkB*)
 
 4. The path is transmuted to arrow patch, which is controlled by the
@@ -114,7 +114,7 @@
 
 
 The creation of the connecting path between two points is controlled by
-``connectionstyle`` key and follwing styles are available.
+``connectionstyle`` key and following styles are available.
 
 ========== =============================================
 Name Attrs
@@ -197,7 +197,7 @@
 ax2.add_artist(con)
 
 The above code connects point xy in data coordinate of ``ax1`` to
-point xy int data coordiante of ``ax2``. Here is a simple example.
+point xy int data coordinate of ``ax2``. Here is a simple example.
 
 .. plot:: users/plotting/examples/connect_simple01.py
 
@@ -230,7 +230,7 @@
 The *loc* keyword has same meaning as in the legend command.
 
 A simple application is when the size of the artist (or collection of
-artists) is knwon in pixel size during the time of creation. For
+artists) is known in pixel size during the time of creation. For
 example, If you want to draw a circle with fixed size of 20 pixel x 20
 pixel (radius = 10 pixel), you can utilize
 ``AnchoredDrawingArea``. The instance is created with a size of the
@@ -280,7 +280,7 @@
 .. plot:: users/plotting/examples/anchored_box04.py
 
 Note that unlike the legend, the ``bbox_transform`` is set
-to IdentityTransform by default. 
+to IdentityTransform by default.
 
 Advanced Topics
 ***************
@@ -288,7 +288,7 @@
 Zoom effect between Axes
 ========================
 
-mpl_toolkits.axes_grid.inset_locator defines some patch classs useful
+mpl_toolkits.axes_grid.inset_locator defines some patch classes useful
 for interconnect two axes. Understanding the code requires some
 knowledge of how mpl's transform works. But, utilizing it will be
 straight forward.
@@ -327,6 +327,6 @@
 :include-source:
 
 
-Similarly, you can define custom ConnectionStyle and Custome ArrowStyle.
+Similarly, you can define custom ConnectionStyle and custom ArrowStyle.
 See the source code of ``lib/matplotlib/patches.py`` and check
 how each style class is defined.
Modified: branches/v0_99_maint/doc/users/event_handling.rst
===================================================================
--- branches/v0_99_maint/doc/users/event_handling.rst	2009年08月23日 05:18:45 UTC (rev 7535)
+++ branches/v0_99_maint/doc/users/event_handling.rst	2009年08月23日 05:27:40 UTC (rev 7536)
@@ -5,7 +5,7 @@
 **************************
 
 matplotlib works with 6 user interface toolkits (wxpython, tkinter,
-qt, gtk, fltk abd macosx) and in order to support features like interactive
+qt, gtk, fltk and macosx) and in order to support features like interactive
 panning and zooming of figures, it is helpful to the developers to
 have an API for interacting with the figure via key presses and mouse
 movements that is "GUI neutral" so we don't have to repeat a lot of
@@ -150,7 +150,7 @@
 
 Write draggable rectangle class that is initialized with a
 :class:`~matplotlib.patches.Rectangle` instance but will move its x,y
-location when dragged. Hint: you will need to store the orginal
+location when dragged. Hint: you will need to store the original
 ``xy`` location of the rectangle which is stored as rect.xy and
 connect to the press, motion and release mouse events. When the mouse
 is pressed, check to see if the click occurs over your rectangle (see
Modified: branches/v0_99_maint/doc/users/installing.rst
===================================================================
--- branches/v0_99_maint/doc/users/installing.rst	2009年08月23日 05:18:45 UTC (rev 7535)
+++ branches/v0_99_maint/doc/users/installing.rst	2009年08月23日 05:27:40 UTC (rev 7536)
@@ -22,7 +22,7 @@
 
 One single click installer and you are done.
 
-Ok, so you want to do it the hard way?
+OK, so you want to do it the hard way?
 ======================================
 
 For some people, the prepackaged pythons discussed above are not an
@@ -109,7 +109,7 @@
 packaging matplotlib.
 
 
-.. _install_requrements:
+.. _install_requirements:
 
 Build requirements
 ==================
@@ -152,7 +152,7 @@
 The Qt3 widgets library python wrappers for the QtAgg backend
 
 :term:`pyqt` 4.0 or later
- The Qt4 widgets library python wrappersfor the Qt4Agg backend
+ The Qt4 widgets library python wrappers for the Qt4Agg backend
 
 :term:`pygtk` 2.2 or later
 The python wrappers for the GTK widgets library for use with the GTK or GTKAgg backend
@@ -201,5 +201,5 @@
 instruction in the README. This directory has a Makefile which will
 automatically grab the zlib, png and freetype dependencies from the
 web, build them with the right flags to make universal libraries, and
-then build the matplotlib source and binary installers. 
- 
\ No newline at end of file
+then build the matplotlib source and binary installers.
+
Modified: branches/v0_99_maint/doc/users/path_tutorial.rst
===================================================================
--- branches/v0_99_maint/doc/users/path_tutorial.rst	2009年08月23日 05:18:45 UTC (rev 7535)
+++ branches/v0_99_maint/doc/users/path_tutorial.rst	2009年08月23日 05:27:40 UTC (rev 7536)
@@ -71,7 +71,7 @@
 control point and one end point, and CURVE4 has three vertices for the
 two control points and the end point. The example below shows a
 CURVE4 Bézier spline -- the bézier curve will be contained in the
-convex hul of the start point, the two control points, and the end
+convex hull of the start point, the two control points, and the end
 point
 
 .. plot::
@@ -123,7 +123,7 @@
 like :meth:`~matplotlib.axes.Axes.hist` and
 :meth:`~matplotlib.axes.Axes.bar`, which create a number of
 primitives, eg a bunch of Rectangles, can usually be implemented more
-efficiently using a compund path. The reason ``bar`` creates a list
+efficiently using a compound path. The reason ``bar`` creates a list
 of rectangles and not a compound path is largely historical: the
 :class:`~matplotlib.path.Path` code is comparatively new and ``bar``
 predates it. While we could change it now, it would break old code,
Modified: branches/v0_99_maint/doc/users/shell.rst
===================================================================
--- branches/v0_99_maint/doc/users/shell.rst	2009年08月23日 05:18:45 UTC (rev 7535)
+++ branches/v0_99_maint/doc/users/shell.rst	2009年08月23日 05:27:40 UTC (rev 7536)
@@ -66,7 +66,7 @@
 =========================
 
 If you can't use ipython, and still want to use matplotlib/pylab from
-an interactive python shell, eg the plain-ol standard python
+an interactive python shell, eg the plain-ole standard python
 interactive interpreter, or the interpreter in your favorite IDE, you
 are going to need to understand what a matplotlib backend is
 :ref:`what-is-a-backend`.
Modified: branches/v0_99_maint/doc/users/transforms_tutorial.rst
===================================================================
--- branches/v0_99_maint/doc/users/transforms_tutorial.rst	2009年08月23日 05:18:45 UTC (rev 7535)
+++ branches/v0_99_maint/doc/users/transforms_tutorial.rst	2009年08月23日 05:27:40 UTC (rev 7536)
@@ -225,7 +225,7 @@
 :meth:`~matplotlib.axes.Axes.axvspan`) but for didactic purposes we
 will implement the horizontal span here using a blended
 transformation. This trick only works for separable transformations,
-like you see in normal cartesian coordinate systems, but not on
+like you see in normal Cartesian coordinate systems, but not on
 inseparable transformations like the
 :class:`~matplotlib.projections.polar.PolarAxes.PolarTransform`.
 
@@ -301,7 +301,7 @@
 shadow_transform = ax.transData + offset
 
 showing that can chain transformations using the addition operator.
-This code says: first appy the data transformation ``ax.transData`` and
+This code says: first apply the data transformation ``ax.transData`` and
 then translate the data by `dx` and `dy` points.
 
 .. plot::
@@ -352,7 +352,7 @@
 in your axes which affects the affine transformation, but you may not
 need to compute the potentially expensive nonlinear scales or
 projections on simple navigation events. It is also possible to
-multiply affine transformation matrices togeter, and then apply them
+multiply affine transformation matrices together, and then apply them
 to coordinates in one step. This is not true of all possible
 transformations.
 
@@ -404,7 +404,7 @@
 
 The final piece is the ``self.transScale`` attribute, which is
 responsible for the optional non-linear scaling of the data, eg. for
-logarithmic axes. When an Axes is initally setup, this is just set to
+logarithmic axes. When an Axes is initially setup, this is just set to
 the identity transform, since the basic matplotlib axes has linear
 scale, but when you call a logarithmic scaling function like
 :meth:`~matplotlib.axes.Axes.semilogx` or explicitly set the scale to
@@ -426,7 +426,7 @@
 
 ``transProjection`` handles the projection from the space,
 eg. latitude and longitude for map data, or radius and theta for polar
-data, to a separable cartesian coordinate system. There are several
+data, to a separable Cartesian coordinate system. There are several
 projection examples in the ``matplotlib.projections`` package, and the
 best way to learn more is to open the source for those packages and
 see how to make your own, since matplotlib supports extensible axes
Added: branches/v0_99_maint/examples/animation/animate_decay_tk_blit.py
===================================================================
--- branches/v0_99_maint/examples/animation/animate_decay_tk_blit.py	 (rev 0)
+++ branches/v0_99_maint/examples/animation/animate_decay_tk_blit.py	2009年08月23日 05:27:40 UTC (rev 7536)
@@ -0,0 +1,58 @@
+import time, sys
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+def data_gen():
+ t = data_gen.t
+ data_gen.t += 0.05
+ return np.sin(2*np.pi*t) * np.exp(-t/10.)
+data_gen.t = 0
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+line, = ax.plot([], [], animated=True, lw=2)
+ax.set_ylim(-1.1, 1.1)
+ax.set_xlim(0, 5)
+ax.grid()
+xdata, ydata = [], []
+def run(*args):
+ background = fig.canvas.copy_from_bbox(ax.bbox)
+ # for profiling
+ tstart = time.time()
+
+ while 1:
+ # restore the clean slate background
+ fig.canvas.restore_region(background)
+ # update the data
+ t = data_gen.t
+ y = data_gen()
+ xdata.append(t)
+ ydata.append(y)
+ xmin, xmax = ax.get_xlim()
+ if t>=xmax:
+ ax.set_xlim(xmin, 2*xmax)
+ fig.canvas.draw()
+ background = fig.canvas.copy_from_bbox(ax.bbox)
+
+ line.set_data(xdata, ydata)
+
+ # just draw the animated artist
+ ax.draw_artist(line)
+ # just redraw the axes rectangle
+ fig.canvas.blit(ax.bbox)
+
+ if run.cnt==1000:
+ # print the timing info and quit
+ print 'FPS:' , 1000/(time.time()-tstart)
+ sys.exit()
+
+ run.cnt += 1
+run.cnt = 0
+
+
+
+manager = plt.get_current_fig_manager()
+manager.window.after(100, run)
+
+plt.show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7535
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7535&view=rev
Author: astraw
Date: 2009年08月23日 05:18:45 +0000 (2009年8月23日)
Log Message:
-----------
add buildbot scripts
Added Paths:
-----------
 trunk/matplotlib/test/_buildbot_install.py
 trunk/matplotlib/test/_buildbot_test.py
 trunk/matplotlib/test/_buildbot_util.py
Added: trunk/matplotlib/test/_buildbot_install.py
===================================================================
--- trunk/matplotlib/test/_buildbot_install.py	 (rev 0)
+++ trunk/matplotlib/test/_buildbot_install.py	2009年08月23日 05:18:45 UTC (rev 7535)
@@ -0,0 +1,15 @@
+"""This script will install matplotlib to a virtual environment to
+faciltate testing."""
+import shutil, os, sys
+from subprocess import Popen, PIPE, STDOUT
+
+from _buildbot_util import check_call
+
+TARGET='PYmpl'
+
+if os.path.exists(TARGET):
+ shutil.rmtree(TARGET)
+
+check_call('virtualenv %s'%(TARGET,))
+TARGET_py = os.path.join(TARGET,'bin','python')
+check_call('%s setup.py install'%TARGET_py)
Added: trunk/matplotlib/test/_buildbot_test.py
===================================================================
--- trunk/matplotlib/test/_buildbot_test.py	 (rev 0)
+++ trunk/matplotlib/test/_buildbot_test.py	2009年08月23日 05:18:45 UTC (rev 7535)
@@ -0,0 +1,15 @@
+"""This script will install matplotlib to a virtual environment to
+faciltate testing."""
+import shutil, os, sys
+from subprocess import Popen, PIPE, STDOUT
+
+from _buildbot_util import check_call
+
+TARGET=os.path.abspath('PYmpl')
+
+if not os.path.exists(TARGET):
+ raise RuntimeError('the virtualenv target directory was not found')
+
+TARGET_py = os.path.join(TARGET,'bin','python')
+check_call('%s run-mpl-test.py --all'%TARGET_py,
+ cwd='test')
Added: trunk/matplotlib/test/_buildbot_util.py
===================================================================
--- trunk/matplotlib/test/_buildbot_util.py	 (rev 0)
+++ trunk/matplotlib/test/_buildbot_util.py	2009年08月23日 05:18:45 UTC (rev 7535)
@@ -0,0 +1,20 @@
+"""Module to help _buildbot_*.py scripts."""
+
+import shutil, os, sys
+from subprocess import Popen, PIPE, STDOUT
+
+def check_call(args,**kwargs):
+ # print
+ # print args
+ # print '**kwargs'
+ # print kwargs
+ # print
+
+ # This use of Popen is copied from matplotlib.texmanager (Use of
+ # close_fds seems a bit mysterious.)
+
+ p = Popen(args, shell=True, 
+ close_fds=(sys.platform!='win32'),**kwargs)
+ p.wait()
+ if p.returncode!=0:
+ raise RuntimeError('returncode is %s'%p.returncode)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7534
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7534&view=rev
Author: jdh2358
Date: 2009年08月23日 02:28:52 +0000 (2009年8月23日)
Log Message:
-----------
Merged revisions 7533 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
 r7533 | jdh2358 | 2009年08月22日 21:27:44 -0500 (2009年8月22日) | 1 line
 
 tweaks to os x
........
Modified Paths:
--------------
 trunk/matplotlib/Makefile
 trunk/matplotlib/make.osx
Added Paths:
-----------
 trunk/matplotlib/README.osx
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7531
 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7533
Modified: trunk/matplotlib/Makefile
===================================================================
--- trunk/matplotlib/Makefile	2009年08月23日 02:27:44 UTC (rev 7533)
+++ trunk/matplotlib/Makefile	2009年08月23日 02:28:52 UTC (rev 7534)
@@ -28,10 +28,13 @@
 	tar cvfz pyback.tar.gz *.py lib src examples/*.py unit/*.py
 
 
-build_osx105:
+_build_osx105:
 	CFLAGS="-Os -arch i386 -arch ppc" LDFLAGS="-Os -arch i386 -arch ppc" python setup.py build
 
+build_osx105:
+	echo "Use 'make -f fetch deps mpl_install instead'"
 
+
 jdh_doc_snapshot:
 	svn up;\
 	python setup.py install --prefix=~/dev;\
Copied: trunk/matplotlib/README.osx (from rev 7533, branches/v0_99_maint/README.osx)
===================================================================
--- trunk/matplotlib/README.osx	 (rev 0)
+++ trunk/matplotlib/README.osx	2009年08月23日 02:28:52 UTC (rev 7534)
@@ -0,0 +1,13 @@
+Build mpl on OSX has proven to be a nightmare because of all the
+different types of zlib, png and freetype that may be on your system.
+The recommended and supported way to build is to use the make.osx file
+in this directory. This script requires you to set a PREFIX
+environment variable where you want to the install to go. It will
+fetch the dependencies from a remove server and install them into your
+PREFIX dir, and then build mpl against them. It should ignore any
+lib, png or freetype on your system
+
+Example usage::
+
+ PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx	2009年08月23日 02:27:44 UTC (rev 7533)
+++ trunk/matplotlib/make.osx	2009年08月23日 02:28:52 UTC (rev 7534)
@@ -1,13 +1,11 @@
-PREFIX=/Users/jdh2358/dev
+# build mpl into a local install dir with 
+# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+
 PYVERSION=2.6
 PYTHON=python${PYVERSION}
-SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
 FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
-BDISTMPKGVERSION=0.4.4
-MPLSRC=matplotlib-${MPLVERSION}
 MACOSX_DEPLOYMENT_TARGET=10.4
 
 ## You shouldn't need to configure past this point
@@ -26,9 +24,9 @@
 	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} 
 
 fetch:
-	python -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
-	python -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
-	python -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
 
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7533
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7533&view=rev
Author: jdh2358
Date: 2009年08月23日 02:27:44 +0000 (2009年8月23日)
Log Message:
-----------
tweaks to os x
Modified Paths:
--------------
 branches/v0_99_maint/Makefile
 branches/v0_99_maint/make.osx
Added Paths:
-----------
 branches/v0_99_maint/README.osx
Modified: branches/v0_99_maint/Makefile
===================================================================
--- branches/v0_99_maint/Makefile	2009年08月23日 02:16:27 UTC (rev 7532)
+++ branches/v0_99_maint/Makefile	2009年08月23日 02:27:44 UTC (rev 7533)
@@ -28,10 +28,13 @@
 	tar cvfz pyback.tar.gz *.py lib src examples/*.py unit/*.py
 
 
-build_osx105:
+_build_osx105:
 	CFLAGS="-Os -arch i386 -arch ppc" LDFLAGS="-Os -arch i386 -arch ppc" python setup.py build
 
+build_osx105:
+	echo "Use 'make -f fetch deps mpl_install instead'"
 
+
 jdh_doc_snapshot:
 	svn up;\
 	python setup.py install --prefix=~/dev;\
Added: branches/v0_99_maint/README.osx
===================================================================
--- branches/v0_99_maint/README.osx	 (rev 0)
+++ branches/v0_99_maint/README.osx	2009年08月23日 02:27:44 UTC (rev 7533)
@@ -0,0 +1,13 @@
+Build mpl on OSX has proven to be a nightmare because of all the
+different types of zlib, png and freetype that may be on your system.
+The recommended and supported way to build is to use the make.osx file
+in this directory. This script requires you to set a PREFIX
+environment variable where you want to the install to go. It will
+fetch the dependencies from a remove server and install them into your
+PREFIX dir, and then build mpl against them. It should ignore any
+lib, png or freetype on your system
+
+Example usage::
+
+ PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+
Modified: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx	2009年08月23日 02:16:27 UTC (rev 7532)
+++ branches/v0_99_maint/make.osx	2009年08月23日 02:27:44 UTC (rev 7533)
@@ -1,13 +1,11 @@
-PREFIX=/Users/jdh2358/dev
+# build mpl into a local install dir with 
+# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+
 PYVERSION=2.6
 PYTHON=python${PYVERSION}
-SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
 FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
-BDISTMPKGVERSION=0.4.4
-MPLSRC=matplotlib-${MPLVERSION}
 MACOSX_DEPLOYMENT_TARGET=10.4
 
 ## You shouldn't need to configure past this point
@@ -26,9 +24,9 @@
 	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} 
 
 fetch:
-	python -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
-	python -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
-	python -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+	${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
 
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7532
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7532&view=rev
Author: jdh2358
Date: 2009年08月23日 02:16:27 +0000 (2009年8月23日)
Log Message:
-----------
Merged revisions 7519,7521-7523,7528-7530 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
 r7519 | jouni | 2009年08月22日 01:25:07 -0500 (2009年8月22日) | 2 lines
 
 Fix typos found by Marc Desmarais and Nicolas Pinto
........
 r7521 | jdh2358 | 2009年08月22日 17:50:55 -0500 (2009年8月22日) | 1 line
 
 added Ariel's max install patch
........
 r7522 | jdh2358 | 2009年08月22日 18:19:44 -0500 (2009年8月22日) | 1 line
 
 applied Ariel's mlab.cohere_pairs fixes
........
 r7523 | jdh2358 | 2009年08月22日 18:20:30 -0500 (2009年8月22日) | 1 line
 
 fix osx epd formatting bug in rest
........
 r7528 | jdh2358 | 2009年08月22日 20:50:21 -0500 (2009年8月22日) | 1 line
 
 added new makefile for osx builds
........
 r7529 | jdh2358 | 2009年08月22日 21:10:46 -0500 (2009年8月22日) | 1 line
 
 removed darwin lookup in setupext -- use make.osx install
........
 r7530 | jdh2358 | 2009年08月22日 21:10:59 -0500 (2009年8月22日) | 1 line
 
 removed darwin lookup in setupext -- use make.osx install
........
Modified Paths:
--------------
 trunk/matplotlib/setupext.py
Added Paths:
-----------
 trunk/matplotlib/make.osx
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7517
 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7531
Copied: trunk/matplotlib/make.osx (from rev 7530, branches/v0_99_maint/make.osx)
===================================================================
--- trunk/matplotlib/make.osx	 (rev 0)
+++ trunk/matplotlib/make.osx	2009年08月23日 02:16:27 UTC (rev 7532)
@@ -0,0 +1,89 @@
+PREFIX=/Users/jdh2358/dev
+PYVERSION=2.6
+PYTHON=python${PYVERSION}
+SRCDIR=${PWD}
+ZLIBVERSION=1.2.3
+PNGVERSION=1.2.33
+FREETYPEVERSION=2.3.7
+MPLVERSION=0.99.0
+BDISTMPKGVERSION=0.4.4
+MPLSRC=matplotlib-${MPLVERSION}
+MACOSX_DEPLOYMENT_TARGET=10.4
+
+## You shouldn't need to configure past this point
+
+CFLAGS="-Os -arch ppc -arch i386 -I{$PREFIX}/include"
+
+LDFLAGS="-arch ppc -arch i386 -L${PREFIX}/lib"
+
+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"
+
+clean:
+	rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
+	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
+	bdist_mpkg-${BDISTMPKGVERSION} \
+	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} 
+
+fetch:
+	python -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
+	python -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+	python -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
+
+
+
+
+zlib:
+	unset PKG_CONFIG_PATH &&\
+	rm -rf zlib-${ZLIBVERSION} &&\
+	tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+	cd zlib-${ZLIBVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure --prefix=${PREFIX}&&\
+	MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 install&& \
+	unset MACOSX_DEPLOYMENT_TARGET
+
+png: zlib
+	unset PKG_CONFIG_PATH &&\
+	rm -rf libpng-${PNGVERSION} &&\
+	tar xvfj libpng-${PNGVERSION}.tar.bz2
+	cd libpng-${PNGVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure --disable-dependency-tracking --prefix=${PREFIX} &&\
+	make -j3 install&&\
+	cp .libs/libpng.a . &&\
+	unset MACOSX_DEPLOYMENT_TARGET
+
+
+freetype: zlib
+	unset PKG_CONFIG_PATH &&\
+	rm -rf ${FREETYPEVERSION} &&\
+	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+	cd freetype-${FREETYPEVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure --prefix=${PREFIX} &&\
+	make -j3 install &&\
+	cp objs/.libs/libfreetype.a . &&\
+	unset MACOSX_DEPLOYMENT_TARGET
+
+
+deps: zlib png freetype
+	echo 'all done'
+
+mpl_build:
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	python setup.py build 
+
+mpl_install:
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	python setup.py install --prefix=${PREFIX}
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2009年08月23日 02:13:35 UTC (rev 7531)
+++ trunk/matplotlib/setupext.py	2009年08月23日 02:16:27 UTC (rev 7532)
@@ -50,8 +50,15 @@
 'linux2' : ['/usr/local', '/usr'],
 'linux' : ['/usr/local', '/usr',],
 'cygwin' : ['/usr/local', '/usr',],
- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+ '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
 '/usr', '/sw'],
+ # it appears builds with darwin are broken because of all the
+ # different flags the deps can be compile with, so I am pushing
+ # people to :
+ # make -f make.osx fetch deps mpl_build mpl_install
+
+ 'darwin' : [],
+
 'freebsd4' : ['/usr/local', '/usr'],
 'freebsd5' : ['/usr/local', '/usr'],
 'freebsd6' : ['/usr/local', '/usr'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7531
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7531&view=rev
Author: jdh2358
Date: 2009年08月23日 02:13:35 +0000 (2009年8月23日)
Log Message:
-----------
preparing to merge
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7523
 + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7517
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7530
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7530&view=rev
Author: jdh2358
Date: 2009年08月23日 02:10:59 +0000 (2009年8月23日)
Log Message:
-----------
removed darwin lookup in setupext -- use make.osx install
Added Paths:
-----------
 branches/v0_99_maint/make.osx
Added: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx	 (rev 0)
+++ branches/v0_99_maint/make.osx	2009年08月23日 02:10:59 UTC (rev 7530)
@@ -0,0 +1,89 @@
+PREFIX=/Users/jdh2358/dev
+PYVERSION=2.6
+PYTHON=python${PYVERSION}
+SRCDIR=${PWD}
+ZLIBVERSION=1.2.3
+PNGVERSION=1.2.33
+FREETYPEVERSION=2.3.7
+MPLVERSION=0.99.0
+BDISTMPKGVERSION=0.4.4
+MPLSRC=matplotlib-${MPLVERSION}
+MACOSX_DEPLOYMENT_TARGET=10.4
+
+## You shouldn't need to configure past this point
+
+CFLAGS="-Os -arch ppc -arch i386 -I{$PREFIX}/include"
+
+LDFLAGS="-arch ppc -arch i386 -L${PREFIX}/lib"
+
+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"
+
+clean:
+	rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
+	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
+	bdist_mpkg-${BDISTMPKGVERSION} \
+	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} 
+
+fetch:
+	python -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
+	python -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+	python -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
+
+
+
+
+zlib:
+	unset PKG_CONFIG_PATH &&\
+	rm -rf zlib-${ZLIBVERSION} &&\
+	tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+	cd zlib-${ZLIBVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure --prefix=${PREFIX}&&\
+	MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 install&& \
+	unset MACOSX_DEPLOYMENT_TARGET
+
+png: zlib
+	unset PKG_CONFIG_PATH &&\
+	rm -rf libpng-${PNGVERSION} &&\
+	tar xvfj libpng-${PNGVERSION}.tar.bz2
+	cd libpng-${PNGVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure --disable-dependency-tracking --prefix=${PREFIX} &&\
+	make -j3 install&&\
+	cp .libs/libpng.a . &&\
+	unset MACOSX_DEPLOYMENT_TARGET
+
+
+freetype: zlib
+	unset PKG_CONFIG_PATH &&\
+	rm -rf ${FREETYPEVERSION} &&\
+	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+	cd freetype-${FREETYPEVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure --prefix=${PREFIX} &&\
+	make -j3 install &&\
+	cp objs/.libs/libfreetype.a . &&\
+	unset MACOSX_DEPLOYMENT_TARGET
+
+
+deps: zlib png freetype
+	echo 'all done'
+
+mpl_build:
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	python setup.py build 
+
+mpl_install:
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	python setup.py install --prefix=${PREFIX}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7529
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7529&view=rev
Author: jdh2358
Date: 2009年08月23日 02:10:46 +0000 (2009年8月23日)
Log Message:
-----------
removed darwin lookup in setupext -- use make.osx install
Modified Paths:
--------------
 branches/v0_99_maint/setupext.py
Modified: branches/v0_99_maint/setupext.py
===================================================================
--- branches/v0_99_maint/setupext.py	2009年08月23日 01:50:21 UTC (rev 7528)
+++ branches/v0_99_maint/setupext.py	2009年08月23日 02:10:46 UTC (rev 7529)
@@ -50,8 +50,15 @@
 'linux2' : ['/usr/local', '/usr'],
 'linux' : ['/usr/local', '/usr',],
 'cygwin' : ['/usr/local', '/usr',],
- 'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+ '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
 '/usr', '/sw'],
+ # it appears builds with darwin are broken because of all the
+ # different flags the deps can be compile with, so I am pushing
+ # people to :
+ # make -f make.osx fetch deps mpl_build mpl_install
+
+ 'darwin' : [],
+
 'freebsd4' : ['/usr/local', '/usr'],
 'freebsd5' : ['/usr/local', '/usr'],
 'freebsd6' : ['/usr/local', '/usr'],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7528
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7528&view=rev
Author: jdh2358
Date: 2009年08月23日 01:50:21 +0000 (2009年8月23日)
Log Message:
-----------
added new makefile for osx builds
Modified Paths:
--------------
 branches/v0_99_maint/src/_macosx.m
Modified: branches/v0_99_maint/src/_macosx.m
===================================================================
--- branches/v0_99_maint/src/_macosx.m	2009年08月23日 01:32:06 UTC (rev 7527)
+++ branches/v0_99_maint/src/_macosx.m	2009年08月23日 01:50:21 UTC (rev 7528)
@@ -5,11 +5,16 @@
 #include "numpy/arrayobject.h"
 #include "path_cleanup.h"
 
+/* Proper way to check for the OS X version we are compiling for, from
+ http://developer.apple.com/documentation/DeveloperTools/Conceptual/cross_development */
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+#define COMPILING_FOR_10_5
+#endif
 
 static int nwin = 0; /* The number of open windows */
 
 /* Use Atsui for Mac OS X 10.4, CoreText for Mac OS X 10.5 */
-#ifndef MAC_OS_X_VERSION_10_5
+#ifndef COMPILING_FOR_10_5
 static int ngc = 0; /* The number of graphics contexts in use */
 
 
@@ -175,7 +180,7 @@
 return 1;
 }
 
-#ifndef MAC_OS_X_VERSION_10_5
+#ifndef COMPILING_FOR_10_5
 static int _init_atsui(void)
 {
 OSStatus status;
@@ -451,7 +456,7 @@
 self->cr = NULL;
 self->level = 0;
 
-#ifndef MAC_OS_X_VERSION_10_5
+#ifndef COMPILING_FOR_10_5
 if (ngc==0)
 {
 int ok = _init_atsui();
@@ -466,7 +471,7 @@
 return (PyObject*) self;
 }
 
-#ifndef MAC_OS_X_VERSION_10_5
+#ifndef COMPILING_FOR_10_5
 static void
 GraphicsContext_dealloc(GraphicsContext *self)
 {
@@ -1877,7 +1882,7 @@
 }
 
 
-#ifdef MAC_OS_X_VERSION_10_5
+#ifdef COMPILING_FOR_10_5
 static CTFontRef
 #else
 static ATSFontRef
@@ -1891,7 +1896,7 @@
 const char* temp;
 const char* name = "Times-Roman";
 CFStringRef string;
-#ifdef MAC_OS_X_VERSION_10_5
+#ifdef COMPILING_FOR_10_5
 CTFontRef font = 0;
 #else
 ATSFontRef font = 0;
@@ -2091,7 +2096,7 @@
 string = CFStringCreateWithCString(kCFAllocatorDefault,
 temp,
 kCFStringEncodingMacRoman);
-#ifdef MAC_OS_X_VERSION_10_5
+#ifdef COMPILING_FOR_10_5
 font = CTFontCreateWithName(string, size, NULL);
 #else
 font = ATSFontFindFromPostScriptName(string, kATSOptionFlagsDefault);
@@ -2109,20 +2114,20 @@
 { string = CFStringCreateWithCString(kCFAllocatorDefault,
 name,
 kCFStringEncodingMacRoman);
-#ifdef MAC_OS_X_VERSION_10_5
+#ifdef COMPILING_FOR_10_5
 font = CTFontCreateWithName(string, size, NULL);
 #else
 font = ATSFontFindFromPostScriptName(string, kATSOptionFlagsDefault);
 #endif
 CFRelease(string);
 }
-#ifndef MAC_OS_X_VERSION_10_5
+#ifndef COMPILING_FOR_10_5
 CGContextSelectFont(cr, name, size, kCGEncodingMacRoman);
 #endif
 return font;
 }
 
-#ifdef MAC_OS_X_VERSION_10_5
+#ifdef COMPILING_FOR_10_5
 static PyObject*
 GraphicsContext_draw_text (GraphicsContext* self, PyObject* args)
 {
@@ -2821,7 +2826,7 @@
 "_macosx.GraphicsContext", /*tp_name*/
 sizeof(GraphicsContext), /*tp_basicsize*/
 0, /*tp_itemsize*/
-#ifdef MAC_OS_X_VERSION_10_5
+#ifdef COMPILING_FOR_10_5
 0, /*tp_dealloc*/
 #else
 (destructor)GraphicsContext_dealloc, /*tp_dealloc*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7527
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7527&view=rev
Author: jdh2358
Date: 2009年08月23日 01:32:06 +0000 (2009年8月23日)
Log Message:
-----------
add script for moving good saved images to baseline
Added Paths:
-----------
 trunk/matplotlib/test/README.build_slaves
 trunk/matplotlib/test/movegood.py
Added: trunk/matplotlib/test/README.build_slaves
===================================================================
--- trunk/matplotlib/test/README.build_slaves	 (rev 0)
+++ trunk/matplotlib/test/README.build_slaves	2009年08月23日 01:32:06 UTC (rev 7527)
@@ -0,0 +1,4 @@
+There can be two different types of build slaves: virtualenv and
+python source install with clean installs of numpy and mpl. Both of
+these will need nose installed.
+
Added: trunk/matplotlib/test/movegood.py
===================================================================
--- trunk/matplotlib/test/movegood.py	 (rev 0)
+++ trunk/matplotlib/test/movegood.py	2009年08月23日 01:32:06 UTC (rev 7527)
@@ -0,0 +1,53 @@
+import os, sys, glob, shutil
+import matplotlib.cbook as cbook
+
+savedresults_dir = 'saved-results'
+baseline_dir = 'baseline'
+diff_dir = 'diff-images'
+basename = 'failed-diff-'
+nbase = len(basename)
+
+failed = set()
+for fname in glob.glob(os.path.join(diff_dir, '%s*.png'%basename)):
+ ind = fname.find(basename)
+ fname = fname[ind+nbase:]
+ failed.add(fname)
+
+datad = dict()
+for fpath in cbook.get_recursive_filelist('.'):
+ if not fpath.endswith('.png'): continue
+ if fpath.find(diff_dir)>0: continue
+ rel_dir, fname = os.path.split(fpath)
+
+
+ saved = fpath.find(savedresults_dir)>0
+ baseline = fpath.find(baseline_dir)>0
+
+ if saved:
+ datad.setdefault(fname, [None,None])[0] = fpath
+ elif baseline:
+ datad.setdefault(fname, [None,None])[1] = fpath
+
+nfailed = len(failed)
+for ithis, fname in enumerate(sorted(failed)):
+ data = datad.get(fname)
+ if data is not None:
+ saved, baseline = data
+ #print ithis, fname, saved, baseline
+ if saved is None:
+ print 'could not find saved data for', fname
+ elif baseline is None:
+ print 'could not find baseline data for', fname
+ else:
+ x = raw_input('Copy %d of %d\n saved="%s" to\n baseline="%s" (n|Y):'%(ithis, nfailed, saved, baseline))
+ if x.lower()=='y' or x=='':
+ shutil.copy(saved, baseline)
+ print ' copied'
+ elif x.lower()=='n':
+ print ' skipping'
+ else:
+ print ' skipping unrecognized response="%s"'%x
+ print
+
+ else:
+ print 'could not find data for', fname
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7526
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7526&view=rev
Author: jdh2358
Date: 2009年08月23日 01:31:40 +0000 (2009年8月23日)
Log Message:
-----------
updated 7 of 9 images; leaving 2 for pos control on buildbot
Modified Paths:
--------------
 trunk/matplotlib/test/README.txt
 trunk/matplotlib/test/consolidate_diff_images.sh
 trunk/matplotlib/test/test_matplotlib/baseline/TestAxes/empty_datetime.png
 trunk/matplotlib/test/test_matplotlib/baseline/TestAxes/formatter_ticker_004.png
 trunk/matplotlib/test/test_plots/baseline/TestAnnotation/offset_points.png
 trunk/matplotlib/test/test_plots/baseline/TestAnnotation/polar_axes.png
 trunk/matplotlib/test/test_plots/baseline/TestFill/fill_units.png
 trunk/matplotlib/test/test_plots/baseline/TestPlot/const_xy.png
 trunk/matplotlib/test/test_plots/baseline/TestPolar/polar_units.png
Modified: trunk/matplotlib/test/README.txt
===================================================================
--- trunk/matplotlib/test/README.txt	2009年08月23日 01:03:07 UTC (rev 7525)
+++ trunk/matplotlib/test/README.txt	2009年08月23日 01:31:40 UTC (rev 7526)
@@ -288,3 +288,12 @@
 reference and therefore needs to be called out as different that a simple
 measurement of time since a delta-t in one frame may not be the same in another.
 
+
+
+Updating after diff
+====================
+
+ python run-mpl-test.py --all --keep-failed
+ ./consolidate_diff_images.sh
+ # check your images, decide which are good
+ python movegood.py
Modified: trunk/matplotlib/test/consolidate_diff_images.sh
===================================================================
--- trunk/matplotlib/test/consolidate_diff_images.sh	2009年08月23日 01:03:07 UTC (rev 7525)
+++ trunk/matplotlib/test/consolidate_diff_images.sh	2009年08月23日 01:31:40 UTC (rev 7526)
@@ -4,4 +4,4 @@
 TARGET_DIR="diff-images"
 rm -rf $TARGET_DIR
 mkdir $TARGET_DIR
-find . -name 'failed-diff-*png' | xargs mv --target-directory=$TARGET_DIR
+find . -name 'failed-diff-*png' -exec mv {} $TARGET_DIR/ \;
Modified: trunk/matplotlib/test/test_matplotlib/baseline/TestAxes/empty_datetime.png
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/test/test_matplotlib/baseline/TestAxes/formatter_ticker_004.png
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/test/test_plots/baseline/TestAnnotation/offset_points.png
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/test/test_plots/baseline/TestAnnotation/polar_axes.png
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/test/test_plots/baseline/TestFill/fill_units.png
===================================================================
(Binary files differ)
Modified: trunk/matplotlib/test/test_plots/baseline/TestPlot/const_xy.png
===================================================================
(Binary files differ)
Modified: 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.

Revision: 7522
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7522&view=rev
Author: jdh2358
Date: 2009年08月22日 23:19:44 +0000 (2009年8月22日)
Log Message:
-----------
applied Ariel's mlab.cohere_pairs fixes
Modified Paths:
--------------
 branches/v0_99_maint/lib/matplotlib/mlab.py
Modified: branches/v0_99_maint/lib/matplotlib/mlab.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/mlab.py	2009年08月22日 22:50:55 UTC (rev 7521)
+++ branches/v0_99_maint/lib/matplotlib/mlab.py	2009年08月22日 23:19:44 UTC (rev 7522)
@@ -501,70 +501,76 @@
 returnPxx=False):
 
 u"""
- Cxy, Phase, freqs = cohere_pairs(X, ij, ...)
+ Cxy, Phase, freqs = cohere_pairs( X, ij, ...)
 
- Compute the coherence for all pairs in *ij*. *X* is a
- (*numSamples*, *numCols*) numpy array. *ij* is a list of tuples
- (*i*, *j*). Each tuple is a pair of indexes into the columns of *X*
- for which you want to compute coherence. For example, if *X* has 64
- columns, and you want to compute all nonredundant pairs, define *ij*
- as::
+ Compute the coherence and phase for all pairs ij, in X.
 
+ Parameters
+ ----------
+ X: array
+ a numSamples*numCols array
+
+ ij: list of tuples
+ Each tuple is a pair of indexes into the columns of X for which you want to
+ compute coherence. For example, if X has 64 columns, and you want to
+ compute all nonredundant pairs, define ij as
+
 ij = []
 for i in range(64):
 for j in range(i+1,64):
- ij.append( (i, j) )
+ ij.append( (i,j) )
 
- The other function arguments, except for *preferSpeedOverMemory*
- (see below), are explained in the help string of :func:`psd`.
+ preferSpeedOverMemory: optional, bool
 
- Return value is a tuple (*Cxy*, *Phase*, *freqs*).
+ Defaults to true. If false, limits the caching by only making one, rather
+ than two, complex cache arrays. This is useful if memory becomes critical.
+ Even when preferSpeedOverMemory is false, cohere_pairs will still give
+ significant performace gains over calling cohere for each pair, and will
+ use subtantially less memory than if preferSpeedOverMemory is true. In my
+ tests with a 43000,64 array over all nonredundant pairs,
+ preferSpeedOverMemory=1 delivered a 33% performace boost on a 1.7GHZ Athlon
+ with 512MB RAM compared with preferSpeedOverMemory=0. But both solutions
+ were more than 10x faster than naievly crunching all possible pairs through
+ cohere.
+ 
+ Returns
+ -------
 
- - *Cxy*: a dictionary of (*i*, *j*) tuples -> coherence vector for that
- pair. I.e., ``Cxy[(i,j)] = cohere(X[:,i], X[:,j])``. Number of
- dictionary keys is ``len(ij)``.
+ (Cxy, Phase, freqs), where: 
+ 
+ Cxy: dictionary of (i,j) tuples -> coherence vector for that
+ pair. Ie, Cxy[(i,j) = cohere(X[:,i], X[:,j]). Number of
+ dictionary keys is len(ij)
 
- - *Phase*: a dictionary of phases of the cross spectral density at
- each frequency for each pair. The keys are ``(i,j)``.
+ Phase: dictionary of phases of the cross spectral density at
+ each frequency for each pair. keys are (i,j).
 
- - *freqs*: a vector of frequencies, equal in length to either
- the coherence or phase vectors for any (*i*, *j*) key.. Eg,
- to make a coherence Bode plot::
+ freqs: vector of frequencies, equal in length to either the
+ coherence or phase vectors for any i,j key.
 
+ Eg, to make a coherence Bode plot:
+
 subplot(211)
 plot( freqs, Cxy[(12,19)])
 subplot(212)
 plot( freqs, Phase[(12,19)])
 
- For a large number of pairs, :func:`cohere_pairs` can be much more
- efficient than just calling :func:`cohere` for each pair, because
- it caches most of the intensive computations. If *N* is the
- number of pairs, this function is O(N) for most of the heavy
- lifting, whereas calling cohere for each pair is
- O(N\N{SUPERSCRIPT TWO}). However, because of the caching, it is
- also more memory intensive, making 2 additional complex arrays
- with approximately the same number of elements as *X*.
+ For a large number of pairs, cohere_pairs can be much more
+ efficient than just calling cohere for each pair, because it
+ caches most of the intensive computations. If N is the number of
+ pairs, this function is O(N) for most of the heavy lifting,
+ whereas calling cohere for each pair is O(N^2). However, because
+ of the caching, it is also more memory intensive, making 2
+ additional complex arrays with approximately the same number of
+ elements as X.
 
- The parameter *preferSpeedOverMemory*, if *False*, limits the
- caching by only making one, rather than two, complex cache arrays.
- This is useful if memory becomes critical. Even when
- *preferSpeedOverMemory* is *False*, :func:`cohere_pairs` will
- still give significant performace gains over calling
- :func:`cohere` for each pair, and will use subtantially less
- memory than if *preferSpeedOverMemory* is *True*. In my tests
- with a (43000, 64) array over all non-redundant pairs,
- *preferSpeedOverMemory* = *True* delivered a 33% performace boost
- on a 1.7GHZ Athlon with 512MB RAM compared with
- *preferSpeedOverMemory* = *False*. But both solutions were more
- than 10x faster than naievly crunching all possible pairs through
- cohere.
+ See test/cohere_pairs_test.py in the src tree for an example
+ script that shows that this cohere_pairs and cohere give the same
+ results for a given pair.
 
- .. seealso::
-
- :file:`test/cohere_pairs_test.py` in the src tree
- For an example script that shows that this
- :func:`cohere_pairs` and :func:`cohere` give the same
- results for a given pair.
+ See also 
+ --------
+ :func: psd
 """ 
 numRows, numCols = X.shape
 
@@ -578,12 +584,10 @@
 numRows, numCols = X.shape
 # get all the columns of X that we are interested in by checking
 # the ij tuples
- seen = {}
+ allColumns = set()
 for i,j in ij:
- seen[i]=1; seen[j] = 1
- allColumns = seen.keys()
+ allColumns.add(i); allColumns.add(j)
 Ncols = len(allColumns)
- del seen
 
 # for real X, ignore the negative frequencies
 if np.iscomplexobj(X): numFreqs = NFFT
@@ -596,26 +600,26 @@
 assert(len(window) == NFFT)
 windowVals = window
 else:
- windowVals = window(np.ones((NFFT,), typecode(X)))
+ windowVals = window(np.ones(NFFT, X.dtype))
 ind = range(0, numRows-NFFT+1, NFFT-noverlap)
 numSlices = len(ind)
 FFTSlices = {}
 FFTConjSlices = {}
 Pxx = {}
 slices = range(numSlices)
- normVal = norm(windowVals)**2
+ normVal = np.linalg.norm(windowVals)**2
 for iCol in allColumns:
 progressCallback(i/Ncols, 'Cacheing FFTs')
 Slices = np.zeros( (numSlices,numFreqs), dtype=np.complex_)
 for iSlice in slices:
 thisSlice = X[ind[iSlice]:ind[iSlice]+NFFT, iCol]
 thisSlice = windowVals*detrend(thisSlice)
- Slices[iSlice,:] = fft(thisSlice)[:numFreqs]
+ Slices[iSlice,:] = np.fft.fft(thisSlice)[:numFreqs]
 
 FFTSlices[iCol] = Slices
 if preferSpeedOverMemory:
- FFTConjSlices[iCol] = conjugate(Slices)
- Pxx[iCol] = np.divide(np.mean(absolute(Slices)**2), normVal)
+ FFTConjSlices[iCol] = np.conjugate(Slices)
+ Pxx[iCol] = np.divide(np.mean(abs(Slices)**2), normVal)
 del Slices, ind, windowVals
 
 # compute the coherences and phases for all pairs using the
@@ -634,9 +638,11 @@
 else:
 Pxy = FFTSlices[i] * np.conjugate(FFTSlices[j])
 if numSlices>1: Pxy = np.mean(Pxy)
- Pxy = np.divide(Pxy, normVal)
- Cxy[(i,j)] = np.divide(np.absolute(Pxy)**2, Pxx[i]*Pxx[j])
- Phase[(i,j)] = np.arctan2(Pxy.imag, Pxy.real)
+ #Pxy = np.divide(Pxy, normVal)
+ Pxy /= normVal
+ #Cxy[(i,j)] = np.divide(np.absolute(Pxy)**2, Pxx[i]*Pxx[j])
+ Cxy[i,j] = abs(Pxy)**2 / (Pxx[i]*Pxx[j])
+ Phase[i,j] = np.arctan2(Pxy.imag, Pxy.real)
 
 freqs = Fs/NFFT*np.arange(numFreqs)
 if returnPxx:
@@ -644,8 +650,6 @@
 else:
 return Cxy, Phase, freqs
 
-
-
 def entropy(y, bins):
 r"""
 Return the entropy of the data in *y*.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7523
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7523&view=rev
Author: jdh2358
Date: 2009年08月22日 23:20:30 +0000 (2009年8月22日)
Log Message:
-----------
fix osx epd formatting bug in rest
Modified Paths:
--------------
 branches/v0_99_maint/doc/_templates/indexsidebar.html
 branches/v0_99_maint/doc/_templates/layout.html
 branches/v0_99_maint/doc/faq/installing_faq.rst
 branches/v0_99_maint/doc/users/transforms_tutorial.rst
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html	2009年08月22日 23:19:44 UTC (rev 7522)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html	2009年08月22日 23:20:30 UTC (rev 7523)
@@ -7,18 +7,33 @@
 pathto('users/installing') }}">installing</a>
 </p>
 
-<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>. 
+<p>Build websites like matplotlib's,
+with <a href="http://sphinx.pocoo.org/">sphinx</a> and extensions for
+mpl plots, math, inheritance diagrams -- try
+the <a href="http://matplotlib.sf.net/sampledoc">sampledoc</a>
+tutorial.
 </p>
 
+
+<h3>Videos</h3>
+
+<p>Watch the <a href="http://conference.scipy.org/">SciPy</a> 2009 <a href="http://www.archive.org/details/scipy09_introTutorialDay2_1">intro</a> and <a href="http://www.archive.org/details/scipy09_advancedTutorialDay1_3">advanced</a> matplotlib tutorials
+</p>
+
+<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">talk</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>MLOSS</i></a>. 
+</p>
+
+
+<h3>Toolkits</h3>
+
 <p>There are several matplotlib addon <a href="{{
 pathto('users/toolkits') }}">toolkits</a>, including the projection
 and mapping toolkit
 <a href="http://matplotlib.sf.net/basemap/doc/html">basemap</a>, 3d plotting with <a href="{{
-pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, wild and wonderful axes and axis helpers in <a href="{{
+pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>, axes and axis helpers in <a href="{{
 pathto('mpl_toolkits/axes_grid/index') }}">axes_grid</a> and more.
 </p>
 
-
 <h3>Need help?</h3>
 
 <p>Check the <a href="{{ pathto('users/index') }}">user guide</a>,
Modified: branches/v0_99_maint/doc/_templates/layout.html
===================================================================
--- branches/v0_99_maint/doc/_templates/layout.html	2009年08月22日 23:19:44 UTC (rev 7522)
+++ branches/v0_99_maint/doc/_templates/layout.html	2009年08月22日 23:20:30 UTC (rev 7523)
@@ -2,10 +2,11 @@
 
 
 {% block rootrellink %}
- <li><a href="{{ pathto('index') }}">matplotlib&nbsp;home</a>|&nbsp;</li>
+ <li><a href="{{ pathto('index') }}">home</a>|&nbsp;</li>
 <li><a href="{{ pathto('search') }}">search</a>|&nbsp;</li>
+ <li><a href="examples/index.html">examples</a>|&nbsp;</li>
 <li><a href="{{ pathto('gallery') }}">gallery</a>|&nbsp;</li>
- <li><a href="{{ pathto('contents') }}">documentation </a> &raquo;</li>
+ <li><a href="{{ pathto('contents') }}">docs</a> &raquo;</li>
 {% endblock %}
 
 
Modified: branches/v0_99_maint/doc/faq/installing_faq.rst
===================================================================
--- branches/v0_99_maint/doc/faq/installing_faq.rst	2009年08月22日 23:19:44 UTC (rev 7522)
+++ branches/v0_99_maint/doc/faq/installing_faq.rst	2009年08月22日 23:20:30 UTC (rev 7523)
@@ -400,9 +400,10 @@
 ``/Library/Frameworks/Python.framework/Versions/Current/lib/pythonX.Y/site-packages/easy-install.pth``,
 (where X.Y is the version of Python you are building against)
 Comment out the line containing the name of the directory in which the
-previous version of MPL was installed (Looks something like ``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``). 
+previous version of MPL was installed (Looks something like ``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``).
 
 3. Save the following as a shell script , for example ``./install-matplotlib-epd-osx.sh`` ::
+
 NAME=matplotlib
 VERSION=0_99
 PREFIX=$HOME
@@ -413,11 +414,11 @@
 	 echo getting the trunk
 	 svn co https://matplotlib.svn.sourceforge.net/svnroot/$NAME/trunk/$NAME $NAME
 	 cd $NAME
- 
+
 	fi
 	if [ $branch = "release" ]
 	 then
- 	 echo getting the maintenance branch 
+ 	 echo getting the maintenance branch
 	 svn co https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v${VERSION}_maint $NAME$VERSION
 	 cd $NAME$VERSION
 	fi
Modified: branches/v0_99_maint/doc/users/transforms_tutorial.rst
===================================================================
--- branches/v0_99_maint/doc/users/transforms_tutorial.rst	2009年08月22日 23:19:44 UTC (rev 7522)
+++ branches/v0_99_maint/doc/users/transforms_tutorial.rst	2009年08月22日 23:20:30 UTC (rev 7523)
@@ -12,11 +12,12 @@
 happens under the hood, but as you push the limits of custom figure
 generation, it helps to have an understanding of these objects so you
 can reuse the existing transformations matplotlib makes available to
-you, or create your own (see :mod:`matplotlib.transforms`. The table below summarizes the existing
-coordinate systems, the transformation object you should use to work
-in that coordinate system, and the description of that system. In the
-`Transformation Object` column, ``ax`` is a :class:`~matplotlib.axes.Axes` instance,
-and ``fig`` is a :class:`~matplotlib.figure.Figure` instance.
+you, or create your own (see :mod:`matplotlib.transforms`). The table
+below summarizes the existing coordinate systems, the transformation
+object you should use to work in that coordinate system, and the
+description of that system. In the `Transformation Object` column,
+``ax`` is a :class:`~matplotlib.axes.Axes` instance, and ``fig`` is a
+:class:`~matplotlib.figure.Figure` instance.
 
 ========== ===================== ==============================================================================================================================================================
 Coordinate Transformation Object Description
@@ -28,16 +29,18 @@
 ========== ===================== ==============================================================================================================================================================
 
 
-All of the transformation objects take inputs in their coordinate
-system, and transform the input to the `display` coordinate system.
-That is why the `display` coordinate system has `None` for the
-`Transformation Object` column -- it already is in display
-coordinates. The transformations also know how to invert themselves,
-to go from `display` back to the native coordinate system. This is
-particularly useful when processing events from the user interface,
-which typically occur in display space, and you want to know where the
-mouse click or key-press occurred in your data coordinate system.
 
+All of the transformation objects in the table above take inputs in
+their coordinate system, and transform the input to the `display`
+coordinate system. That is why the `display` coordinate system has
+`None` for the `Transformation Object` column -- it already is in
+display coordinates. The transformations also know how to invert
+themselves, to go from `display` back to the native coordinate system.
+This is particularly useful when processing events from the user
+interface, which typically occur in display space, and you want to
+know where the mouse click or key-press occurred in your data
+coordinate system.
+
 .. _data-coords:
 
 Data coordinates
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7525
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7525&view=rev
Author: astraw
Date: 2009年08月23日 01:03:07 +0000 (2009年8月23日)
Log Message:
-----------
remove buildout support (testing will use plain buildbot)
Removed Paths:
-------------
 trunk/matplotlib/bootstrap.py
 trunk/matplotlib/buildout.cfg
Deleted: trunk/matplotlib/bootstrap.py
===================================================================
--- trunk/matplotlib/bootstrap.py	2009年08月22日 23:26:25 UTC (rev 7524)
+++ trunk/matplotlib/bootstrap.py	2009年08月23日 01:03:07 UTC (rev 7525)
@@ -1,52 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-
-$Id$
-"""
-
-import os, shutil, sys, tempfile, urllib2
-
-tmpeggs = tempfile.mkdtemp()
-
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-
-import pkg_resources
-
-cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
-
-ws = pkg_resources.working_set
-assert os.spawnle(
- os.P_WAIT, sys.executable, sys.executable,
- '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
-
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
-import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)
Deleted: trunk/matplotlib/buildout.cfg
===================================================================
--- trunk/matplotlib/buildout.cfg	2009年08月22日 23:26:25 UTC (rev 7524)
+++ trunk/matplotlib/buildout.cfg	2009年08月23日 01:03:07 UTC (rev 7525)
@@ -1,31 +0,0 @@
-[buildout]
-parts = PIL test python
-develop = .
-eggs = matplotlib
-find-links = http://astraw.com/mpl/
-
-[test]
-recipe = pbp.recipe.noserunner
-# Use Andrew Straw's custom packaging of noserunner with plugin support.
-eggs =
- pbp.recipe.noserunner==0.2.6.2
- PIL
- ${buildout:eggs}
-working-directory = ${buildout:directory}/test
-initialization =
- sys.path.insert(0,'.')
- from mplTest import MplNosePlugin
-plugins =
- MplNosePlugin()
-
-[python]
-recipe = zc.recipe.egg
-interpreter = python
-eggs =
- ${buildout:eggs}
-
-[PIL]
-# This recipe based on http://www.koansys.com/tech/install-plone-with-zopeskel-buildout-needs-pil
-# Build egg with Andrew Straw's custom packaging of setuptools-compatibile PIL without Tkinter.
-recipe = zc.recipe.egg
-egg = PIL==1.1.6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.