matplotlib-checkins Mailing List for matplotlib

Revision: 7142
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7142&view=rev
Author: cmoad
Date: 2009年05月25日 18:23:25 +0000 (2009年5月25日)
Log Message:
-----------
more win32 build updates
Modified Paths:
--------------
 trunk/matplotlib/release/win32/Makefile
 trunk/matplotlib/release/win32/data/setup.cfg
Modified: trunk/matplotlib/release/win32/Makefile
===================================================================
--- trunk/matplotlib/release/win32/Makefile	2009年05月25日 17:39:45 UTC (rev 7141)
+++ trunk/matplotlib/release/win32/Makefile	2009年05月25日 18:23:25 UTC (rev 7142)
@@ -1,4 +1,4 @@
-PYTHON=python
+PYTHON=C:/Python26/python.exe
 SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
@@ -23,12 +23,14 @@
 	wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2
 
 zlib:
+	rm -rf zlib-${ZLIBVERSION}
 	tar xvfz zlib-${ZLIBVERSION}.tar.gz
 	cd zlib-${ZLIBVERSION} &&\
 	./configure &&\
 	make -j3
 
 png: zlib
+	rm -rf libpng-${PNGVERSION}
 	tar xvfj libpng-${PNGVERSION}.tar.bz2
 	cd libpng-${PNGVERSION} &&\
 	export CFLAGS=${CFLAGS} &&\
@@ -38,10 +40,10 @@
 	cp .libs/libpng.a .
 
 freetype:
-	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+	rm -rf freetype-${FREETYPEVERSION}
+	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2
 	cd freetype-${FREETYPEVERSION} &&\
-	export GNUMAKE=mingw32-make &&\
-	./configure --disable-shared &&\
+	GNUMAKE=mingw32-make ./configure --disable-shared &&\
 	cp builds/win32/w32-mingw32.mk config.mk &&\
 	mingw32-make -j3 &&\
 	cp objs/libfreetype.a .
@@ -49,13 +51,12 @@
 dependencies: png freetype
 
 installers:
-	tar xvzf matplotlib-${MPLVERSION}.tar.gz &&\
+	rm -rf matplotlib-${MPLVERSION}
+	tar xvzf matplotlib-${MPLVERSION}.tar.gz
 	cd matplotlib-${MPLVERSION} &&\
 	rm -rf build &&\
 	cp ../data/setup.cfg . &&\
-	export CFLAGS=${CFLAGS} &&\
-	export LDFLAGS=${LDFLAGS} &&\
 	${PYTHON} setup.py build -c mingw32 bdist_wininst &&\
-	${PYTHON) setupegg.py build -c mingw32 bdist_egg
+	${PYTHON} setupegg.py build -c mingw32 bdist_egg
 
 all: fetch_deps dependencies installers
Modified: trunk/matplotlib/release/win32/data/setup.cfg
===================================================================
--- trunk/matplotlib/release/win32/data/setup.cfg	2009年05月25日 17:39:45 UTC (rev 7141)
+++ trunk/matplotlib/release/win32/data/setup.cfg	2009年05月25日 18:23:25 UTC (rev 7142)
@@ -2,7 +2,7 @@
 # build options.
 
 [egg_info]
-tag_svn_revision = 0
+tag_svn_revision = 1
 
 [status]
 # To suppress display of the dependencies and their versions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7141
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7141&view=rev
Author: jdh2358
Date: 2009年05月25日 17:39:45 +0000 (2009年5月25日)
Log Message:
-----------
only forward pick events to children with the same axes instance as the pick event inaxes method
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/artist.py
Modified: trunk/matplotlib/lib/matplotlib/artist.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/artist.py	2009年05月25日 17:38:09 UTC (rev 7140)
+++ trunk/matplotlib/lib/matplotlib/artist.py	2009年05月25日 17:39:45 UTC (rev 7141)
@@ -24,13 +24,13 @@
 
 
 
-def allow_rasterization(draw): 
+def allow_rasterization(draw):
 """
 Decorator for Artist.draw method. Provides routines
 that run before and after the draw call. The before and after functions
 are useful for changing artist-dependant renderer attributes or making
 other setup function calls, such as starting and flushing a mixed-mode
- renderer. 
+ renderer.
 """
 def before(artist, renderer):
 if artist.get_rasterized():
@@ -42,7 +42,7 @@
 
 # the axes class has a second argument inframe for its draw method.
 def draw_wrapper(artist, renderer, *kl):
- before(artist, renderer) 
+ before(artist, renderer)
 draw(artist, renderer, *kl)
 after(artist, renderer)
 
@@ -52,8 +52,8 @@
 draw_wrapper.__doc__ = draw.__doc__
 draw_wrapper._supports_rasterization = True
 return draw_wrapper
- 
 
+
 class Artist(object):
 """
 Abstract base class for someone who renders into a
@@ -308,7 +308,10 @@
 
 # Pick children
 for a in self.get_children():
- a.pick(mouseevent)
+ # make sure the event happened in the same axes
+ ax = getattr(a, 'axes', None)
+ if mouseevent.inaxes==ax:
+ a.pick(mouseevent)
 
 def set_picker(self, picker):
 """
@@ -543,16 +546,16 @@
 else:
 gc.set_clip_rectangle(None)
 gc.set_clip_path(None)
- 
+
 def get_rasterized(self):
 return self._rasterized
- 
+
 def set_rasterized(self, rasterized):
 """
 Force rasterized (bitmap) drawing in vector backend output.
- 
+
 Defaults to None, which implies the backend's default behavior
- 
+
 ACCEPTS: [True | False | None]
 """
 if rasterized and not hasattr(self.draw, "_supports_rasterization"):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7140
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7140&view=rev
Author: cmoad
Date: 2009年05月25日 17:38:09 +0000 (2009年5月25日)
Log Message:
-----------
initial win32 build import
Added Paths:
-----------
 trunk/matplotlib/release/win32/
 trunk/matplotlib/release/win32/Makefile
 trunk/matplotlib/release/win32/data/
 trunk/matplotlib/release/win32/data/setup.cfg
Added: trunk/matplotlib/release/win32/Makefile
===================================================================
--- trunk/matplotlib/release/win32/Makefile	 (rev 0)
+++ trunk/matplotlib/release/win32/Makefile	2009年05月25日 17:38:09 UTC (rev 7140)
@@ -0,0 +1,61 @@
+PYTHON=python
+SRCDIR=${PWD}
+ZLIBVERSION=1.2.3
+PNGVERSION=1.2.33
+FREETYPEVERSION=2.3.7
+MPLVERSION=0.98.5.3
+
+## You shouldn't need to configure past this point
+
+CFLAGS="-Os -I${SRCDIR}/zlib-${ZLIBVERSION} -I${SRCDIR}/libpng-${PNGVERSION} -I${SRCDIR}/freetype-${FREETYPEVERSION}/include"
+
+LDFLAGS="-L${SRCDIR}/zlib-${ZLIBVERSION} -L${SRCDIR}/libpng-${PNGVERSION} -L${SRCDIR}/freetype-${FREETYPEVERSION}"
+
+clean:
+	rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
+	freetype-${FREETYPEVERSION}.tar.bz2 \
+	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
+	matplotlib-${MPLVERSION} *~
+
+fetch_deps:
+	wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz
+	wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2
+	wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2
+
+zlib:
+	tar xvfz zlib-${ZLIBVERSION}.tar.gz
+	cd zlib-${ZLIBVERSION} &&\
+	./configure &&\
+	make -j3
+
+png: zlib
+	tar xvfj libpng-${PNGVERSION}.tar.bz2
+	cd libpng-${PNGVERSION} &&\
+	export CFLAGS=${CFLAGS} &&\
+	export LDFLAGS=${LDFLAGS} &&\
+	./configure --disable-shared &&\
+	make -j3 &&\
+	cp .libs/libpng.a .
+
+freetype:
+	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+	cd freetype-${FREETYPEVERSION} &&\
+	export GNUMAKE=mingw32-make &&\
+	./configure --disable-shared &&\
+	cp builds/win32/w32-mingw32.mk config.mk &&\
+	mingw32-make -j3 &&\
+	cp objs/libfreetype.a .
+
+dependencies: png freetype
+
+installers:
+	tar xvzf matplotlib-${MPLVERSION}.tar.gz &&\
+	cd matplotlib-${MPLVERSION} &&\
+	rm -rf build &&\
+	cp ../data/setup.cfg . &&\
+	export CFLAGS=${CFLAGS} &&\
+	export LDFLAGS=${LDFLAGS} &&\
+	${PYTHON} setup.py build -c mingw32 bdist_wininst &&\
+	${PYTHON) setupegg.py build -c mingw32 bdist_egg
+
+all: fetch_deps dependencies installers
Added: trunk/matplotlib/release/win32/data/setup.cfg
===================================================================
--- trunk/matplotlib/release/win32/data/setup.cfg	 (rev 0)
+++ trunk/matplotlib/release/win32/data/setup.cfg	2009年05月25日 17:38:09 UTC (rev 7140)
@@ -0,0 +1,79 @@
+# Rename this file to setup.cfg to modify matplotlib's
+# build options.
+
+[egg_info]
+tag_svn_revision = 0
+
+[status]
+# To suppress display of the dependencies and their versions
+# at the top of the build log, uncomment the following line:
+#suppress = True
+#
+# Uncomment to insert lots of diagnostic prints in extension code
+#verbose = True
+
+[provide_packages]
+# By default, matplotlib checks for a few dependencies and
+# installs them if missing. This feature can be turned off
+# by uncommenting the following lines. Acceptible values are:
+# True: install, overwrite an existing installation
+# False: do not install
+# auto: install only if the package is unavailable. This
+# is the default behavior
+#
+## Date/timezone support:
+pytz = True
+dateutil = True
+
+
+[gui_support]
+# Matplotlib supports multiple GUI toolkits, including Cocoa,
+# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
+# these toolkits requires AGG, the Anti-Grain Geometry library,
+# which is provided by matplotlib and built by default.
+#
+# Some backends are written in pure Python, and others require
+# extension code to be compiled. By default, matplotlib checks
+# for these GUI toolkits during installation and, if present,
+# compiles the required extensions to support the toolkit. GTK
+# support requires the GTK runtime environment and PyGTK. Wx
+# support requires wxWidgets and wxPython. Tk support requires
+# Tk and Tkinter. The other GUI toolkits do not require any
+# extension code, and can be used as long as the libraries are
+# installed on your system.
+#
+# You can uncomment any the following lines if you know you do
+# not want to use the GUI toolkit. Acceptible values are:
+# True: build the extension. Exits with a warning if the
+# required dependencies are not available
+# False: do not build the extension
+# auto: build if the required dependencies are available,
+# otherwise skip silently. This is the default
+# behavior
+#
+gtk = False
+gtkagg = False
+tkagg = True
+wxagg = False
+macosx = False
+
+[rc_options]
+# User-configurable options
+#
+# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
+# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
+#
+# The Agg, Ps, Pdf and SVG backends do not require external
+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
+# if you have disabled the relevent extension modules. Agg will be used
+# by default.
+#
+backend = TkAgg
+#
+# The numerix module was historically used to provide
+# compatibility between the Numeric, numarray, and NumPy array
+# packages. Now that NumPy has emerge as the universal array
+# package for python, numerix is not really necessary and is
+# maintained to provide backward compatibility. Do not change
+# this unless you have a compelling reason to do so.
+#numerix = numpy
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7139
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7139&view=rev
Author: efiring
Date: 2009年05月25日 00:16:44 +0000 (2009年5月25日)
Log Message:
-----------
Improved version of previous commit: bug fix in Arc
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/patches.py
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py	2009年05月25日 00:00:46 UTC (rev 7138)
+++ trunk/matplotlib/lib/matplotlib/patches.py	2009年05月25日 00:16:44 UTC (rev 7139)
@@ -1189,10 +1189,9 @@
 
 %(Patch)s
 """
- fill = kwargs.get('fill') # returns None if key is absent
+ fill = kwargs.setdefault('fill', False)
 if fill:
 raise ValueError("Arc objects can not be filled")
- kwargs['fill'] = False
 
 Ellipse.__init__(self, xy, width, height, angle, **kwargs)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7138
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7138&view=rev
Author: efiring
Date: 2009年05月25日 00:00:46 +0000 (2009年5月25日)
Log Message:
-----------
Fix bug in Arc handling of fill kwarg; thanks to Tony Yu
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/patches.py
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py	2009年05月23日 14:31:14 UTC (rev 7137)
+++ trunk/matplotlib/lib/matplotlib/patches.py	2009年05月25日 00:00:46 UTC (rev 7138)
@@ -1189,7 +1189,7 @@
 
 %(Patch)s
 """
- fill = kwargs.pop('fill')
+ fill = kwargs.get('fill') # returns None if key is absent
 if fill:
 raise ValueError("Arc objects can not be filled")
 kwargs['fill'] = False
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.