Menu
▾
▴
matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(115) |
Aug
(120) |
Sep
(137) |
Oct
(170) |
Nov
(461) |
Dec
(263) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(120) |
Feb
(74) |
Mar
(35) |
Apr
(74) |
May
(245) |
Jun
(356) |
Jul
(240) |
Aug
(115) |
Sep
(78) |
Oct
(225) |
Nov
(98) |
Dec
(271) |
| 2009 |
Jan
(132) |
Feb
(84) |
Mar
(74) |
Apr
(56) |
May
(90) |
Jun
(79) |
Jul
(83) |
Aug
(296) |
Sep
(214) |
Oct
(76) |
Nov
(82) |
Dec
(66) |
| 2010 |
Jan
(46) |
Feb
(58) |
Mar
(51) |
Apr
(77) |
May
(58) |
Jun
(126) |
Jul
(128) |
Aug
(64) |
Sep
(50) |
Oct
(44) |
Nov
(48) |
Dec
(54) |
| 2011 |
Jan
(68) |
Feb
(52) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jd...@us...> - 2010-03-09 15:44:27
|
Revision: 8185
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8185&view=rev
Author: jdh2358
Date: 2010-03-09 15:44:16 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
remove micromicro version num
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/release/osx/Makefile
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:41:30 UTC (rev 8184)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:44:16 UTC (rev 8185)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.1.3rc1'
+__version__ = '0.99.3rc1'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile 2010-03-09 15:41:30 UTC (rev 8184)
+++ branches/v0_99_maint/release/osx/Makefile 2010-03-09 15:44:16 UTC (rev 8185)
@@ -4,7 +4,7 @@
ZLIBVERSION=1.2.3
PNGVERSION=1.2.39
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.1.3rc1
+MPLVERSION=0.99.3rc1
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
OSX_SDK_VER=10.6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-09 15:41:37
|
Revision: 8184
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8184&view=rev
Author: jdh2358
Date: 2010-03-09 15:41:30 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
tagging for branch release candidate
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/lib/matplotlib/cbook.py
branches/v0_99_maint/make.osx
branches/v0_99_maint/release/osx/Makefile
branches/v0_99_maint/release/osx/data/setup.cfg
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:41:30 UTC (rev 8184)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.1.1'
+__version__ = '0.99.1.3rc1'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/lib/matplotlib/cbook.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/cbook.py 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/lib/matplotlib/cbook.py 2010-03-09 15:41:30 UTC (rev 8184)
@@ -20,8 +20,10 @@
try:
preferredencoding = locale.getpreferredencoding()
-except (ValueError, ImportError):
+except ValueError:
preferredencoding = None
+except ImportError:
+ preferredencoding = None
def unicode_safe(s):
if preferredencoding is None: return unicode(s)
Modified: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/make.osx 2010-03-09 15:41:30 UTC (rev 8184)
@@ -1,38 +1,47 @@
-# 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
-MPLVERSION=0.99.1.1
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.33
-FREETYPEVERSION=2.3.7
-MACOSX_DEPLOYMENT_TARGET=10.4
+PNGVERSION=1.2.39
+FREETYPEVERSION=2.3.11
+MACOSX_DEPLOYMENT_TARGET=10.6
+OSX_SDK_VER=10.6
+ARCH_FLAGS="-arch i386-arch x86_64"
+
## You shouldn't need to configure past this point
+#PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+#CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+#LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+CFLAGS="-arch i386 -arch x86_64 -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+FFLAGS="-arch i386 -arch x86_64"
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}
+ zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
+ build
+
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://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\
${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 &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf zlib-${ZLIBVERSION} &&\
- tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+ tar xvfj zlib-${ZLIBVERSION}.tar.gz &&\
cd zlib-${ZLIBVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -42,9 +51,9 @@
unset MACOSX_DEPLOYMENT_TARGET
png: zlib
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfj libpng-${PNGVERSION}.tar.bz2
+ tar xvfz libpng-${PNGVERSION}.tar.gz && \
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -56,7 +65,7 @@
freetype: zlib
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf ${FREETYPEVERSION} &&\
tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
cd freetype-${FREETYPEVERSION} &&\
@@ -73,12 +82,14 @@
echo 'all done'
mpl_build:
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- ${PYTHON} setup.py build
+ ${PYTHON} setup.py build
mpl_install:
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/release/osx/Makefile 2010-03-09 15:41:30 UTC (rev 8184)
@@ -2,12 +2,14 @@
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.33
+PNGVERSION=1.2.39
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
+MPLVERSION=0.99.1.3rc1
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
-MACOSX_DEPLOYMENT_TARGET=10.4
+OSX_SDK_VER=10.6
+MACOSX_DEPLOYMENT_TARGET=10.6
+BDIST_MPKG=/Users/jdh2358/dev/bin/bdist_mpkg
## You shouldn't need to configure past this point
@@ -15,11 +17,11 @@
LDFLAGS="-arch ppc -arch i386 -L${SRCDIR}/zlib-${ZLIBVERSION} -L${SRCDIR}/libpng-${PNGVERSION} -L${SRCDIR}/freetype-${FREETYPEVERSION}"
-CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_ZLIB="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS_ZLIB="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
clean:
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
@@ -29,15 +31,14 @@
matplotlib-${MPLVERSION} *~
fetch:
- 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&&\
- wget http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz&&\
- tar xvfz bdist_mpkg-${BDISTMPKGVERSION}.tar.gz &&\
- echo "You need to to install bdist_mpkg-${BDISTMPKGVERSION} now"
+ ${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://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\
+ ${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://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz", "bdist_mpkg-${BDISTMPKGVERSION}.tar.gz")'
+
zlib:
unset PKG_CONFIG_PATH &&\
rm -rf zlib-${ZLIBVERSION} &&\
@@ -53,7 +54,7 @@
png: zlib
unset PKG_CONFIG_PATH &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfj libpng-${PNGVERSION}.tar.bz2
+ tar xvfz libpng-${PNGVERSION}.tar.gz &&\
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS_DEPS} &&\
@@ -88,8 +89,8 @@
cp ../data/setup.cfg ../data/ReadMe.txt . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
- hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
+ ${BDIST_MPKG} --readme=ReadMe.txt &&\
+ hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.dmg &&\
${PYTHON} setupegg.py bdist_egg
upload:
@@ -97,7 +98,7 @@
mkdir upload &&\
cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py${PYVERSION}-macosx-10.3-fat.egg upload/matplotlib-${MPLVERSION}-macosx-py${PYVERSION}.egg &&\
- cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
+ cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
scp upload/* jd...@fr...:uploads/
all:
Modified: branches/v0_99_maint/release/osx/data/setup.cfg
===================================================================
--- branches/v0_99_maint/release/osx/data/setup.cfg 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/release/osx/data/setup.cfg 2010-03-09 15:41:30 UTC (rev 8184)
@@ -54,7 +54,7 @@
#gtk = False
#gtkagg = False
tkagg = True
-wxagg = True
+wxagg = False
macosx = True
[rc_options]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-09 14:19:56
|
Revision: 8183
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8183&view=rev
Author: jdh2358
Date: 2010-03-09 14:19:49 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
update make.osx to build on 10.6
Modified Paths:
--------------
trunk/matplotlib/make.osx
trunk/matplotlib/release/osx/Makefile
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx 2010-03-08 18:33:04 UTC (rev 8182)
+++ trunk/matplotlib/make.osx 2010-03-09 14:19:49 UTC (rev 8183)
@@ -4,17 +4,22 @@
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.40
+PNGVERSION=1.2.39
FREETYPEVERSION=2.3.11
-MACOSX_DEPLOYMENT_TARGET=10.4
-OSX_SDK_VER=10.4u
-ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
+MACOSX_DEPLOYMENT_TARGET=10.6
+OSX_SDK_VER=10.6
+ARCH_FLAGS="-arch i386-arch x86_64"
## You shouldn't need to configure past this point
+#PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+#CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+#LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
-CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+CFLAGS="-arch i386 -arch x86_64 -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+FFLAGS="-arch i386 -arch x86_64"
clean:
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
@@ -23,9 +28,10 @@
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
build
+
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://download.sourceforge.net/libpng/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.bz2")' &&\
+ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
@@ -34,7 +40,7 @@
zlib:
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf zlib-${ZLIBVERSION} &&\
- tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+ tar xvfj zlib-${ZLIBVERSION}.tar.gz &&\
cd zlib-${ZLIBVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -46,7 +52,7 @@
png: zlib
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfz libpng-${PNGVERSION}.tar.gz
+ tar xvfz libpng-${PNGVERSION}.tar.gz && \
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
Modified: trunk/matplotlib/release/osx/Makefile
===================================================================
--- trunk/matplotlib/release/osx/Makefile 2010-03-08 18:33:04 UTC (rev 8182)
+++ trunk/matplotlib/release/osx/Makefile 2010-03-09 14:19:49 UTC (rev 8183)
@@ -4,7 +4,7 @@
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
+MPLVERSION=1.0
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2010-03-08 18:33:17
|
Revision: 8182
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8182&view=rev
Author: efiring
Date: 2010-03-08 18:33:04 +0000 (Mon, 08 Mar 2010)
Log Message:
-----------
dates.py: fix num2jul, jul2num; fixes bug 2963391; thanks to G. Lichtenberg
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/dates.py
Modified: trunk/matplotlib/lib/matplotlib/dates.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/dates.py 2010-03-08 18:09:55 UTC (rev 8181)
+++ trunk/matplotlib/lib/matplotlib/dates.py 2010-03-08 18:33:04 UTC (rev 8182)
@@ -3,8 +3,9 @@
Matplotlib provides sophisticated date plotting capabilities, standing
on the shoulders of python :mod:`datetime`, the add-on modules
:mod:`pytz` and :mod:`dateutils`. :class:`datetime` objects are
-converted to floating point numbers which represent the number of days
-since 0001-01-01 UTC. The helper functions :func:`date2num`,
+converted to floating point numbers which represent time in days
+since 0001-01-01 UTC, plus 1. For example, 0001-01-01, 06:00 is
+1.25, not 0.25. The helper functions :func:`date2num`,
:func:`num2date` and :func:`drange` are used to facilitate easy
conversion to and from :mod:`datetime` and numeric ranges.
@@ -225,7 +226,7 @@
*d* is either a :class:`datetime` instance or a sequence of datetimes.
Return value is a floating point number (or sequence of floats)
- which gives number of days (fraction part represents hours,
+ which gives one plus the number of days (fraction part represents hours,
minutes, seconds) since 0001-01-01 00:00:00 UTC.
"""
if not cbook.iterable(d): return _to_ordinalf(d)
@@ -235,17 +236,18 @@
def julian2num(j):
'Convert a Julian date (or sequence) to a matplotlib date (or sequence).'
if cbook.iterable(j): j = np.asarray(j)
- return j + 1721425.5
+ return j - 1721424.5
def num2julian(n):
'Convert a matplotlib date (or sequence) to a Julian date (or sequence).'
if cbook.iterable(n): n = np.asarray(n)
- return n - 1721425.5
+ return n + 1721424.5
def num2date(x, tz=None):
"""
- *x* is a float value which gives number of days (fraction part
- represents hours, minutes, seconds) since 0001-01-01 00:00:00 UTC.
+ *x* is a float value which gives one plus the number of days
+ (fraction part represents hours, minutes, seconds) since
+ 0001-01-01 00:00:00 UTC.
Return value is a :class:`datetime` instance in timezone *tz* (default to
rcparams TZ value).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ef...@us...> - 2010-03-08 18:10:02
|
Revision: 8181
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8181&view=rev
Author: efiring
Date: 2010-03-08 18:09:55 +0000 (Mon, 08 Mar 2010)
Log Message:
-----------
dates.py: fix num2jul, jul2num; fixes bug 2963391; thanks to G. Lichtenberg
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/dates.py
Modified: branches/v0_99_maint/lib/matplotlib/dates.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/dates.py 2010-03-05 23:54:39 UTC (rev 8180)
+++ branches/v0_99_maint/lib/matplotlib/dates.py 2010-03-08 18:09:55 UTC (rev 8181)
@@ -3,8 +3,9 @@
Matplotlib provides sophisticated date plotting capabilities, standing
on the shoulders of python :mod:`datetime`, the add-on modules
:mod:`pytz` and :mod:`dateutils`. :class:`datetime` objects are
-converted to floating point numbers which represent the number of days
-since 0001-01-01 UTC. The helper functions :func:`date2num`,
+converted to floating point numbers which represent time in days
+since 0001-01-01 UTC, plus 1. For example, 0001-01-01, 06:00 is
+1.25, not 0.25. The helper functions :func:`date2num`,
:func:`num2date` and :func:`drange` are used to facilitate easy
conversion to and from :mod:`datetime` and numeric ranges.
@@ -225,7 +226,7 @@
*d* is either a :class:`datetime` instance or a sequence of datetimes.
Return value is a floating point number (or sequence of floats)
- which gives number of days (fraction part represents hours,
+ which gives one plus the number of days (fraction part represents hours,
minutes, seconds) since 0001-01-01 00:00:00 UTC.
"""
if not cbook.iterable(d): return _to_ordinalf(d)
@@ -235,17 +236,18 @@
def julian2num(j):
'Convert a Julian date (or sequence) to a matplotlib date (or sequence).'
if cbook.iterable(j): j = np.asarray(j)
- return j + 1721425.5
+ return j - 1721424.5
def num2julian(n):
'Convert a matplotlib date (or sequence) to a Julian date (or sequence).'
if cbook.iterable(n): n = np.asarray(n)
- return n - 1721425.5
+ return n + 1721424.5
def num2date(x, tz=None):
"""
- *x* is a float value which gives number of days (fraction part
- represents hours, minutes, seconds) since 0001-01-01 00:00:00 UTC.
+ *x* is a float value which gives one plus the number of days
+ (fraction part represents hours, minutes, seconds) since
+ 0001-01-01 00:00:00 UTC.
Return value is a :class:`datetime` instance in timezone *tz* (default to
rcparams TZ value).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-05 23:54:46
|
Revision: 8180
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8180&view=rev
Author: leejjoon
Date: 2010-03-05 23:54:39 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
same change as in r8179 of mpl99. fix a bug in SubplotDivider.new_horizontal that gave incrroect result when pack_start=True
Modified Paths:
--------------
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2010-03-05 23:51:22 UTC (rev 8179)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axes_divider.py 2010-03-05 23:54:39 UTC (rev 8180)
@@ -449,7 +449,6 @@
locator = self.new_locator(nx=len(self._horizontal)-1, ny=0)
ax = self._get_new_axes(**kwargs)
- locator = self.new_locator(nx=len(self._horizontal)-1, ny=0)
ax.set_axes_locator(locator)
return ax
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-05 23:51:28
|
Revision: 8179
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8179&view=rev
Author: leejjoon
Date: 2010-03-05 23:51:22 +0000 (Fri, 05 Mar 2010)
Log Message:
-----------
fix a bug in SubplotDivider.new_horizontal that gave incrroect result when pack_start=True
Modified Paths:
--------------
branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py
Modified: branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py
===================================================================
--- branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py 2010-03-04 00:05:17 UTC (rev 8178)
+++ branches/v0_99_maint/lib/mpl_toolkits/axes_grid/axes_divider.py 2010-03-05 23:51:22 UTC (rev 8179)
@@ -449,7 +449,6 @@
locator = self.new_locator(nx=len(self._horizontal)-1, ny=0)
ax = self._get_new_axes(**kwargs)
- locator = self.new_locator(nx=len(self._horizontal)-1, ny=0)
ax.set_axes_locator(locator)
return ax
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-04 00:05:23
|
Revision: 8178
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8178&view=rev
Author: leejjoon
Date: 2010-03-04 00:05:17 +0000 (Thu, 04 Mar 2010)
Log Message:
-----------
make NonUniformImage not to use unsampled_image
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/image.py
Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py 2010-03-03 21:33:35 UTC (rev 8177)
+++ trunk/matplotlib/lib/matplotlib/image.py 2010-03-04 00:05:17 UTC (rev 8178)
@@ -592,6 +592,12 @@
**kwargs)
AxesImage.set_interpolation(self, interp)
+ def _check_unsampled_image(self, renderer):
+ """
+ return False. Do not use unsampled image.
+ """
+ return False
+
def make_image(self, magnification=1.0):
if self._A is None:
raise RuntimeError('You must first set the image array')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-03 21:33:42
|
Revision: 8177
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8177&view=rev
Author: jdh2358
Date: 2010-03-03 21:33:35 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
fix hexbin bins=log bug
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/lib/matplotlib/ticker.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2010-03-03 21:06:01 UTC (rev 8176)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2010-03-03 21:33:35 UTC (rev 8177)
@@ -69,12 +69,12 @@
except ValueError:
return linestyle, marker, color # Yes
else:
- if fmt != fmtint:
- # user definitely doesn't want tri_down marker
+ if fmt != fmtint:
+ # user definitely doesn't want tri_down marker
return linestyle, marker, color # Yes
else:
# ignore converted color
- color = None
+ color = None
except ValueError:
pass # No, not just a color.
@@ -5773,18 +5773,16 @@
if (accum==0).any():
# make sure we have not zeros
accum += 1
-
- # Transform accum if needed
- if bins=='log':
- accum = np.log10(accum+1)
-
# autoscale the norm with curren accum values if it hasn't
# been set
if norm is not None:
if norm.vmin is None and norm.vmax is None:
norm.autoscale(accum)
-
+
+ # Transform accum if needed
+ if bins=='log':
+ accum = np.log10(accum+1)
elif bins!=None:
if not iterable(bins):
minimum, maximum = min(accum), max(accum)
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py 2010-03-03 21:06:01 UTC (rev 8176)
+++ trunk/matplotlib/lib/matplotlib/ticker.py 2010-03-03 21:33:35 UTC (rev 8177)
@@ -542,9 +542,10 @@
return self.fix_minus(s)
def format_data(self, value):
+ b = self.labelOnlyBase
self.labelOnlyBase = False
value = cbook.strip_math(self.__call__(value))
- self.labelOnlyBase = True
+ self.labelOnlyBase = b
return value
def format_data_short(self,value):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-03 21:06:19
|
Revision: 8176
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8176&view=rev
Author: jdh2358
Date: 2010-03-03 21:06:01 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
patch branch updates
Modified Paths:
--------------
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/_templates/indexsidebar.html
trunk/matplotlib/doc/_templates/layout.html
trunk/matplotlib/doc/devel/coding_guide.rst
trunk/matplotlib/doc/users/artists.rst
trunk/matplotlib/lib/matplotlib/artist.py
trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py
trunk/matplotlib/lib/matplotlib/finance.py
trunk/matplotlib/lib/matplotlib/patches.py
Added Paths:
-----------
trunk/matplotlib/doc/_static/favicon.ico
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/CHANGELOG 2010-03-03 21:06:01 UTC (rev 8176)
@@ -1,3 +1,26 @@
+2010-03-03 Manually brought in commits from branch via diff/patch (svnmerge is broken)
+
+ ------------------------------------------------------------------------
+ r8175 | leejjoon | 2010-03-03 10:03:30 -0800 (Wed, 03 Mar 2010) | 1 line
+
+ fix arguments of allow_rasterization.draw_wrapper
+ ------------------------------------------------------------------------
+ r8174 | jdh2358 | 2010-03-03 09:15:58 -0800 (Wed, 03 Mar 2010) | 1 line
+
+ added support for favicon in docs build
+ ------------------------------------------------------------------------
+ r8173 | jdh2358 | 2010-03-03 08:56:16 -0800 (Wed, 03 Mar 2010) | 1 line
+
+ applied Mattias get_bounds patch
+ ------------------------------------------------------------------------
+ r8172 | jdh2358 | 2010-03-03 08:31:42 -0800 (Wed, 03 Mar 2010) | 1 line
+
+ fix svnmerge download instructions
+ ------------------------------------------------------------------------
+ r8171 | jdh2358 | 2010-03-03 07:47:48 -0800 (Wed, 03 Mar 2010) | 1 line
+
+
+
2010-02-25 add annotation_demo3.py that demonstrates new functionality. -JJL
2010-02-25 refactor Annotation to support arbitrary Transform as xycoords
Added: trunk/matplotlib/doc/_static/favicon.ico
===================================================================
(Binary files differ)
Property changes on: trunk/matplotlib/doc/_static/favicon.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2010-03-03 21:06:01 UTC (rev 8176)
@@ -9,11 +9,11 @@
pathto('users/installing') }}">installing</a>
</p>
-<p>Sandro Tosi has a new book
-<a href="http://www.packtpub.com/matplotlib-python-development/book">Matplotlib for python
-developers</a>
-also
-at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
+<p>Sandro Tosi has a new book
+ <a href="http://www.packtpub.com/matplotlib-python-development/book?utm_source=matplotlib.sourceforge.net&utm_medium=link&utm_content=pod&utm_campaign=mdb_002124">Matplotlib for python
+ developers</a>
+ also
+ at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
<p>Build websites like matplotlib's,
with <a href="http://sphinx.pocoo.org/">sphinx</a> and extensions for
Modified: trunk/matplotlib/doc/_templates/layout.html
===================================================================
--- trunk/matplotlib/doc/_templates/layout.html 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/_templates/layout.html 2010-03-03 21:06:01 UTC (rev 8176)
@@ -23,8 +23,8 @@
</script>
<object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
<!-- End Piwik Tag -->
+<link rel="shortcut icon" href="_static/favicon.ico">
-
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
<a href="{{ pathto('index') }}"><img src="{{
pathto("_static/logo2.png", 1) }}" border="0" alt="matplotlib"/></a>
Modified: trunk/matplotlib/doc/devel/coding_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/coding_guide.rst 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/devel/coding_guide.rst 2010-03-03 21:06:01 UTC (rev 8176)
@@ -82,8 +82,8 @@
* install ``svnmerge.py`` in your PATH::
- > wget http://svn.collab.net/repos/svn/trunk/contrib/client-side/\
- svnmerge/svnmerge.py
+ > wget http://svn.apache.org/repos/asf/subversion/trunk/contrib/\
+ client-side/svnmerge/svnmerge.py
* get a svn checkout of the branch you'll be making bugfixes to and
the trunk (see above)
Modified: trunk/matplotlib/doc/users/artists.rst
===================================================================
--- trunk/matplotlib/doc/users/artists.rst 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/doc/users/artists.rst 2010-03-03 21:06:01 UTC (rev 8176)
@@ -419,7 +419,7 @@
# and notice that the ax.add_patch method has set the axes
# instance
In [267]: print rect.get_axes()
- Subplot(49,81.25)
+ Axes(0.125,0.1;0.775x0.8)
# and the transformation has been set too
In [268]: print rect.get_transform()
@@ -434,7 +434,7 @@
(0.0, 1.0)
# but the data limits have been updated to encompass the rectangle
- In [271]: print ax.dataLim.get_bounds()
+ In [271]: print ax.dataLim.bounds
(1.0, 1.0, 5.0, 12.0)
# we can manually invoke the auto-scaling machinery
Modified: trunk/matplotlib/lib/matplotlib/artist.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/artist.py 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/artist.py 2010-03-03 21:06:01 UTC (rev 8176)
@@ -50,9 +50,9 @@
renderer.stop_rasterizing()
# the axes class has a second argument inframe for its draw method.
- def draw_wrapper(artist, renderer, *kl):
+ def draw_wrapper(artist, renderer, *args, **kwargs):
before(artist, renderer)
- draw(artist, renderer, *kl)
+ draw(artist, renderer, *args, **kwargs)
after(artist, renderer)
# "safe wrapping" to exactly replicate anything we haven't overridden above
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wxagg.py 2010-03-03 21:06:01 UTC (rev 8176)
@@ -171,7 +171,7 @@
"""
Convert the region of a wx.Image bounded by bbox to a wx.Bitmap.
"""
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
r = l + width
t = b + height
@@ -238,7 +238,7 @@
Note: agg must be a backend_agg.RendererAgg instance.
"""
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
r = l + width
t = b + height
Modified: trunk/matplotlib/lib/matplotlib/finance.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/finance.py 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/finance.py 2010-03-03 21:06:01 UTC (rev 8176)
@@ -597,8 +597,8 @@
maxy = max([volume for d, open, close, high, low, volume in quotes])
corners = (minpy, miny), (maxx, maxy)
ax.update_datalim(corners)
- #print 'datalim', ax.dataLim.get_bounds()
- #print 'viewlim', ax.viewLim.get_bounds()
+ #print 'datalim', ax.dataLim.bounds
+ #print 'viewlim', ax.viewLim.bounds
ax.add_collection(barCollection)
ax.autoscale_view()
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py 2010-03-03 18:03:30 UTC (rev 8175)
+++ trunk/matplotlib/lib/matplotlib/patches.py 2010-03-03 21:06:01 UTC (rev 8176)
@@ -1414,12 +1414,12 @@
pad = props.pop('pad', 4)
pad = renderer.points_to_pixels(pad)
bbox = artist.get_window_extent(renderer)
- l,b,w,h = bbox.bounds
- l-=pad/2.
- b-=pad/2.
- w+=pad
- h+=pad
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ l -= pad/2.
+ b -= pad/2.
+ w += pad
+ h += pad
+ r = Rectangle(xy=(l, b),
width=w,
height=h,
fill=fill,
@@ -1438,8 +1438,8 @@
to test whether the artist is returning the correct bbox.
"""
- l,b,w,h = bbox.get_bounds()
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ r = Rectangle(xy=(l, b),
width=w,
height=h,
edgecolor=color,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-03 18:03:37
|
Revision: 8175
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8175&view=rev
Author: leejjoon
Date: 2010-03-03 18:03:30 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
fix arguments of allow_rasterization.draw_wrapper
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/artist.py
Modified: branches/v0_99_maint/lib/matplotlib/artist.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/artist.py 2010-03-03 17:15:58 UTC (rev 8174)
+++ branches/v0_99_maint/lib/matplotlib/artist.py 2010-03-03 18:03:30 UTC (rev 8175)
@@ -41,9 +41,9 @@
renderer.stop_rasterizing()
# the axes class has a second argument inframe for its draw method.
- def draw_wrapper(artist, renderer, *kl):
+ def draw_wrapper(artist, renderer, *args, **kwargs):
before(artist, renderer)
- draw(artist, renderer, *kl)
+ draw(artist, renderer, *args, **kwargs)
after(artist, renderer)
# "safe wrapping" to exactly replicate anything we haven't overridden above
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-03 17:16:04
|
Revision: 8174
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8174&view=rev
Author: jdh2358
Date: 2010-03-03 17:15:58 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
added support for favicon in docs build
Modified Paths:
--------------
branches/v0_99_maint/doc/_templates/indexsidebar.html
branches/v0_99_maint/doc/_templates/layout.html
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html 2010-03-03 16:56:16 UTC (rev 8173)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html 2010-03-03 17:15:58 UTC (rev 8174)
@@ -9,7 +9,7 @@
</p>
<p>Sandro Tosi has a new book
-<a href="http://www.packtpub.com/matplotlib-python-development/book">Matplotlib for python
+<a href="http://www.packtpub.com/matplotlib-python-development/book?utm_source=matplotlib.sourceforge.net&utm_medium=link&utm_content=pod&utm_campaign=mdb_002124">Matplotlib for python
developers</a>
also
at <a href="http://www.amazon.com/Matplotlib-Python-Developers-Sandro-Tosi/dp/1847197906">amazon</a>.</p>
Modified: branches/v0_99_maint/doc/_templates/layout.html
===================================================================
--- branches/v0_99_maint/doc/_templates/layout.html 2010-03-03 16:56:16 UTC (rev 8173)
+++ branches/v0_99_maint/doc/_templates/layout.html 2010-03-03 17:15:58 UTC (rev 8174)
@@ -23,7 +23,7 @@
</script>
<object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
<!-- End Piwik Tag -->
-<link rel="shortcut icon" href="favicon.ico">
+<link rel="shortcut icon" href="_static/favicon.ico">
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
<a href="{{ pathto('index') }}"><img src="{{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-03 16:56:31
|
Revision: 8173
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8173&view=rev
Author: jdh2358
Date: 2010-03-03 16:56:16 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
applied Mattias get_bounds patch
Modified Paths:
--------------
branches/v0_99_maint/doc/users/artists.rst
branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py
branches/v0_99_maint/lib/matplotlib/finance.py
branches/v0_99_maint/lib/matplotlib/patches.py
Modified: branches/v0_99_maint/doc/users/artists.rst
===================================================================
--- branches/v0_99_maint/doc/users/artists.rst 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/doc/users/artists.rst 2010-03-03 16:56:16 UTC (rev 8173)
@@ -419,7 +419,7 @@
# and notice that the ax.add_patch method has set the axes
# instance
In [267]: print rect.get_axes()
- Subplot(49,81.25)
+ Axes(0.125,0.1;0.775x0.8)
# and the transformation has been set too
In [268]: print rect.get_transform()
@@ -434,7 +434,7 @@
(0.0, 1.0)
# but the data limits have been updated to encompass the rectangle
- In [271]: print ax.dataLim.get_bounds()
+ In [271]: print ax.dataLim.bounds
(1.0, 1.0, 5.0, 12.0)
# we can manually invoke the auto-scaling machinery
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py 2010-03-03 16:56:16 UTC (rev 8173)
@@ -171,7 +171,7 @@
"""
Convert the region of a wx.Image bounded by bbox to a wx.Bitmap.
"""
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
r = l + width
t = b + height
@@ -238,7 +238,7 @@
Note: agg must be a backend_agg.RendererAgg instance.
"""
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
r = l + width
t = b + height
Modified: branches/v0_99_maint/lib/matplotlib/finance.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/finance.py 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/finance.py 2010-03-03 16:56:16 UTC (rev 8173)
@@ -597,8 +597,8 @@
maxy = max([volume for d, open, close, high, low, volume in quotes])
corners = (minpy, miny), (maxx, maxy)
ax.update_datalim(corners)
- #print 'datalim', ax.dataLim.get_bounds()
- #print 'viewlim', ax.viewLim.get_bounds()
+ #print 'datalim', ax.dataLim.bounds
+ #print 'viewlim', ax.viewLim.bounds
ax.add_collection(barCollection)
ax.autoscale_view()
Modified: branches/v0_99_maint/lib/matplotlib/patches.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/patches.py 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/patches.py 2010-03-03 16:56:16 UTC (rev 8173)
@@ -1383,12 +1383,12 @@
pad = props.pop('pad', 4)
pad = renderer.points_to_pixels(pad)
bbox = artist.get_window_extent(renderer)
- l,b,w,h = bbox.bounds
- l-=pad/2.
- b-=pad/2.
- w+=pad
- h+=pad
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ l -= pad/2.
+ b -= pad/2.
+ w += pad
+ h += pad
+ r = Rectangle(xy=(l, b),
width=w,
height=h,
fill=fill,
@@ -1407,8 +1407,8 @@
to test whether the artist is returning the correct bbox.
"""
- l,b,w,h = bbox.get_bounds()
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ r = Rectangle(xy=(l, b),
width=w,
height=h,
edgecolor=color,
@@ -3174,7 +3174,7 @@
cos_t, sin_t = get_cos_sin(x1, y1, x0, y0)
verticesA, codesA = self._get_bracket(x0, y0, cos_t, sin_t,
self.widthA*scaleA,
- self.legnthA*scaleA)
+ self.lengthA*scaleA)
vertices_list.append(verticesA)
codes_list.append(codesA)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-03 16:31:48
|
Revision: 8172
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8172&view=rev
Author: jdh2358
Date: 2010-03-03 16:31:42 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
fix svnmerge download instructions
Modified Paths:
--------------
branches/v0_99_maint/doc/devel/coding_guide.rst
Modified: branches/v0_99_maint/doc/devel/coding_guide.rst
===================================================================
--- branches/v0_99_maint/doc/devel/coding_guide.rst 2010-03-03 15:47:48 UTC (rev 8171)
+++ branches/v0_99_maint/doc/devel/coding_guide.rst 2010-03-03 16:31:42 UTC (rev 8172)
@@ -75,8 +75,8 @@
* install ``svnmerge.py`` in your PATH::
- > wget http://svn.collab.net/repos/svn/trunk/contrib/client-side/\
- svnmerge/svnmerge.py
+ > wget http://svn.apache.org/repos/asf/subversion/trunk/contrib/\
+ client-side/svnmerge/svnmerge.py
* get a svn checkout of the branch you'll be making bugfixes to and
the trunk (see above)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-03 15:47:55
|
Revision: 8171
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8171&view=rev
Author: jdh2358
Date: 2010-03-03 15:47:48 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
added favicon
Modified Paths:
--------------
branches/v0_99_maint/doc/_templates/layout.html
Added Paths:
-----------
branches/v0_99_maint/doc/_static/favicon.ico
Added: branches/v0_99_maint/doc/_static/favicon.ico
===================================================================
(Binary files differ)
Property changes on: branches/v0_99_maint/doc/_static/favicon.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: branches/v0_99_maint/doc/_templates/layout.html
===================================================================
--- branches/v0_99_maint/doc/_templates/layout.html 2010-03-02 13:12:16 UTC (rev 8170)
+++ branches/v0_99_maint/doc/_templates/layout.html 2010-03-03 15:47:48 UTC (rev 8171)
@@ -23,8 +23,8 @@
</script>
<object><noscript><p><img src="http://apps.sourceforge.net/piwik/matplotlib/piwik.php?idsite=1" alt="piwik"/></p></noscript></object>
<!-- End Piwik Tag -->
+<link rel="shortcut icon" href="favicon.ico">
-
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px">
<a href="{{ pathto('index') }}"><img src="{{
pathto("_static/logo2.png", 1) }}" border="0" alt="matplotlib"/></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-02 13:12:23
|
Revision: 8170
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8170&view=rev
Author: jdh2358
Date: 2010-03-02 13:12:16 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
fixed invalidx bug in Line2D get_xydata
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/lines.py
Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py 2010-03-02 02:42:58 UTC (rev 8169)
+++ trunk/matplotlib/lib/matplotlib/lines.py 2010-03-02 13:12:16 UTC (rev 8170)
@@ -659,7 +659,7 @@
"""
Return the *xy* data as a Nx2 numpy array.
"""
- if self._invalidy or self.invalidx:
+ if self._invalidy or self._invalidx:
self.recache()
return self._xy
@@ -831,7 +831,7 @@
def set_markerfacecolor(self, fc):
"""
- Set the marker face color.
+ Set the marker face color.
ACCEPTS: any matplotlib color
"""
@@ -842,7 +842,7 @@
def set_markerfacecoloralt(self, fc):
"""
- Set the alternate marker face color.
+ Set the alternate marker face color.
ACCEPTS: any matplotlib color
"""
@@ -1020,7 +1020,7 @@
path, path_trans, rgbFace)
transform = transform.rotate_deg(180.)
renderer.draw_markers(gc, righthalf, transform,
- path, path_trans, rgbFace_alt)
+ path, path_trans, rgbFace_alt)
_draw_pixel_transform = Affine2D().translate(-0.5, -0.5)
@@ -1041,7 +1041,7 @@
rgbFace = self._get_rgb_face()
fs = self.get_fillstyle()
if fs=='full':
- renderer.draw_markers(gc, Path.unit_circle(), transform,
+ renderer.draw_markers(gc, Path.unit_circle(), transform,
path, path_trans, rgbFace)
else:
rgbFace_alt = self._get_rgb_face(alt=True)
@@ -1118,8 +1118,8 @@
path, path_trans, rgbFace)
renderer.draw_markers(gc, mpath_alt, transform,
path, path_trans, rgbFace_alt)
-
+
def _draw_triangle_up(self, renderer, gc, path, path_trans):
self._draw_triangle(renderer, gc, path, path_trans, 'up')
@@ -1190,8 +1190,8 @@
path, path_trans, rgbFace)
renderer.draw_markers(gc, left, transform,
path, path_trans, rgbFace_alt)
-
+
def _draw_thin_diamond(self, renderer, gc, path, path_trans):
gc.set_snap(renderer.points_to_pixels(self._markersize) >= 3.0)
offset = renderer.points_to_pixels(self._markersize)
@@ -1238,7 +1238,7 @@
path, path_trans, rgbFace)
else:
verts = polypath.vertices
-
+
y = (1+np.sqrt(5))/4.
top = Path([verts[0], verts[1], verts[4], verts[0]])
bottom = Path([verts[1], verts[2], verts[3], verts[4], verts[1]])
@@ -1299,7 +1299,7 @@
def _draw_hexagon1(self, renderer, gc, path, path_trans):
- gc.set_snap(renderer.points_to_pixels(self._markersize) >= 5.0)
+ gc.set_snap(renderer.points_to_pixels(self._markersize) >= 5.0)
offset = 0.5 * renderer.points_to_pixels(self._markersize)
transform = Affine2D().scale(offset)
@@ -1338,7 +1338,7 @@
def _draw_hexagon2(self, renderer, gc, path, path_trans):
- gc.set_snap(renderer.points_to_pixels(self._markersize) >= 5.0)
+ gc.set_snap(renderer.points_to_pixels(self._markersize) >= 5.0)
offset = 0.5 * renderer.points_to_pixels(self._markersize)
transform = Affine2D().scale(offset).rotate_deg(30)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-02 02:43:04
|
Revision: 8169
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8169&view=rev
Author: leejjoon
Date: 2010-03-02 02:42:58 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
add doc/mpl_toolkits/axes_grid/figures/simple_axis_pad.py and deleted unsed simple_axis_direction02.py
Added Paths:
-----------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_pad.py
Removed Paths:
-------------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py
Deleted: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py 2010-03-02 02:24:34 UTC (rev 8168)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py 2010-03-02 02:42:58 UTC (rev 8169)
@@ -1,21 +0,0 @@
-
-import matplotlib.pyplot as plt
-import mpl_toolkits.axes_grid.axislines as axislines
-
-def setup_axes(fig, rect):
- ax = axislines.Subplot(fig, rect)
- fig.add_subplot(ax)
-
- ax.set_yticks([0.2, 0.8])
- ax.set_xticks([0.2, 0.8])
-
- return ax
-
-fig = plt.figure(1, figsize=(4, 2))
-ax = setup_axes(fig, "111")
-
-ax.axis[:].major_ticks.set_tick_out(True)
-
-plt.show()
-
-
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_pad.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_pad.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_pad.py 2010-03-02 02:42:58 UTC (rev 8169)
@@ -0,0 +1,112 @@
+
+
+import numpy as np
+import mpl_toolkits.axes_grid.angle_helper as angle_helper
+import mpl_toolkits.axes_grid.grid_finder as grid_finder
+from matplotlib.projections import PolarAxes
+from matplotlib.transforms import Affine2D
+
+import mpl_toolkits.axes_grid.axislines as axislines
+
+from mpl_toolkits.axes_grid.grid_helper_curvelinear import GridHelperCurveLinear
+
+
+def setup_axes(fig, rect):
+ """
+ polar projection, but in a rectangular box.
+ """
+
+ # see demo_curvelinear_grid.py for details
+ tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform()
+
+ extreme_finder = angle_helper.ExtremeFinderCycle(20, 20,
+ lon_cycle = 360,
+ lat_cycle = None,
+ lon_minmax = None,
+ lat_minmax = (0, np.inf),
+ )
+
+ grid_locator1 = angle_helper.LocatorDMS(12)
+ grid_locator2 = grid_finder.MaxNLocator(5)
+
+ tick_formatter1 = angle_helper.FormatterDMS()
+
+ grid_helper = GridHelperCurveLinear(tr,
+ extreme_finder=extreme_finder,
+ grid_locator1=grid_locator1,
+ grid_locator2=grid_locator2,
+ tick_formatter1=tick_formatter1
+ )
+
+
+ ax1 = axislines.Subplot(fig, rect, grid_helper=grid_helper)
+ #ax1.axis[:].toggle(all=False)
+ ax1.axis[:].set_visible(False)
+
+ fig.add_subplot(ax1)
+
+ ax1.set_aspect(1.)
+ ax1.set_xlim(-5, 12)
+ ax1.set_ylim(-5, 10)
+
+ #ax1.grid(True)
+
+ return ax1
+
+
+def add_floating_axis1(ax1):
+ ax1.axis["lat"] = axis = ax1.new_floating_axis(0, 30)
+ axis.label.set_text(r"$\theta = 30^{\circ}$")
+ axis.label.set_visible(True)
+
+ return axis
+
+
+def add_floating_axis2(ax1):
+ ax1.axis["lon"] = axis = ax1.new_floating_axis(1, 6)
+ axis.label.set_text(r"$r = 6$")
+ axis.label.set_visible(True)
+
+ return axis
+
+
+import matplotlib.pyplot as plt
+fig = plt.figure(1, figsize=(9, 3.))
+fig.clf()
+fig.subplots_adjust(left=0.01, right=0.99, bottom=0.01, top=0.99,
+ wspace=0.01, hspace=0.01)
+
+
+def ann(ax1, d):
+ if plt.rcParams["text.usetex"]:
+ d = d.replace("_", r"\_")
+
+ ax1.annotate(d, (0.5, 1), (5, -5),
+ xycoords="axes fraction", textcoords="offset points",
+ va="top", ha="center")
+
+ax1 = setup_axes(fig, rect=141)
+axis = add_floating_axis1(ax1)
+ann(ax1, r"default")
+
+ax1 = setup_axes(fig, rect=142)
+axis = add_floating_axis1(ax1)
+axis.major_ticklabels.set_pad(10)
+ann(ax1, r"ticklabels.set_pad(10)")
+
+ax1 = setup_axes(fig, rect=143)
+axis = add_floating_axis1(ax1)
+axis.label.set_pad(20)
+ann(ax1, r"label.set_pad(20)")
+
+ax1 = setup_axes(fig, rect=144)
+axis = add_floating_axis1(ax1)
+axis.major_ticks.set_tick_out(True)
+ann(ax1, "ticks.set_tick_out(True)")
+
+
+#ax1.axis["bottom"].toggle(all=True)
+
+plt.show()
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-02 02:24:40
|
Revision: 8168
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8168&view=rev
Author: jdh2358
Date: 2010-03-02 02:24:34 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
fix alt kwarg for set_mfc
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/lines.py
Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py 2010-03-02 01:47:54 UTC (rev 8167)
+++ trunk/matplotlib/lib/matplotlib/lines.py 2010-03-02 02:24:34 UTC (rev 8168)
@@ -1586,7 +1586,7 @@
def set_mfc(self, val):
'alias for set_markerfacecolor'
- self.set_markerfacecolor(val, alt=alt)
+ self.set_markerfacecolor(val)
def set_mfcalt(self, val):
'alias for set_markerfacecoloralt'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-02 01:48:00
|
Revision: 8167
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8167&view=rev
Author: leejjoon
Date: 2010-03-02 01:47:54 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
add AxisArtist.invert_ticklabel_direction and fix axis label padding in axes_grid
Modified Paths:
--------------
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axis_artist.py
trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axis_artist.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axis_artist.py 2010-03-02 01:47:48 UTC (rev 8166)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axis_artist.py 2010-03-02 01:47:54 UTC (rev 8167)
@@ -389,6 +389,13 @@
def _get_offset_radius(self):
return self._offset_radius
+
+ _get_opposite_direction = {"left":"right",
+ "right":"left",
+ "top":"bottom",
+ "bottom":"top"}.__getitem__
+
+
def _update(self, renderer):
pass
@@ -665,6 +672,11 @@
self.set_default_alignment(label_direction)
self.set_default_angle(label_direction)
+
+ def invert_axis_direction(self):
+ label_direction = self._get_opposite_direction(self._axis_direction)
+ self.set_axis_direction(label_direction)
+
def _get_ticklabels_offsets(self, renderer, label_direction):
"""
Calculates the offsets of the ticklabels from the tick and
@@ -1021,6 +1033,15 @@
else:
self._ticklabel_add_angle = 0
+ def invert_ticklabel_direction(self):
+ self._ticklabel_add_angle = (self._ticklabel_add_angle + 180) % 360
+ self.major_ticklabels.invert_axis_direction()
+ self.minor_ticklabels.invert_axis_direction()
+
+ # def invert_ticks_direction(self):
+ # self.major_ticks.set_tick_out(not self.major_ticks.get_tick_out())
+ # self.minor_ticks.set_tick_out(not self.minor_ticks.get_tick_out())
+
def set_axislabel_direction(self, label_direction):
"""
Adjust the direction of the axislabel.
@@ -1190,9 +1211,10 @@
# set extra pad for major and minor ticklabels:
# use ticksize of majorticks even for minor ticks. not clear what is best.
+ dpi_cor = renderer.points_to_pixels(1.)
if self.major_ticks.get_visible() and self.major_ticks.get_tick_out():
- self.major_ticklabels._set_external_pad(self.major_ticks._ticksize)
- self.minor_ticklabels._set_external_pad(self.major_ticks._ticksize)
+ self.major_ticklabels._set_external_pad(self.major_ticks._ticksize*dpi_cor)
+ self.minor_ticklabels._set_external_pad(self.major_ticks._ticksize*dpi_cor)
else:
self.major_ticklabels._set_external_pad(0)
self.minor_ticklabels._set_external_pad(0)
@@ -1301,9 +1323,20 @@
#pad_points = self.major_tick_pad
- axislabel_pad = max([self.major_ticklabels._axislabel_pad,
- self.minor_ticklabels._axislabel_pad])
+ #print self._ticklabel_add_angle - self._axislabel_add_angle
+ #if abs(self._ticklabel_add_angle - self._axislabel_add_angle)%360 > 90:
+ if self._ticklabel_add_angle != self._axislabel_add_angle:
+ if (self.major_ticks.get_visible() and not self.major_ticks.get_tick_out()) \
+ or \
+ (self.minor_ticks.get_visible() and not self.major_ticks.get_tick_out()):
+ axislabel_pad = self.major_ticks._ticksize
+ else:
+ axislabel_pad = 0
+ else:
+ axislabel_pad = max([self.major_ticklabels._axislabel_pad,
+ self.minor_ticklabels._axislabel_pad])
+
#label_offset = axislabel_pad + self.LABELPAD
#self.label._set_offset_radius(label_offset)
@@ -1341,6 +1374,7 @@
self._draw_line(renderer)
+
self._draw_ticks(renderer)
#self._draw_offsetText(renderer)
Modified: trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py
===================================================================
--- trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py 2010-03-02 01:47:48 UTC (rev 8166)
+++ trunk/matplotlib/lib/mpl_toolkits/axes_grid/axislines.py 2010-03-02 01:47:54 UTC (rev 8167)
@@ -336,11 +336,16 @@
get_label_transform() returns a transform of (transAxes+offset)
"""
loc = self._axis_direction
- angle = dict(left=0,
- right=0,
- bottom=.5*np.pi,
- top=.5*np.pi)[loc]
+ #angle = dict(left=0,
+ # right=0,
+ # bottom=.5*np.pi,
+ # top=.5*np.pi)[loc]
+ if self.nth_coord == 0:
+ angle = 0
+ else:
+ angle = 90
+
_verts = [0.5, 0.5]
fixed_coord = 1-self.nth_coord
@@ -369,6 +374,11 @@
else:
angle_normal, angle_tangent = 0, 90
+ if self.nth_coord == 0:
+ angle_normal, angle_tangent = 90, 0
+ else:
+ angle_normal, angle_tangent = 0, 90
+
#angle = 90 - 90 * self.nth_coord
major = self.axis.major
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-02 01:47:55
|
Revision: 8166
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8166&view=rev
Author: leejjoon
Date: 2010-03-02 01:47:48 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
update axes_grid.axislines doc.
Modified Paths:
--------------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_ticklabel_direction.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst
Added Paths:
-----------
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step01.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step02.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step03.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step04.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction01.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py
trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction03.py
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step01.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step01.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step01.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -0,0 +1,25 @@
+import matplotlib.pyplot as plt
+import mpl_toolkits.axes_grid.axislines as axislines
+
+def setup_axes(fig, rect):
+ ax = axislines.Subplot(fig, rect)
+ fig.add_axes(ax)
+
+ ax.set_ylim(-0.1, 1.5)
+ ax.set_yticks([0, 1])
+
+ ax.axis[:].set_visible(False)
+
+ ax.axis["x"] = ax.new_floating_axis(1, 0.5)
+ ax.axis["x"].set_axisline_style("->", size=1.5)
+
+ return ax
+
+fig = plt.figure(figsize=(3,2.5))
+fig.subplots_adjust(top=0.8)
+ax1 = setup_axes(fig, "111")
+
+ax1.axis["x"].set_axis_direction("left")
+
+
+plt.show()
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step02.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step02.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step02.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -0,0 +1,36 @@
+import matplotlib.pyplot as plt
+import mpl_toolkits.axes_grid.axislines as axislines
+
+def setup_axes(fig, rect):
+ ax = axislines.Subplot(fig, rect)
+ fig.add_axes(ax)
+
+ ax.set_ylim(-0.1, 1.5)
+ ax.set_yticks([0, 1])
+
+ #ax.axis[:].toggle(all=False)
+ #ax.axis[:].line.set_visible(False)
+ ax.axis[:].set_visible(False)
+
+ ax.axis["x"] = ax.new_floating_axis(1, 0.5)
+ ax.axis["x"].set_axisline_style("->", size=1.5)
+
+ return ax
+
+fig = plt.figure(figsize=(6,2.5))
+fig.subplots_adjust(bottom=0.2, top=0.8)
+
+ax1 = setup_axes(fig, "121")
+ax1.axis["x"].set_ticklabel_direction("+")
+ax1.annotate("ticklabel direction=$+$", (0.5, 0), xycoords="axes fraction",
+ xytext=(0, -10), textcoords="offset points",
+ va="top", ha="center")
+
+ax2 = setup_axes(fig, "122")
+ax2.axis["x"].set_ticklabel_direction("-")
+ax2.annotate("ticklabel direction=$-$", (0.5, 0), xycoords="axes fraction",
+ xytext=(0, -10), textcoords="offset points",
+ va="top", ha="center")
+
+
+plt.show()
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step03.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step03.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step03.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -0,0 +1,40 @@
+import matplotlib.pyplot as plt
+import mpl_toolkits.axes_grid.axislines as axislines
+
+def setup_axes(fig, rect):
+ ax = axislines.Subplot(fig, rect)
+ fig.add_axes(ax)
+
+ ax.set_ylim(-0.1, 1.5)
+ ax.set_yticks([0, 1])
+
+ #ax.axis[:].toggle(all=False)
+ #ax.axis[:].line.set_visible(False)
+ ax.axis[:].set_visible(False)
+
+ ax.axis["x"] = ax.new_floating_axis(1, 0.5)
+ ax.axis["x"].set_axisline_style("->", size=1.5)
+
+ return ax
+
+fig = plt.figure(figsize=(6,2.5))
+fig.subplots_adjust(bottom=0.2, top=0.8)
+
+ax1 = setup_axes(fig, "121")
+ax1.axis["x"].label.set_text("Label")
+ax1.axis["x"].toggle(ticklabels=False)
+ax1.axis["x"].set_axislabel_direction("+")
+ax1.annotate("label direction=$+$", (0.5, 0), xycoords="axes fraction",
+ xytext=(0, -10), textcoords="offset points",
+ va="top", ha="center")
+
+ax2 = setup_axes(fig, "122")
+ax2.axis["x"].label.set_text("Label")
+ax2.axis["x"].toggle(ticklabels=False)
+ax2.axis["x"].set_axislabel_direction("-")
+ax2.annotate("label direction=$-$", (0.5, 0), xycoords="axes fraction",
+ xytext=(0, -10), textcoords="offset points",
+ va="top", ha="center")
+
+
+plt.show()
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step04.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step04.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/axis_direction_demo_step04.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -0,0 +1,54 @@
+import matplotlib.pyplot as plt
+import mpl_toolkits.axes_grid.axislines as axislines
+
+def setup_axes(fig, rect):
+ ax = axislines.Subplot(fig, rect)
+ fig.add_axes(ax)
+
+ ax.set_ylim(-0.1, 1.5)
+ ax.set_yticks([0, 1])
+
+ ax.axis[:].set_visible(False)
+
+ ax.axis["x1"] = ax.new_floating_axis(1, 0.3)
+ ax.axis["x1"].set_axisline_style("->", size=1.5)
+
+ ax.axis["x2"] = ax.new_floating_axis(1, 0.7)
+ ax.axis["x2"].set_axisline_style("->", size=1.5)
+
+ return ax
+
+fig = plt.figure(figsize=(6,2.5))
+fig.subplots_adjust(bottom=0.2, top=0.8)
+
+ax1 = setup_axes(fig, "121")
+ax1.axis["x1"].label.set_text("rotation=0")
+ax1.axis["x1"].toggle(ticklabels=False)
+
+ax1.axis["x2"].label.set_text("rotation=10")
+ax1.axis["x2"].label.set_rotation(10)
+ax1.axis["x2"].toggle(ticklabels=False)
+
+ax1.annotate("label direction=$+$", (0.5, 0), xycoords="axes fraction",
+ xytext=(0, -10), textcoords="offset points",
+ va="top", ha="center")
+
+ax2 = setup_axes(fig, "122")
+
+ax2.axis["x1"].set_axislabel_direction("-")
+ax2.axis["x2"].set_axislabel_direction("-")
+
+ax2.axis["x1"].label.set_text("rotation=0")
+ax2.axis["x1"].toggle(ticklabels=False)
+
+ax2.axis["x2"].label.set_text("rotation=10")
+ax2.axis["x2"].label.set_rotation(10)
+ax2.axis["x2"].toggle(ticklabels=False)
+
+
+ax2.annotate("label direction=$-$", (0.5, 0), xycoords="axes fraction",
+ xytext=(0, -10), textcoords="offset points",
+ va="top", ha="center")
+
+
+plt.show()
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_ticklabel_direction.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_ticklabel_direction.py 2010-03-01 15:58:51 UTC (rev 8165)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/demo_ticklabel_direction.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -33,8 +33,8 @@
ax.axis["right"].set_axis_direction("left")
ax.axis["top"].set_axis_direction("bottom")
-ax.axis["left"].major_ticklabels.set_pad(0)
-ax.axis["bottom"].major_ticklabels.set_pad(10)
+#ax.axis["left"].major_ticklabels.set_pad(0)
+#ax.axis["bottom"].major_ticklabels.set_pad(10)
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction01.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction01.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction01.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -0,0 +1,15 @@
+import matplotlib.pyplot as plt
+import mpl_toolkits.axes_grid.axislines as axislines
+
+fig = plt.figure(figsize=(4,2.5))
+ax1 = fig.add_subplot(axislines.Subplot(fig, "111"))
+fig.subplots_adjust(right=0.8)
+
+ax1.axis["left"].major_ticklabels.set_axis_direction("top")
+ax1.axis["left"].label.set_text("Label")
+
+ax1.axis["right"].label.set_visible(True)
+ax1.axis["right"].label.set_text("Label")
+ax1.axis["right"].label.set_axis_direction("left")
+
+plt.show()
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction02.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -0,0 +1,21 @@
+
+import matplotlib.pyplot as plt
+import mpl_toolkits.axes_grid.axislines as axislines
+
+def setup_axes(fig, rect):
+ ax = axislines.Subplot(fig, rect)
+ fig.add_subplot(ax)
+
+ ax.set_yticks([0.2, 0.8])
+ ax.set_xticks([0.2, 0.8])
+
+ return ax
+
+fig = plt.figure(1, figsize=(4, 2))
+ax = setup_axes(fig, "111")
+
+ax.axis[:].major_ticks.set_tick_out(True)
+
+plt.show()
+
+
Added: trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction03.py
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction03.py (rev 0)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/figures/simple_axis_direction03.py 2010-03-02 01:47:48 UTC (rev 8166)
@@ -0,0 +1,31 @@
+
+import matplotlib.pyplot as plt
+import mpl_toolkits.axes_grid.axislines as axislines
+
+def setup_axes(fig, rect):
+ ax = axislines.Subplot(fig, rect)
+ fig.add_subplot(ax)
+
+ ax.set_yticks([0.2, 0.8])
+ ax.set_xticks([0.2, 0.8])
+
+ return ax
+
+fig = plt.figure(1, figsize=(5, 2))
+fig.subplots_adjust(wspace=0.4, bottom=0.3)
+
+ax1 = setup_axes(fig, "121")
+ax1.set_xlabel("X-label")
+ax1.set_ylabel("Y-label")
+
+ax1.axis[:].invert_ticklabel_direction()
+
+ax2 = setup_axes(fig, "122")
+ax2.set_xlabel("X-label")
+ax2.set_ylabel("Y-label")
+
+ax2.axis[:].major_ticks.set_tick_out(True)
+
+plt.show()
+
+
Modified: trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst
===================================================================
--- trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst 2010-03-01 15:58:51 UTC (rev 8165)
+++ trunk/matplotlib/doc/mpl_toolkits/axes_grid/users/axislines.rst 2010-03-02 01:47:48 UTC (rev 8166)
@@ -102,7 +102,52 @@
The ticklabels and axislabel of the top and the right axis are set to
not visible.
+For example, if you want to change the color attributes of
+major_ticklabels of the bottom x-axis ::
+ ax.axis["bottom"].major_ticklabels.set_color("b")
+
+Similarly, to make ticklabels invisible ::
+
+ ax.axis["bottom"].major_ticklabels.set_visible(False)
+
+AxisAritst provides a helper method to control the visibility of ticks, ticklabels, and label. To make ticklabel invisible, ::
+
+ ax.axis["bottom"].toggle(ticklabels=False)
+
+To make all of ticks, ticklabels, and (axis) label invisible ::
+
+ ax.axis["bottom"].toggle(all=False)
+
+To turn all off but ticks on ::
+
+ ax.axis["bottom"].toggle(all=False, ticks=True)
+
+To turn all on but (axis) label off ::
+
+ ax.axis["bottom"].toggle(all=True, label=False))
+
+
+ax.axis's __getitem__ method can take multiple axis names. For
+example, to turn ticklabels of "top" and "right" axis on, ::
+
+ ax.axis["top","right"].toggle(ticklabels=True))
+
+Note that 'ax.axis["top","right"]' returns a simple proxy object that translate above code to something like below. ::
+
+ for n in ["top","right"]:
+ ax.axis[n].toggle(ticklabels=True))
+
+So, any return values in the for loop are ignored. And you shoud not
+use it anything more than a simple method.
+
+Like the list indexing ":" means all items, i.e., ::
+
+ ax.axis[:].major_ticks.set_color("r")
+
+changes tick color in all axis.
+
+
HowTo
=====
@@ -138,25 +183,149 @@
To change the pad between ticklabels and axis label,
axis.label.set_pad method.
-Examples
-========
-Adjusting axis_direction
-------------------------
+Rotaion and Alignment of TickLabels
+===================================
+This is also quite different from the original mpl and can be
+confusing. When you want to rotate the ticklabels, first consider
+using "set_axis_direction" method. ::
+
+ ax1.axis["left"].major_ticklabels.set_axis_direction("top")
+ ax1.axis["right"].label.set_axis_direction("left")
+
+.. plot:: mpl_toolkits/axes_grid/figures/simple_axis_direction01.py
+
+The parameter for set_axis_direction is one of ["left", "right",
+"bottom", "top"].
+
+You must understand some underlying concept of directions.
+
+ 1. There is a reference direction which is defined as the direction
+ of the axis line with increasing coordinate. For example, the
+ reference direction of the left x-axis is from bottom to top.
+
+ .. plot:: mpl_toolkits/axes_grid/figures/axis_direction_demo_step01.py
+
+ The direction, text angle, and alignments of the ticks, ticklabels and
+ axis-label is determined width respect to the reference direction
+
+ 2. *ticklabel_direction* is either the right-hand side (+) of the
+ reference direction or the left-hand side (-).
+
+ .. plot:: mpl_toolkits/axes_grid/figures/axis_direction_demo_step02.py
+
+ 3. same for the *label_direction*
+
+ .. plot:: mpl_toolkits/axes_grid/figures/axis_direction_demo_step03.py
+
+ 4. ticks are by default drawn toward the opposite direction of the ticklabels.
+
+ 5. text rotation of ticklabels and label is determined in reference
+ to the *ticklabel_direction* or *label_direction*,
+ respectively. The rotation of ticklabels and tlabel is anchored.
+
+ .. plot:: mpl_toolkits/axes_grid/figures/axis_direction_demo_step04.py
+
+
+On the other hand, there is a concept of "axis_direction". This is a
+default setting of above properties for each, "bottom", "left", "top",
+and "right" axis.
+
+ ========== =========== ========= ========== ========= ==========
+ ? ? left bottom right top
+ ---------- ----------- --------- ---------- --------- ----------
+ axislabel direction '-' '+' '+' '-'
+ axislabel rotation 180 0 0 180
+ axislabel va center top center bottom
+ axislabel ha right center right center
+ ticklabel direction '-' '+' '+' '-'
+ ticklabels rotation 90 0 -90 180
+ ticklabel ha right center right center
+ ticklabel va center baseline center baseline
+ ========== =========== ========= ========== ========= ==========
+
+
+And, 'set_axis_direction("top")' means to adjust the text rotation
+etc, for settings suitable for "top" axis. The concept of axis
+direction can be more clear with curved axis.
+
.. plot:: mpl_toolkits/axes_grid/figures/demo_axis_direction.py
+The axis_drection can be adjusted in the AxisArtist level, or in the
+level of its child arists, i.e., ticks, ticklabels, and axis-label. ::
+
+ ax1.axis["left"].set_axis_direction("top")
+
+changes axis_direction of all the associated artist with the "left"
+axis, while ::
+
+ ax1.axis["left"].major_ticklabels.set_axis_direction("top")
+
+changes the axis_direction of only the major_ticklabels. Note that
+set_axis_direction in the AxisArtist level changes the
+ticklabel_direction and label_direction, while chainging the
+axis_direction of ticks, ticklabels, and axis-label does not affect
+them.
+
+
+If you want to make ticks outward and ticklabels inside the axes,
+use invert_ticklabel_direction method. ::
+
+ ax.axis[:].invert_ticklabel_direction()
+
+A related method is "set_tick_out". It makes ticks outward (as a
+matter of fact, it makes ticks toward the opposite direction of the
+default direction). ::
+
+ ax.axis[:].major_ticks.set_tick_out(True)
+
+.. plot:: mpl_toolkits/axes_grid/figures/simple_axis_direction03.py
+
+
+So, in summary,
+
+ * AxisArtist's methods
+ * set_axis_direction : "left", "right", "bottom", or "top"
+ * set_ticklabel_direction : "+" or "-"
+ * set_axislabel_direction : "+" or "-"
+ * invert_ticklabel_direction
+ * Ticks' methods (major_ticks and minor_ticks)
+ * set_tick_out : True or False
+ * set_ticksize : size in points
+ * TickLabels' methods (major_ticklabels and minor_ticklabels)
+ * set_axis_direction : "left", "right", "bottom", or "top"
+ * set_rotation : angle with respect to the renference direction
+ * set_ha and set_va : see below
+ * AxisLabels' methods (label)
+ * set_axis_direction : "left", "right", "bottom", or "top"
+ * set_rotation : angle with respect to the renference direction
+ * set_ha and set_va
+
+
+
Adjusting ticklabels alignment
------------------------------
+Alignment of TickLabels are treated specially. See below
+
.. plot:: mpl_toolkits/axes_grid/figures/demo_ticklabel_alignment.py
-Adjusting ticklabels pad
-------------------------
+Adjusting pad
+--------------
-.. plot:: mpl_toolkits/axes_grid/figures/demo_ticklabel_direction.py
+To change the pad between ticks and ticklabels ::
+ ax.axis["left"].major_ticklabels.set_pad(10)
+Or ticklabels and axis-label ::
+
+ ax.axis["left"].label.set_pad(10)
+
+
+.. plot:: mpl_toolkits/axes_grid/figures/simple_axis_pad.py
+
+
GridHelper
==========
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2010-03-01 15:58:58
|
Revision: 8165
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8165&view=rev
Author: jswhit
Date: 2010-03-01 15:58:51 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
update for geos-3.2.0
Modified Paths:
--------------
trunk/toolkits/basemap/MANIFEST.in
trunk/toolkits/basemap/README
trunk/toolkits/basemap/doc/users/installing.rst
Removed Paths:
-------------
trunk/toolkits/basemap/geos-3.1.1/
Modified: trunk/toolkits/basemap/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap/MANIFEST.in 2010-03-01 15:51:19 UTC (rev 8164)
+++ trunk/toolkits/basemap/MANIFEST.in 2010-03-01 15:58:51 UTC (rev 8165)
@@ -94,7 +94,7 @@
include doc/make.py
include doc/conf.py
include doc/index.rst
-recursive-include geos-3.1.1 *
+recursive-include geos-3.2.0 *
recursive-include lib/dap *
recursive-include lib/httplib2 *
recursive-include lib/dbflib *
Modified: trunk/toolkits/basemap/README
===================================================================
--- trunk/toolkits/basemap/README 2010-03-01 15:51:19 UTC (rev 8164)
+++ trunk/toolkits/basemap/README 2010-03-01 15:58:51 UTC (rev 8165)
@@ -12,7 +12,7 @@
numpy 1.1 (or higher)
The GEOS (Geometry Engine - Open Source) library (version 3.1.1 or higher).
-Source code is included in the geos-3.1.1 directory.
+Source code is included in the geos-3.2.0 directory.
PIL (http://pythonware.com/products/pil) is optional (only
needed for Basemap warpimage and bluemarble methods).
Modified: trunk/toolkits/basemap/doc/users/installing.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/installing.rst 2010-03-01 15:51:19 UTC (rev 8164)
+++ trunk/toolkits/basemap/doc/users/installing.rst 2010-03-01 15:58:51 UTC (rev 8165)
@@ -24,7 +24,7 @@
**Required libraries that ship with basemap**
`GEOS <http://trac.osgeo.org/geos/>`__ (Geometry Engine - Open Source) library 3.1.1 or later.
- Source code is included in the geos-3.1.1 directory.
+ Source code is included in the geos-3.2.0 directory.
When building from source, must be built and installed separately
from basemap (see build instructions below).
Included in Windows binary installers.
@@ -75,7 +75,7 @@
Then go to next step. If you don't have it, you can build it from
the source code included with basemap by following these steps::
- cd geos-3.1.1
+ cd geos-3.2.0
export GEOS_DIR=<where you want the libs and headers to go>
# A reasonable choice on a Unix-like system is /usr/local, or
# if you don't have permission to write there, your home directory.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2010-03-01 15:51:43
|
Revision: 8164
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8164&view=rev
Author: jswhit
Date: 2010-03-01 15:51:19 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
add geos-3.2.0
Added Paths:
-----------
trunk/toolkits/basemap/geos-3.2.0/
trunk/toolkits/basemap/geos-3.2.0/AUTHORS
trunk/toolkits/basemap/geos-3.2.0/COPYING
trunk/toolkits/basemap/geos-3.2.0/ChangeLog
trunk/toolkits/basemap/geos-3.2.0/INSTALL
trunk/toolkits/basemap/geos-3.2.0/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/NEWS
trunk/toolkits/basemap/geos-3.2.0/README
trunk/toolkits/basemap/geos-3.2.0/TODO
trunk/toolkits/basemap/geos-3.2.0/aclocal.m4
trunk/toolkits/basemap/geos-3.2.0/acsite.m4
trunk/toolkits/basemap/geos-3.2.0/autogen.bat
trunk/toolkits/basemap/geos-3.2.0/build/
trunk/toolkits/basemap/geos-3.2.0/build/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/README
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/README
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos.sln
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_c_dll/
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_c_dll/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_c_dll/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_c_dll/geos_c_dll.vcxproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_c_dll/geos_c_dll.vcxproj.filters
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_lib/
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_lib/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_lib/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_lib/geos_lib.vcxproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_lib/geos_lib.vcxproj.filters
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_unit/
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_unit/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_unit/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_unit/geos_unit.vcxproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_unit/geos_unit.vcxproj.filters
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_xmltester/
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_xmltester/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_xmltester/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_xmltester/geos_xmltester.vcxproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc10/geos_xmltester/geos_xmltester.vcxproj.filters
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/README
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos.sln
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos.vsprops
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_c_dll/
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_c_dll/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_c_dll/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_c_dll/geos_c_dll.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_lib/
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_lib/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_lib/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_lib/geos_lib.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_python/
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_python/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_python/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_python/geos_python.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_ruby/
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_ruby/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_ruby/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_ruby/geos_ruby.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_unit/
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_unit/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_unit/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_unit/geos_unit.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_xmltester/
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_xmltester/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_xmltester/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc80/geos_xmltester/geos_xmltester.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/README
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos.sln
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos.vsprops
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_c_dll/
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_c_dll/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_c_dll/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_c_dll/geos_c_dll.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_lib/
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_lib/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_lib/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_lib/geos_lib.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_python/
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_python/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_python/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_python/geos_python.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_ruby/
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_ruby/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_ruby/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_ruby/geos_ruby.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_unit/
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_unit/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_unit/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_unit/geos_unit.vcproj
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_xmltester/
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_xmltester/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_xmltester/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/build/msvc90/geos_xmltester/geos_xmltester.vcproj
trunk/toolkits/basemap/geos-3.2.0/capi/
trunk/toolkits/basemap/geos-3.2.0/capi/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/capi/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/capi/geos_c.cpp
trunk/toolkits/basemap/geos-3.2.0/capi/geos_c.h
trunk/toolkits/basemap/geos-3.2.0/capi/geos_c.h.in
trunk/toolkits/basemap/geos-3.2.0/capi/geos_ts_c.cpp
trunk/toolkits/basemap/geos-3.2.0/config.guess
trunk/toolkits/basemap/geos-3.2.0/config.sub
trunk/toolkits/basemap/geos-3.2.0/configure
trunk/toolkits/basemap/geos-3.2.0/configure.in
trunk/toolkits/basemap/geos-3.2.0/depcomp
trunk/toolkits/basemap/geos-3.2.0/doc/
trunk/toolkits/basemap/geos-3.2.0/doc/Doxyfile
trunk/toolkits/basemap/geos-3.2.0/doc/Doxyfile.in
trunk/toolkits/basemap/geos-3.2.0/doc/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/doc/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/doc/README
trunk/toolkits/basemap/geos-3.2.0/doc/example.cpp
trunk/toolkits/basemap/geos-3.2.0/install-sh
trunk/toolkits/basemap/geos-3.2.0/ltmain.sh
trunk/toolkits/basemap/geos-3.2.0/macros/
trunk/toolkits/basemap/geos-3.2.0/macros/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/macros/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/macros/ac_pkg_swig.m4
trunk/toolkits/basemap/geos-3.2.0/macros/ac_python_devel.m4
trunk/toolkits/basemap/geos-3.2.0/macros/geos.m4
trunk/toolkits/basemap/geos-3.2.0/macros/libtool.m4
trunk/toolkits/basemap/geos-3.2.0/macros/ltoptions.m4
trunk/toolkits/basemap/geos-3.2.0/macros/ltsugar.m4
trunk/toolkits/basemap/geos-3.2.0/macros/ltversion.m4
trunk/toolkits/basemap/geos-3.2.0/macros/lt~obsolete.m4
trunk/toolkits/basemap/geos-3.2.0/macros/python.m4
trunk/toolkits/basemap/geos-3.2.0/macros/ruby.m4
trunk/toolkits/basemap/geos-3.2.0/makefile.vc
trunk/toolkits/basemap/geos-3.2.0/missing
trunk/toolkits/basemap/geos-3.2.0/nmake.opt
trunk/toolkits/basemap/geos-3.2.0/py-compile
trunk/toolkits/basemap/geos-3.2.0/source/
trunk/toolkits/basemap/geos-3.2.0/source/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/Makefile.vc
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/Angle.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/BoundaryNodeRule.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/CGAlgorithms.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/CentroidArea.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/CentroidLine.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/CentroidPoint.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/ConvexHull.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/HCoordinate.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/InteriorPointArea.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/InteriorPointLine.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/InteriorPointPoint.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/LineIntersector.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/MCPointInRing.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/MinimumDiameter.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/NotRepresentableException.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/PointLocator.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/RayCrossingCounter.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/RobustDeterminant.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/SIRtreePointInRing.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/SimplePointInRing.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/distance/
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/distance/DiscreteHausdorffDistance.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/distance/DistanceToPoint.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/distance/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/distance/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/locate/
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/locate/IndexedPointInAreaLocator.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/locate/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/locate/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/locate/PointOnGeometryLocator.cpp
trunk/toolkits/basemap/geos-3.2.0/source/algorithm/locate/SimplePointInAreaLocator.cpp
trunk/toolkits/basemap/geos-3.2.0/source/dirlist.mk
trunk/toolkits/basemap/geos-3.2.0/source/geom/
trunk/toolkits/basemap/geos-3.2.0/source/geom/Coordinate.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/CoordinateArraySequence.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/CoordinateArraySequenceFactory.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/CoordinateSequence.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/CoordinateSequenceFactory.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Dimension.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Envelope.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Geometry.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/GeometryCollection.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/GeometryComponentFilter.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/GeometryFactory.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/GeometryList.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/IntersectionMatrix.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/LineSegment.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/LineString.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/LinearRing.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Location.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/geom/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/geom/MultiLineString.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/MultiPoint.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/MultiPolygon.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Point.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Polygon.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/PrecisionModel.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/Triangle.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/AbstractPreparedPolygonContains.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/BasicPreparedGeometry.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedGeometry.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedGeometryFactory.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedLineString.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedLineStringIntersects.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedPoint.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedPolygon.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedPolygonContains.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedPolygonContainsProperly.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedPolygonCovers.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedPolygonIntersects.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/prep/PreparedPolygonPredicate.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/ComponentCoordinateExtracter.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/CoordinateOperation.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/GeometryCombiner.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/GeometryEditor.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/GeometryTransformer.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/geom/util/ShortCircuitedGeometryVisitor.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Depth.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/DirectedEdge.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/DirectedEdgeStar.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Edge.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/EdgeEnd.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/EdgeEndStar.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/EdgeIntersection.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/EdgeIntersectionList.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/EdgeList.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/EdgeNodingValidator.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/EdgeRing.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/GeometryGraph.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/GraphComponent.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Label.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Node.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/NodeFactory.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/NodeMap.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/PlanarGraph.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Position.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/Quadrant.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/TopologyLocation.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/MonotoneChainEdge.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/MonotoneChainIndexer.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/SegmentIntersector.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/SimpleEdgeSetIntersector.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/SimpleMCSweepLineIntersector.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/SimpleSweepLineIntersector.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/SweepLineEvent.cpp
trunk/toolkits/basemap/geos-3.2.0/source/geomgraph/index/SweepLineSegment.cpp
trunk/toolkits/basemap/geos-3.2.0/source/headers/
trunk/toolkits/basemap/geos-3.2.0/source/headers/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/config.h.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/Angle.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/BoundaryNodeRule.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/CGAlgorithms.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/CentralEndpointIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/CentroidArea.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/CentroidLine.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/CentroidPoint.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/ConvexHull.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/ConvexHull.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/HCoordinate.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/InteriorPointArea.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/InteriorPointLine.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/InteriorPointPoint.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/LineIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/MCPointInRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/MinimumDiameter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/NotRepresentableException.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/PointInRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/PointLocator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/RayCrossingCounter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/RobustDeterminant.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/SIRtreePointInRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/SimplePointInRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/distance/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/distance/DiscreteHausdorffDistance.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/distance/DistanceToPoint.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/distance/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/distance/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/distance/PointPairDistance.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/locate/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/locate/IndexedPointInAreaLocator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/locate/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/locate/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/locate/PointOnGeometryLocator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/algorithm/locate/SimplePointInAreaLocator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/export.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/BinaryOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Coordinate.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Coordinate.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateArraySequence.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateArraySequenceFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateArraySequenceFactory.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateList.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateSequence.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateSequenceFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/CoordinateSequenceFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Dimension.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Envelope.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Envelope.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Geometry.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Geometry.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/GeometryCollection.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/GeometryCollection.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/GeometryComponentFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/GeometryFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/GeometryFactory.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/GeometryFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/GeometryList.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/IntersectionMatrix.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/LineSegment.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/LineSegment.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/LineString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/LinearRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Location.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/MultiLineString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/MultiLineString.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/MultiPoint.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/MultiPolygon.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/MultiPolygon.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Point.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Polygon.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/PrecisionModel.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/PrecisionModel.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/Triangle.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/AbstractPreparedPolygonContains.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/BasicPreparedGeometry.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedGeometry.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedGeometryFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedLineString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedLineStringIntersects.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedPoint.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedPolygon.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedPolygonContains.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedPolygonContainsProperly.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedPolygonCovers.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedPolygonIntersects.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/prep/PreparedPolygonPredicate.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/ComponentCoordinateExtracter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/CoordinateOperation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/GeometryCombiner.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/GeometryEditor.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/GeometryEditorOperation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/GeometryTransformer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/LinearComponentExtracter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/PointExtracter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/PolygonExtracter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom/util/ShortCircuitedGeometryVisitor.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geom.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomUtil.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Depth.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/DirectedEdge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/DirectedEdge.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/DirectedEdgeStar.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Edge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/EdgeEnd.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/EdgeEndStar.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/EdgeIntersection.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/EdgeIntersectionList.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/EdgeList.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/EdgeNodingValidator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/EdgeRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/GeometryGraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/GeometryGraph.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/GraphComponent.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Label.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Node.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/NodeFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/NodeMap.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/PlanarGraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Position.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/Quadrant.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/TopologyLocation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/EdgeSetIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/MonotoneChain.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/MonotoneChainEdge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/MonotoneChainIndexer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/SegmentIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/SimpleEdgeSetIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/SimpleMCSweepLineIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/SimpleSweepLineIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/SweepLineEvent.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/SweepLineEventObj.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph/index/SweepLineSegment.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geomgraphindex.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/geosAlgorithm.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/ItemVisitor.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/SpatialIndex.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/Bintree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/Interval.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/Key.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/Node.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/NodeBase.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/bintree/Root.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/chain/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/chain/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/chain/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/chain/MonotoneChain.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/chain/MonotoneChainBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/chain/MonotoneChainOverlapAction.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/chain/MonotoneChainSelectAction.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/intervalrtree/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/intervalrtree/IntervalRTreeBranchNode.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/intervalrtree/IntervalRTreeLeafNode.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/intervalrtree/IntervalRTreeNode.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/intervalrtree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/intervalrtree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/intervalrtree/SortedPackedIntervalRTree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/DoubleBits.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/IntervalSize.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/Key.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/Node.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/NodeBase.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/Quadtree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/quadtree/Root.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/AbstractNode.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/AbstractSTRtree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/Boundable.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/Interval.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/ItemBoundable.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/SIRtree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/strtree/STRtree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/sweepline/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/sweepline/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/sweepline/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/sweepline/SweepLineEvent.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/sweepline/SweepLineIndex.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/sweepline/SweepLineInterval.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/index/sweepline/SweepLineOverlapAction.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/indexBintree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/indexChain.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/indexQuadtree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/indexStrtree.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/indexSweepline.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/inline.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/ByteOrderDataInStream.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/ByteOrderDataInStream.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/ByteOrderValues.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/CLocalizer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/ParseException.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/StringTokenizer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/WKBConstants.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/WKBReader.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/WKBWriter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/WKTReader.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/WKTReader.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/WKTWriter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io/Writer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/io.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/ExtractLineByLocation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LengthIndexOfPoint.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LengthIndexedLine.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LengthLocationMap.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LinearGeometryBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LinearIterator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LinearLocation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LocationIndexOfLine.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/LocationIndexOfPoint.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/linearref/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/BasicSegmentString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/FastNodingValidator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/FastSegmentSetIntersectionFinder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/IntersectionAdder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/IntersectionFinderAdder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/IteratedNoder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/MCIndexNoder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/MCIndexNoder.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/MCIndexSegmentSetMutualIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/NodableSegmentString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/NodedSegmentString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/Noder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/NodingValidator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/Octant.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/OrientedCoordinateArray.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/ScaledNoder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentIntersectionDetector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentNode.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentNodeList.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentSetMutualIntersector.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentString.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SegmentStringUtil.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SimpleNoder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SingleInteriorIntersectionFinder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/SinglePassNoder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/HotPixel.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/HotPixel.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/MCIndexPointSnapper.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/MCIndexSnapRounder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/MCIndexSnapRounder.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding/snapround/SimpleSnapRounder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/noding.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/nodingSnapround.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opBuffer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opDistance.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opLinemerge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opOverlay.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opPolygonize.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opPredicate.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opRelate.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/opValid.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/GeometryGraphOperation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/IsSimpleOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/BufferBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/BufferOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/BufferParameters.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/BufferSubgraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/OffsetCurveBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/OffsetCurveSetBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/RightmostEdgeFinder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/buffer/SubgraphDepthLocater.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/distance/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/distance/ConnectedElementLocationFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/distance/ConnectedElementPointFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/distance/DistanceOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/distance/GeometryLocation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/distance/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/distance/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/EdgeString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/LineMergeDirectedEdge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/LineMergeEdge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/LineMergeGraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/LineMerger.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/LineSequencer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/linemerge/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/EdgeSetNoder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/ElevationMatrix.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/ElevationMatrixCell.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/LineBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/MaximalEdgeRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/MinimalEdgeRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/MinimalEdgeRing.inl
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/OverlayNodeFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/OverlayOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/PointBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/PolygonBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/snap/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/snap/GeometrySnapper.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/snap/LineStringSnapper.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/snap/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/snap/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/snap/SnapOverlayOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/validate/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/validate/FuzzyPointLocator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/validate/OffsetPointGenerator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/overlay/validate/OverlayResultValidator.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/EdgeRing.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/PolygonizeDirectedEdge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/PolygonizeEdge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/PolygonizeGraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/polygonize/Polygonizer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/predicate/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/predicate/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/predicate/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/predicate/RectangleContains.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/predicate/RectangleIntersects.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/predicate/SegmentIntersectionTester.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/EdgeEndBuilder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/EdgeEndBundle.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/EdgeEndBundleStar.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/RelateComputer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/RelateNode.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/RelateNodeFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/RelateNodeGraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/relate/RelateOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/union/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/union/CascadedPolygonUnion.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/union/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/union/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/ConnectedInteriorTester.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/ConsistentAreaTester.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/IsValidOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/QuadtreeNestedRingTester.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/RepeatedPointTester.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/SimpleNestedRingTester.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/SweeplineNestedRingTester.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation/valid/TopologyValidationError.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/operation.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/DirectedEdge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/DirectedEdgeStar.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/Edge.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/GraphComponent.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/Node.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/NodeMap.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/PlanarGraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/Subgraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/algorithm/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/algorithm/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph/algorithm/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/planargraph.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/platform.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/platform.h.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/platform.h.vc
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/CommonBits.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/CommonBitsOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/CommonBitsRemover.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/EnhancedPrecisionOp.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision/SimpleGeometryPrecisionReducer.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/precision.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/profiler.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/DouglasPeuckerSimplifier.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/LineSegmentIndex.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/TaggedLineSegment.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/TaggedLineString.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/TaggedLineStringSimplifier.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/TaggedLinesSimplifier.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/simplify/TopologyPreservingSimplifier.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/spatialIndex.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/timeval.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/unload.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/Assert.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/AssertionFailedException.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/CoordinateArrayFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/GEOSException.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/GeometricShapeFactory.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/IllegalArgumentException.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/TopologyException.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/UniqueCoordinateArrayFilter.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/UnsupportedOperationException.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util/math.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/util.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/version.h
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/version.h.in
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos/version.h.vc
trunk/toolkits/basemap/geos-3.2.0/source/headers/geos.h
trunk/toolkits/basemap/geos-3.2.0/source/index/
trunk/toolkits/basemap/geos-3.2.0/source/index/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/index/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/Bintree.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/Interval.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/Key.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/Node.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/NodeBase.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/bintree/Root.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/chain/
trunk/toolkits/basemap/geos-3.2.0/source/index/chain/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/index/chain/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/index/chain/MonotoneChain.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/chain/MonotoneChainBuilder.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/chain/MonotoneChainOverlapAction.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/chain/MonotoneChainSelectAction.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/intervalrtree/
trunk/toolkits/basemap/geos-3.2.0/source/index/intervalrtree/IntervalRTreeBranchNode.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/intervalrtree/IntervalRTreeLeafNode.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/intervalrtree/IntervalRTreeNode.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/intervalrtree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/index/intervalrtree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/index/intervalrtree/SortedPackedIntervalRTree.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/DoubleBits.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/IntervalSize.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/Key.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/Node.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/NodeBase.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/Quadtree.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/quadtree/Root.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/AbstractNode.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/AbstractSTRtree.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/Interval.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/ItemBoundable.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/SIRtree.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/strtree/STRtree.cpp
trunk/toolkits/basemap/geos-3.2.0/source/index/sweepline/
trunk/toolkits/basemap/geos-3.2.0/source/index/sweepline/Makefile.am
trunk/toolkits/basemap/geos-3.2.0/source/index/sweepline/Makefile.in
trunk/toolkits/basemap/geos-3.2.0/source/index/sweepline/SweepLineEvent.cpp
trunk/toolkits/basemap/...
[truncated message content] |
|
From: <lee...@us...> - 2010-02-28 03:13:45
|
Revision: 8163
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8163&view=rev
Author: leejjoon
Date: 2010-02-28 03:13:39 +0000 (Sun, 28 Feb 2010)
Log Message:
-----------
update annotation guide
Modified Paths:
--------------
trunk/matplotlib/doc/users/annotations_guide.rst
trunk/matplotlib/examples/pylab_examples/annotation_demo3.py
trunk/matplotlib/lib/matplotlib/text.py
Added Paths:
-----------
trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord01.py
trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord02.py
trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord03.py
Modified: trunk/matplotlib/doc/users/annotations_guide.rst
===================================================================
--- trunk/matplotlib/doc/users/annotations_guide.rst 2010-02-27 17:00:53 UTC (rev 8162)
+++ trunk/matplotlib/doc/users/annotations_guide.rst 2010-02-28 03:13:39 UTC (rev 8163)
@@ -4,10 +4,13 @@
Annotating Axes
****************
-Do not proceed unless you already have read
-:func:`~matplotlib.pyplot.text` and :func:`~matplotlib.pyplot.annotate`!
+Do not proceed unless you already have read :ref:`annotations-tutorial`,
+:func:`~matplotlib.pyplot.text` and
+:func:`~matplotlib.pyplot.annotate`!
+
+
Annotating with Text with Box
=============================
@@ -182,31 +185,6 @@
.. plot:: users/plotting/examples/annotate_simple04.py
-Using ConnectorPatch
-====================
-
-The ConnectorPatch is like an annotation without a text. While the
-annotate function is recommended in most of situation, the
-ConnectorPatch is useful when you want to connect points in different
-axes. ::
-
- from matplotlib.patches import ConnectionPatch
- xy = (0.2, 0.2)
- con = ConnectionPatch(xyA=xy, xyB=xy, coordsA="data", coordsB="data",
- axesA=ax1, axesB=ax2)
- ax2.add_artist(con)
-
-The above code connects point xy in data coordinate of ``ax1`` to
-point xy int data coordinate of ``ax2``. Here is a simple example.
-
-.. plot:: users/plotting/examples/connect_simple01.py
-
-
-While the ConnectorPatch instance can be added to any axes, but you
-may want it to be added to the axes in the latter (?) of the axes
-drawing order to prevent overlap (?) by other axes.
-
-
Placing Artist at the anchored location of the Axes
===================================================
@@ -282,6 +260,111 @@
Note that unlike the legend, the ``bbox_transform`` is set
to IdentityTransform by default.
+Using Complex Coordinate with Annotation
+========================================
+
+The Annotation in matplotlib support several types of coordinate as
+described in :ref:`annotations-tutorial`. For an advanced user who wants
+more control, it supports a few other options.
+
+ 1. :class:`~matplotlib.transforms.Transform` instance. For example, ::
+
+ ax.annotate("Test", xy=(0.5, 0.5), xycoords=ax.transAxes)
+
+ is identical to ::
+
+ ax.annotate("Test", xy=(0.5, 0.5), xycoords="axes fraction")
+
+ With this, you can annotate a point in other axes. ::
+
+ ax1, ax2 = subplot(121), subplot(122)
+ ax2.annotate("Test", xy=(0.5, 0.5), xycoords=ax1.transData,
+ xytext=(0.5, 0.5), textcoords=ax2.transData,
+ arrowprops=dict(arrowstyle="->"))
+
+ 2. :class:`~matplotlib.artist.Artist` instance. The xy value (or
+ xytext) is interpreted as a fractional coordinate of the bbox
+ (return value of *get_window_extent*) of the artist. ::
+
+ an1 = ax.annotate("Test 1", xy=(0.5, 0.5), xycoords="data",
+ va="center", ha="center",
+ bbox=dict(boxstyle="round", fc="w"))
+ an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1, # (1,0.5) of the an1's bbox
+ xytext=(30,0), textcoords="offset points",
+ va="center", ha="left",
+ bbox=dict(boxstyle="round", fc="w"),
+ arrowprops=dict(arrowstyle="->"))
+
+ .. plot:: users/plotting/examples/annotate_simple_coord01.py
+
+ Note that it is your responsibility that the extent of the
+ coordinate artist (*an1* in above example) is determined before *an2*
+ gets drawn. In most cases, it means that an2 needs to be drawn
+ later than *an1*.
+
+
+ 3. A callable object that returns an instance of either
+ :class:`~matplotlib.transforms.BboxBase` or
+ :class:`~matplotlib.transforms.Transform`. If a transform is
+ returned, it is same as 1 and if bbox is returned, it is same
+ as 2. The callable object should take a single argument of
+ renderer instance. For example, following two commands give
+ identical results ::
+ an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1,
+ xytext=(30,0), textcoords="offset points")
+ an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1.get_window_extent,
+ xytext=(30,0), textcoords="offset points")
+
+
+ 4. A tuple of two coordinate specification. The first item is for
+ x-coordinate and the second is for y-coordinate. For example, ::
+
+ annotate("Test", xy=(0.5, 1), xycoords=("data", "axes fraction"))
+
+ 0.5 is in data coordinate, and 1 is in normalized axes coordinate.
+ You may use an atist or transform as with a tuple. For example,
+
+ .. plot:: users/plotting/examples/annotate_simple_coord02.py
+ :include-source:
+
+
+ 5. Sometimes, you want your annotation with some "offset points", but
+ not from the annotated point but from other
+ point. :class:`~matplotlib.text.OffsetFrom` is a helper class for such
+ case.
+
+ .. plot:: users/plotting/examples/annotate_simple_coord03.py
+ :include-source:
+
+ You may take a look at this example :ref:`pylab_examples-annotation_demo3`.
+
+Using ConnectorPatch
+====================
+
+The ConnectorPatch is like an annotation without a text. While the
+annotate function is recommended in most of situation, the
+ConnectorPatch is useful when you want to connect points in different
+axes. ::
+
+ from matplotlib.patches import ConnectionPatch
+ xy = (0.2, 0.2)
+ con = ConnectionPatch(xyA=xy, xyB=xy, coordsA="data", coordsB="data",
+ axesA=ax1, axesB=ax2)
+ ax2.add_artist(con)
+
+The above code connects point xy in data coordinate of ``ax1`` to
+point xy int data coordinate of ``ax2``. Here is a simple example.
+
+.. plot:: users/plotting/examples/connect_simple01.py
+
+
+While the ConnectorPatch instance can be added to any axes, but you
+may want it to be added to the axes in the latter (?) of the axes
+drawing order to prevent overlap (?) by other axes.
+
+
+
+
Advanced Topics
***************
Added: trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord01.py
===================================================================
--- trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord01.py (rev 0)
+++ trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord01.py 2010-02-28 03:13:39 UTC (rev 8163)
@@ -0,0 +1,15 @@
+
+import matplotlib.pyplot as plt
+
+plt.figure(figsize=(3,2))
+ax=plt.subplot(111)
+an1 = ax.annotate("Test 1", xy=(0.5, 0.5), xycoords="data",
+ va="center", ha="center",
+ bbox=dict(boxstyle="round", fc="w"))
+an2 = ax.annotate("Test 2", xy=(1, 0.5), xycoords=an1,
+ xytext=(30,0), textcoords="offset points",
+ va="center", ha="left",
+ bbox=dict(boxstyle="round", fc="w"),
+ arrowprops=dict(arrowstyle="->"))
+plt.show()
+
Added: trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord02.py
===================================================================
--- trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord02.py (rev 0)
+++ trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord02.py 2010-02-28 03:13:39 UTC (rev 8163)
@@ -0,0 +1,16 @@
+
+import matplotlib.pyplot as plt
+
+plt.figure(figsize=(3,2))
+ax=plt.axes([0.1, 0.1, 0.8, 0.7])
+an1 = ax.annotate("Test 1", xy=(0.5, 0.5), xycoords="data",
+ va="center", ha="center",
+ bbox=dict(boxstyle="round", fc="w"))
+
+an2 = ax.annotate("Test 2", xy=(0.5, 1.), xycoords=an1,
+ xytext=(0.5,1.1), textcoords=(an1, "axes fraction"),
+ va="bottom", ha="center",
+ bbox=dict(boxstyle="round", fc="w"),
+ arrowprops=dict(arrowstyle="->"))
+plt.show()
+
Added: trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord03.py
===================================================================
--- trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord03.py (rev 0)
+++ trunk/matplotlib/doc/users/plotting/examples/annotate_simple_coord03.py 2010-02-28 03:13:39 UTC (rev 8163)
@@ -0,0 +1,19 @@
+
+import matplotlib.pyplot as plt
+
+plt.figure(figsize=(3,2))
+ax=plt.axes([0.1, 0.1, 0.8, 0.7])
+an1 = ax.annotate("Test 1", xy=(0.5, 0.5), xycoords="data",
+ va="center", ha="center",
+ bbox=dict(boxstyle="round", fc="w"))
+
+from matplotlib.text import OffsetFrom
+offset_from = OffsetFrom(an1, (0.5, 0))
+an2 = ax.annotate("Test 2", xy=(0.1, 0.1), xycoords="data",
+ xytext=(0, -10), textcoords=offset_from,
+ # xytext is offset points from "xy=(0.5, 0), xycoords=an1"
+ va="top", ha="center",
+ bbox=dict(boxstyle="round", fc="w"),
+ arrowprops=dict(arrowstyle="->"))
+plt.show()
+
Modified: trunk/matplotlib/examples/pylab_examples/annotation_demo3.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/annotation_demo3.py 2010-02-27 17:00:53 UTC (rev 8162)
+++ trunk/matplotlib/examples/pylab_examples/annotation_demo3.py 2010-02-28 03:13:39 UTC (rev 8163)
@@ -76,17 +76,16 @@
from matplotlib.text import OffsetFrom
-ax2.annotate('xy=(0.5, 0)\nxycoords="bbox fraction"\nxybbox=artist',
- xy=(0.5, 0.), xycoords=t.get_window_extent,
+ax2.annotate('xy=(0.5, 0)\nxycoords=artist',
+ xy=(0.5, 0.), xycoords=t,
xytext=(0, -20), textcoords='offset points',
ha="center", va="top",
bbox=bbox_args,
arrowprops=arrow_args
)
-ax2.annotate('xy=(0.8, 0.5)\nxycoords="bbox"\nxybbox=ax1.transData',
+ax2.annotate('xy=(0.8, 0.5)\nxycoords=ax1.transData',
xy=(0.8, 0.5), xycoords=ax1.transData,
- #xytext=(0, 0), textcoords='data',
xytext=(10, 10), textcoords=OffsetFrom(ax2.bbox, (0, 0), "points"),
ha="left", va="bottom",
bbox=bbox_args,
Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py 2010-02-27 17:00:53 UTC (rev 8162)
+++ trunk/matplotlib/lib/matplotlib/text.py 2010-02-28 03:13:39 UTC (rev 8163)
@@ -1423,7 +1423,9 @@
x, y = l+w*xf, b+h*yf
elif isinstance(self._artist, Transform):
x, y = self._artist.transform_point(self._ref_coord)
-
+ else:
+ raise RuntimeError("unknown type")
+
sc = self._get_scale(renderer)
tr = Affine2D().scale(sc, sc).translate(x, y)
@@ -1780,7 +1782,12 @@
# 5 points below the top border
xy=(10,-5), xycoords='axes points'
+ You may use an instance of
+ :class:`~matplotlib.transforms.Transform` or
+ :class:`~matplotlib.artist.Artist`. See
+ :ref:`plotting-guide-annotation` for more details.
+
The *annotation_clip* attribute contols the visibility of the
annotation when it goes outside the axes area. If True, the
annotation will only be drawn when the *xy* is inside the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2010-02-27 17:01:21
|
Revision: 8162
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8162&view=rev
Author: mdehoon
Date: 2010-02-27 17:00:53 +0000 (Sat, 27 Feb 2010)
Log Message:
-----------
With cairo /pycairo both at version 1.8.8, I'm still seeing crashes with paths
longer than 20000 points or so (tried the gtkcairo backend on Mac OS X). So the
path length check is still needed.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py 2010-02-26 16:27:55 UTC (rev 8161)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py 2010-02-27 17:00:53 UTC (rev 8162)
@@ -138,6 +138,9 @@
def draw_path(self, gc, path, transform, rgbFace=None):
+ if len(path.vertices) > 18980:
+ raise ValueError("The Cairo backend can not draw paths longer than 18980 points.")
+
ctx = gc.ctx
transform = transform + \
@@ -145,7 +148,7 @@
ctx.new_path()
self.convert_path(ctx, path, transform)
-
+
self._fill_and_stroke(ctx, rgbFace, gc.get_alpha())
def draw_image(self, gc, x, y, im):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2010-02-26 16:28:02
|
Revision: 8161
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8161&view=rev
Author: mdboom
Date: 2010-02-26 16:27:55 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
Fix offset_copy: the fig argument should be optional.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/transforms.py
Modified: trunk/matplotlib/lib/matplotlib/transforms.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/transforms.py 2010-02-26 16:27:22 UTC (rev 8160)
+++ trunk/matplotlib/lib/matplotlib/transforms.py 2010-02-26 16:27:55 UTC (rev 8161)
@@ -2284,7 +2284,7 @@
((a < b) and (a < val and b > val))
or (b < val and a > val))
-def offset_copy(trans, fig, x=0.0, y=0.0, units='inches'):
+def offset_copy(trans, fig=None, x=0.0, y=0.0, units='inches'):
'''
Return a new transform with an added offset.
args:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
