Menu
▾
▴
SF.net SVN: matplotlib:[7363] trunk/matplotlib
|
From: <jd...@us...> - 2009-08-05 14:35:16
|
Revision: 7363
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7363&view=rev
Author: jdh2358
Date: 2009-08-05 14:35:06 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
Merged revisions 7353,7358-7359 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint
........
r7353 | jdh2358 | 2009-08-04 13:46:41 -0500 (Tue, 04 Aug 2009) | 1 line
attach gtk events to mpl events -- fixes sf bug 2816580
........
r7358 | jdh2358 | 2009-08-04 21:29:12 -0500 (Tue, 04 Aug 2009) | 1 line
some fixes for osx builds on rc2
........
r7359 | jdh2358 | 2009-08-05 06:06:13 -0500 (Wed, 05 Aug 2009) | 1 line
remove dup gui event in enter/leave events in gtk
........
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
trunk/matplotlib/release/osx/Makefile
trunk/matplotlib/release/osx/README.txt
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-7345
+ /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7362
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2009-08-05 12:04:36 UTC (rev 7362)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2009-08-05 14:35:06 UTC (rev 7363)
@@ -4,7 +4,7 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-<p>A release candidate rc1 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
+<p>A release candidate rc2 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</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>.
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2009-08-05 12:04:36 UTC (rev 7362)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2009-08-05 14:35:06 UTC (rev 7363)
@@ -197,7 +197,7 @@
step = 1
else:
step = -1
- FigureCanvasBase.scroll_event(self, x, y, step)
+ FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
return False # finish event propagation?
def button_press_event(self, widget, event):
@@ -205,7 +205,7 @@
x = event.x
# flipy so y=0 is bottom of canvas
y = self.allocation.height - event.y
- FigureCanvasBase.button_press_event(self, x, y, event.button)
+ FigureCanvasBase.button_press_event(self, x, y, event.button, guiEvent=event)
return False # finish event propagation?
def button_release_event(self, widget, event):
@@ -213,21 +213,21 @@
x = event.x
# flipy so y=0 is bottom of canvas
y = self.allocation.height - event.y
- FigureCanvasBase.button_release_event(self, x, y, event.button)
+ FigureCanvasBase.button_release_event(self, x, y, event.button, guiEvent=event)
return False # finish event propagation?
def key_press_event(self, widget, event):
if _debug: print 'FigureCanvasGTK.%s' % fn_name()
key = self._get_key(event)
if _debug: print "hit", key
- FigureCanvasBase.key_press_event(self, key)
+ FigureCanvasBase.key_press_event(self, key, guiEvent=event)
return False # finish event propagation?
def key_release_event(self, widget, event):
if _debug: print 'FigureCanvasGTK.%s' % fn_name()
key = self._get_key(event)
if _debug: print "release", key
- FigureCanvasBase.key_release_event(self, key)
+ FigureCanvasBase.key_release_event(self, key, guiEvent=event)
return False # finish event propagation?
def motion_notify_event(self, widget, event):
@@ -239,7 +239,7 @@
# flipy so y=0 is bottom of canvas
y = self.allocation.height - y
- FigureCanvasBase.motion_notify_event(self, x, y)
+ FigureCanvasBase.motion_notify_event(self, x, y, guiEvent=event)
return False # finish event propagation?
def leave_notify_event(self, widget, event):
Modified: trunk/matplotlib/release/osx/Makefile
===================================================================
--- trunk/matplotlib/release/osx/Makefile 2009-08-05 12:04:36 UTC (rev 7362)
+++ trunk/matplotlib/release/osx/Makefile 2009-08-05 14:35:06 UTC (rev 7363)
@@ -1,10 +1,10 @@
-PYVERSION=2.6
+PYVERSION=2.5
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0.rc1
+MPLVERSION=0.99.0.rc2
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
@@ -88,7 +88,7 @@
cp ../data/setup.cfg . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- bdist_mpkg &&\
+ /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg &&\
${PYTHON} setupegg.py bdist_egg &&\
cd dist && \
zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
Modified: trunk/matplotlib/release/osx/README.txt
===================================================================
--- trunk/matplotlib/release/osx/README.txt 2009-08-05 12:04:36 UTC (rev 7362)
+++ trunk/matplotlib/release/osx/README.txt 2009-08-05 14:35:06 UTC (rev 7363)
@@ -7,7 +7,7 @@
-------------
* :file:`bdist_mkpg` - the distutils.extension to build Installer.app
- mpkg installers.
+ mpkg installers.
* :file:`data` - some config files and patches needed for the build
@@ -19,16 +19,22 @@
How to build
--------------
-* You need a python framework build , numpy and wxpython to build the
+* You need a python framework build, numpy and wxpython to build the
mpl installers (wx requires this and we need wx to build the wxagg
- extension). You can get the three required dependencies as
- Installer apps, eg:
+ extension). I recommend building python from src as a framework build::
+ ./configure --enable-universalsdk --enable-framework
+ sudo make install
- http://www.python.org/ftp/python/2.6.2/python-2.6.2-macosx2009-04-16.dmg
- http://downloads.sourceforge.net/project/numpy/NumPy/1.3.0/numpy-1.3.0-py2.6-macosx10.5.dmg?use_mirror=voxel
- http://downloads.sourceforge.net/project/wxpython/wxPython/2.8.10.1/wxPython2.8-osx-unicode-2.8.10.1-universal-py2.6.dmg?use_mirror=voxel
+ and build numpy from src too since the 2.5 numpy installer doesn't work
+ with a python built from src::
+ sudo python setup.py install
+
+ you can use the pre-built installer for wx::
+
+ http://downloads.sourceforge.net/project/wxpython/wxPython/2.8.10.1/wxPython2.8-osx-unicode-2.8.10.1-universal-py2.6.dmg?use_mirror=voxel
+
* You need to make sure to unset PKG_CONFIG_PATH to make sure the
static linking below is respected. Otherwise the mpl build script
will dynamically link using the libs from pkgconfig if you have this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
