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: <md...@us...> - 2007-11-15 18:10:57
|
Revision: 4311
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4311&view=rev
Author: mdboom
Date: 2007-11-15 10:10:54 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Major speed improvement (duplicate draws were being emitted).
Modified Paths:
--------------
branches/transforms/lib/matplotlib/axes.py
branches/transforms/lib/matplotlib/backends/backend_tkagg.py
Modified: branches/transforms/lib/matplotlib/axes.py
===================================================================
--- branches/transforms/lib/matplotlib/axes.py 2007-11-15 17:23:03 UTC (rev 4310)
+++ branches/transforms/lib/matplotlib/axes.py 2007-11-15 18:10:54 UTC (rev 4311)
@@ -1608,9 +1608,8 @@
for other in self._shared_x_axes.get_siblings(self):
if other is not self:
other.set_xlim(self.viewLim.intervalx, emit=False)
-
- if self.figure.canvas is not None:
- self.figure.canvas.draw_idle()
+ if other.figure != self.figure and other.figure.canvas is not None:
+ other.figure.canvas.draw_idle()
return xmin, xmax
@@ -1770,9 +1769,8 @@
for other in self._shared_y_axes.get_siblings(self):
if other is not self:
other.set_ylim(self.viewLim.intervaly, emit=False)
-
- if self.figure.canvas is not None:
- self.figure.canvas.draw_idle()
+ if other.figure != self.figure and other.figure.canvas is not None:
+ other.figure.canvas.draw_idle()
return ymin, ymax
def get_yscale(self):
Modified: branches/transforms/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_tkagg.py 2007-11-15 17:23:03 UTC (rev 4310)
+++ branches/transforms/lib/matplotlib/backends/backend_tkagg.py 2007-11-15 18:10:54 UTC (rev 4311)
@@ -146,7 +146,7 @@
def __init__(self, figure, master=None, resize_callback=None):
FigureCanvasAgg.__init__(self, figure)
- self._idle = False
+ self._idle = True
t1,t2,w,h = self.figure.bbox.bounds
w, h = int(w), int(h)
self._tkcanvas = Tk.Canvas(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-15 17:23:08
|
Revision: 4310
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4310&view=rev
Author: jswhit
Date: 2007-11-15 09:23:03 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
MacOS X warning no longer needed.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/README
Modified: trunk/toolkits/basemap-testing/README
===================================================================
--- trunk/toolkits/basemap-testing/README 2007-11-15 17:17:02 UTC (rev 4309)
+++ trunk/toolkits/basemap-testing/README 2007-11-15 17:23:03 UTC (rev 4310)
@@ -78,32 +78,12 @@
> 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.
- > ./configure --prefix=$GEOS_DIR
+ > ./configure --prefix=$GEOS_DIR
> make; make install
3) cd back to the top level basemap directory (basemap-X.Y.Z) and
run the usual 'python setup.py install'.
-Note for Mac OS X users:
------------------------
-On intel, your build may fail with a message like this:
-
-/usr/bin/ld: for architecture ppc /usr/bin/ld: warning
-/sw/lib/libgeos_c.dylib cputype (7, architecture i386) does not match
-cputype (18) for specified -arch flag: ppc (file not loaded) lipo: can't
-open input file: /var/tmp//ccJKju2Z.out (No such file or directory)
-error: Command "gcc -arch i386 -arch ppc -isysroot
-/Developer/SDKs/MacOSX10.4u.sdk -g -bundle -undefined dynamic_lookup
-build/temp.macosx-10.3-fat-2.4/src/_geos.o -L/sw/lib -L/sw/lib -lgeos_c
--o build/lib.macosx-10.3-fat-2.4/_geos.so" failed with exit status 1
-
-If so, just cut and past the gcc command in double quotes, removing the
-'-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' flags. Then run
-'setup.py install' again to finish the build.
-
-On ppc, there may be a similar failure, but remove the '-arch i386' flag
-instead.
-
**Contact**
Jeff Whitaker <jef...@no...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-15 17:17:18
|
Revision: 4309
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4309&view=rev
Author: mdboom
Date: 2007-11-15 09:17:02 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Bugfixes (getting some examples to work again).
Modified Paths:
--------------
branches/transforms/examples/scatter_star_poly.py
branches/transforms/lib/matplotlib/path.py
branches/transforms/src/_backend_agg.cpp
Modified: branches/transforms/examples/scatter_star_poly.py
===================================================================
--- branches/transforms/examples/scatter_star_poly.py 2007-11-15 17:08:39 UTC (rev 4308)
+++ branches/transforms/examples/scatter_star_poly.py 2007-11-15 17:17:02 UTC (rev 4309)
@@ -9,7 +9,7 @@
pylab.subplot(322)
pylab.scatter(x,y,s=80,marker=(5,0))
-verts = zip([-1.,1.,1.],[-1.,-1.,1.])
+verts = zip([-1.,1.,1.,-1.],[-1.,-1.,1.,-1.])
pylab.subplot(323)
pylab.scatter(x,y,s=80,marker=(verts,0))
# equivalent:
Modified: branches/transforms/lib/matplotlib/path.py
===================================================================
--- branches/transforms/lib/matplotlib/path.py 2007-11-15 17:08:39 UTC (rev 4308)
+++ branches/transforms/lib/matplotlib/path.py 2007-11-15 17:17:02 UTC (rev 4309)
@@ -112,11 +112,11 @@
# MOVETO commands to the codes array accordingly.
if mask is not ma.nomask:
mask1d = ma.mask_or(mask[:, 0], mask[:, 1])
- vertices = ma.compress(npy.invert(mask1d), vertices, 0)
if codes is None:
codes = self.LINETO * npy.ones(
- vertices.shape[0], self.code_type)
+ len(vertices), self.code_type)
codes[0] = self.MOVETO
+ vertices = ma.compress(npy.invert(mask1d), vertices, 0)
codes = npy.where(npy.concatenate((mask1d[-1:], mask1d[:-1])),
self.MOVETO, codes)
codes = ma.masked_array(codes, mask=mask1d).compressed()
@@ -273,7 +273,7 @@
path = cls._unit_regular_polygons.get(numVertices)
if path is None:
theta = (2*npy.pi/numVertices *
- npy.arange(numVertices).reshape((numVertices, 1)))
+ npy.arange(numVertices + 1).reshape((numVertices + 1, 1)))
# This initial rotation is to make sure the polygon always
# "points-up"
theta += npy.pi / 2.0
@@ -293,11 +293,11 @@
path = cls._unit_regular_stars.get((numVertices, innerCircle))
if path is None:
ns2 = numVertices * 2
- theta = (2*npy.pi/ns2 * npy.arange(ns2))
+ theta = (2*npy.pi/ns2 * npy.arange(ns2 + 1))
# This initial rotation is to make sure the polygon always
# "points-up"
theta += npy.pi / 2.0
- r = npy.ones(ns2)
+ r = npy.ones(ns2 + 1)
r[1::2] = innerCircle
verts = npy.vstack((r*npy.cos(theta), r*npy.sin(theta))).transpose()
path = Path(verts)
Modified: branches/transforms/src/_backend_agg.cpp
===================================================================
--- branches/transforms/src/_backend_agg.cpp 2007-11-15 17:08:39 UTC (rev 4308)
+++ branches/transforms/src/_backend_agg.cpp 2007-11-15 17:17:02 UTC (rev 4309)
@@ -1044,21 +1044,22 @@
class PathListGenerator {
const Py::SeqBase<Py::Object>& m_paths;
+ size_t m_npaths;
public:
typedef PathIterator path_iterator;
inline PathListGenerator(const Py::SeqBase<Py::Object>& paths) :
- m_paths(paths) {
+ m_paths(paths), m_npaths(paths.size()) {
}
inline size_t num_paths() const {
- return m_paths.size();
+ return m_npaths;
}
inline path_iterator operator()(size_t i) const {
- return PathIterator(m_paths[i]);
+ return PathIterator(m_paths[i % m_npaths]);
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-15 17:08:46
|
Revision: 4308
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4308&view=rev
Author: jswhit
Date: 2007-11-15 09:08:39 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
really suppress building of geotest
Modified Paths:
--------------
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in
Modified: trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in
===================================================================
--- trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in 2007-11-15 16:29:40 UTC (rev 4307)
+++ trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in 2007-11-15 17:08:39 UTC (rev 4308)
@@ -16,7 +16,7 @@
-SOURCES = $(libgeos_c_la_SOURCES) $(geostest_SOURCES)
+SOURCES = $(libgeos_c_la_SOURCES)
srcdir = @srcdir@
VPATH = @srcdir@
@@ -40,7 +40,7 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-noinst_PROGRAMS = geostest$(EXEEXT)
+noinst_PROGRAMS =
subdir = source/capi
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/geos_c.h.in
@@ -66,9 +66,6 @@
am_libgeos_c_la_OBJECTS = $(am__objects_1)
libgeos_c_la_OBJECTS = $(am_libgeos_c_la_OBJECTS)
PROGRAMS = $(noinst_PROGRAMS)
-am_geostest_OBJECTS = geostest.$(OBJEXT)
-geostest_OBJECTS = $(am_geostest_OBJECTS)
-geostest_DEPENDENCIES = libgeos_c.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/source/headers -I$(top_builddir)/source/headers/geos
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -88,8 +85,8 @@
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libgeos_c_la_SOURCES) $(geostest_SOURCES)
-DIST_SOURCES = $(libgeos_c_la_SOURCES) $(geostest_SOURCES)
+SOURCES = $(libgeos_c_la_SOURCES)
+DIST_SOURCES = $(libgeos_c_la_SOURCES)
nodist_capiHEADERS_INSTALL = $(INSTALL_HEADER)
HEADERS = $(nodist_capi_HEADERS)
ETAGS = etags
@@ -205,9 +202,6 @@
target_vendor = @target_vendor@
GEOS_CAPI_VERSION = "@VERSION@-CAPI-@CAPI_VERSION@"
GEOS_JTS_PORT = "@JTS_PORT@"
-geostest_SOURCES = geostest.c
-geostest_LDADD = libgeos_c.la
-geostest_INCLUDES = -I.
INCLUDES = -I$(top_srcdir)/source/headers
capidir = $(includedir)
nodist_capi_HEADERS = \
@@ -301,7 +295,6 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geostest.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgeos_c_la-geos_c.Plo@am__quote@
.c.o:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-15 16:29:51
|
Revision: 4307
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4307&view=rev
Author: mdboom
Date: 2007-11-15 08:29:40 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Updated benchmark
Modified Paths:
--------------
branches/transforms/examples/simple_plot_fps.py
Modified: branches/transforms/examples/simple_plot_fps.py
===================================================================
--- branches/transforms/examples/simple_plot_fps.py 2007-11-15 16:28:54 UTC (rev 4306)
+++ branches/transforms/examples/simple_plot_fps.py 2007-11-15 16:29:40 UTC (rev 4307)
@@ -23,7 +23,12 @@
frames = 100.0
t = time.time()
+c = time.clock()
for i in xrange(int(frames)):
part = i / frames
axis([0.0, 1.0 - part, -1.0 + part, 1.0 - part])
-print "fps:", frames / (time.time() - t)
+wallclock = time.time() - t
+user = time.clock() - c
+print "wallclock:", wallclock
+print "user:", user
+print "fps:", frames / wallclock
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-15 16:28:56
|
Revision: 4306
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4306&view=rev
Author: mdboom
Date: 2007-11-15 08:28:54 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Speed improvements.
Modified Paths:
--------------
branches/transforms/lib/matplotlib/backends/backend_tkagg.py
branches/transforms/lib/matplotlib/transforms.py
Modified: branches/transforms/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_tkagg.py 2007-11-15 15:18:42 UTC (rev 4305)
+++ branches/transforms/lib/matplotlib/backends/backend_tkagg.py 2007-11-15 16:28:54 UTC (rev 4306)
@@ -146,7 +146,7 @@
def __init__(self, figure, master=None, resize_callback=None):
FigureCanvasAgg.__init__(self, figure)
- self._idle = True
+ self._idle = False
t1,t2,w,h = self.figure.bbox.bounds
w, h = int(w), int(h)
self._tkcanvas = Tk.Canvas(
Modified: branches/transforms/lib/matplotlib/transforms.py
===================================================================
--- branches/transforms/lib/matplotlib/transforms.py 2007-11-15 15:18:42 UTC (rev 4305)
+++ branches/transforms/lib/matplotlib/transforms.py 2007-11-15 16:28:54 UTC (rev 4306)
@@ -37,6 +37,8 @@
if DEBUG:
import warnings
+MaskedArray = ma.MaskedArray
+
class TransformNode(object):
"""
TransformNode is the base class for anything that participates in
@@ -1205,7 +1207,7 @@
def transform(self, points):
mtx = self.get_matrix()
- if ma.isMaskedArray(points):
+ if isinstance(points, MaskedArray):
points = ma.dot(mtx[0:2, 0:2], points.transpose()) + mtx[0:2, 2:]
return points.transpose()
return affine_transform(points, mtx)
@@ -1526,7 +1528,7 @@
y_points = y.transform(points[:, 1])
y_points = y_points.reshape((len(y_points), 1))
- if ma.isMaskedArray(x_points) or ma.isMaskedArray(y_points):
+ if isinstance(x_points, MaskedArray) or isinstance(y_points, MaskedArray):
return ma.concatenate((x_points, y_points), 1)
else:
return npy.concatenate((x_points, y_points), 1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-15 15:18:46
|
Revision: 4305
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4305&view=rev
Author: mdboom
Date: 2007-11-15 07:18:42 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Speed improvements.
Modified Paths:
--------------
branches/transforms/lib/matplotlib/path.py
branches/transforms/lib/matplotlib/transforms.py
branches/transforms/src/_backend_agg.cpp
branches/transforms/src/_path.cpp
Modified: branches/transforms/lib/matplotlib/path.py
===================================================================
--- branches/transforms/lib/matplotlib/path.py 2007-11-15 15:15:21 UTC (rev 4304)
+++ branches/transforms/lib/matplotlib/path.py 2007-11-15 15:18:42 UTC (rev 4305)
@@ -160,31 +160,33 @@
def iter_segments(self):
"""
- Iterates over all of the endpoints in the path. Unlike
- iterating directly over the vertices array, curve control
- points are skipped over.
+ Iterates over all of the curve segments in the path.
"""
- i = 0
- NUM_VERTICES = self.NUM_VERTICES
vertices = self.vertices
codes = self.codes
+ len_vertices = len(vertices)
+ NUM_VERTICES = self.NUM_VERTICES
+ MOVETO = self.MOVETO
+ LINETO = self.LINETO
+ CLOSEPOLY = self.CLOSEPOLY
+ STOP = self.STOP
+
if not len(vertices):
return
if codes is None:
- code = self.MOVETO
- yield vertices[0], self.MOVETO
- i = 1
+ yield vertices[0], MOVETO
for v in vertices[1:]:
- yield v, self.LINETO
+ yield v, LINETO
else:
- while i < len(vertices):
+ i = 0
+ while i < len_vertices:
code = codes[i]
- if code == self.CLOSEPOLY:
+ if code == CLOSEPOLY:
yield [], code
i += 1
- elif code == self.STOP:
+ elif code == STOP:
return
else:
num_vertices = NUM_VERTICES[code]
Modified: branches/transforms/lib/matplotlib/transforms.py
===================================================================
--- branches/transforms/lib/matplotlib/transforms.py 2007-11-15 15:15:21 UTC (rev 4304)
+++ branches/transforms/lib/matplotlib/transforms.py 2007-11-15 15:18:42 UTC (rev 4305)
@@ -25,6 +25,7 @@
import numpy as npy
from matplotlib.numerix import npyma as ma
+from matplotlib._path import affine_transform
from numpy.linalg import inv
from weakref import WeakKeyDictionary
@@ -1206,10 +1207,13 @@
mtx = self.get_matrix()
if ma.isMaskedArray(points):
points = ma.dot(mtx[0:2, 0:2], points.transpose()) + mtx[0:2, 2:]
- else:
- points = npy.dot(mtx[0:2, 0:2], points.transpose()) + mtx[0:2, 2:]
- return points.transpose()
+ return points.transpose()
+ return affine_transform(points, mtx)
+ def transform_point(self, point):
+ mtx = self.get_matrix()
+ return affine_transform(point, mtx)
+
if DEBUG:
_transform = transform
def transform(self, points):
@@ -1251,7 +1255,7 @@
Affine2DBase.__init__(self)
if matrix is None:
matrix = npy.identity(3)
- else:
+ elif DEBUG:
matrix = npy.asarray(matrix, npy.float_)
assert matrix.shape == (3, 3)
self._mtx = matrix
@@ -1276,7 +1280,9 @@
b d f
0 0 1
"""
- return Affine2D(Affine2D.matrix_from_values(a, b, c, d, e, f))
+ return Affine2D(
+ npy.array([a, c, e, b, d, f, 0.0, 0.0, 1.0], npy.float_)
+ .reshape((3,3)))
from_values = staticmethod(from_values)
def get_matrix(self):
Modified: branches/transforms/src/_backend_agg.cpp
===================================================================
--- branches/transforms/src/_backend_agg.cpp 2007-11-15 15:15:21 UTC (rev 4304)
+++ branches/transforms/src/_backend_agg.cpp 2007-11-15 15:18:42 UTC (rev 4305)
@@ -282,8 +282,8 @@
double l, b, r, t;
if (py_convert_bbox(cliprect.ptr(), l, b, r, t)) {
- rasterizer->clip_box(int(round(l)) + 1, height - int(round(b)) + 1,
- int(round(r)) + 1, height - int(round(t)) + 1);
+ rasterizer->clip_box(int(round(l)) + 1, height - int(round(b)),
+ int(round(r)), height - int(round(t)));
}
_VERBOSE("RendererAgg::set_clipbox done");
@@ -526,8 +526,6 @@
strokeCache = new agg::int8u[strokeSize]; // or any container
scanlines.serialize(strokeCache);
- theRasterizer->reset_clipping();
- rendererBase->reset_clipping(true);
set_clipbox(gc.cliprect, rendererBase);
bool has_clippath = render_clippath(gc.clippath, gc.clippath_trans);
@@ -536,34 +534,41 @@
agg::serialized_scanlines_adaptor_aa8 sa;
agg::serialized_scanlines_adaptor_aa8::embedded_scanline sl;
- while (path_quantized.vertex(&x, &y) != agg::path_cmd_stop) {
- //render the fill
- if (face.first) {
- if (has_clippath) {
- pixfmt_amask_type pfa(*pixFmt, *alphaMask);
- amask_ren_type r(pfa);
- amask_aa_renderer_type ren(r);
+ if (face.first) {
+ // render the fill
+ if (has_clippath) {
+ pixfmt_amask_type pfa(*pixFmt, *alphaMask);
+ amask_ren_type r(pfa);
+ amask_aa_renderer_type ren(r);
+ ren.color(face.second);
+ while (path_quantized.vertex(&x, &y) != agg::path_cmd_stop) {
sa.init(fillCache, fillSize, x, y);
- ren.color(face.second);
agg::render_scanlines(sa, sl, ren);
- } else {
+ }
+ } else {
+ rendererAA->color(face.second);
+ while (path_quantized.vertex(&x, &y) != agg::path_cmd_stop) {
sa.init(fillCache, fillSize, x, y);
- rendererAA->color(face.second);
agg::render_scanlines(sa, sl, *rendererAA);
}
}
-
- //render the stroke
- if (has_clippath) {
- pixfmt_amask_type pfa(*pixFmt, *alphaMask);
- amask_ren_type r(pfa);
- amask_aa_renderer_type ren(r);
+ path_quantized.rewind(0);
+ }
+
+ //render the stroke
+ if (has_clippath) {
+ pixfmt_amask_type pfa(*pixFmt, *alphaMask);
+ amask_ren_type r(pfa);
+ amask_aa_renderer_type ren(r);
+ ren.color(gc.color);
+ while (path_quantized.vertex(&x, &y) != agg::path_cmd_stop) {
sa.init(strokeCache, strokeSize, x, y);
- ren.color(gc.color);
agg::render_scanlines(sa, sl, ren);
- } else {
+ }
+ } else {
+ rendererAA->color(gc.color);
+ while (path_quantized.vertex(&x, &y) != agg::path_cmd_stop) {
sa.init(strokeCache, strokeSize, x, y);
- rendererAA->color(gc.color);
agg::render_scanlines(sa, sl, *rendererAA);
}
}
@@ -880,8 +885,6 @@
GCAgg gc = GCAgg(gc_obj, dpi);
facepair_t face = _get_rgba_face(face_obj, gc.alpha);
- theRasterizer->reset_clipping();
- rendererBase->reset_clipping(true);
set_clipbox(gc.cliprect, theRasterizer);
bool has_clippath = render_clippath(gc.clippath, gc.clippath_trans);
Modified: branches/transforms/src/_path.cpp
===================================================================
--- branches/transforms/src/_path.cpp 2007-11-15 15:15:21 UTC (rev 4304)
+++ branches/transforms/src/_path.cpp 2007-11-15 15:18:42 UTC (rev 4305)
@@ -11,6 +11,13 @@
// MGDTODO: Un-CXX-ify this module
+struct XY {
+ double x;
+ double y;
+
+ XY(double x_, double y_) : x(x_), y(y_) {}
+};
+
// the extension module
class _path_module : public Py::ExtensionModule<_path_module>
{
@@ -32,7 +39,9 @@
"point_in_path_collection(a, atrans, b, btrans)");
add_varargs_method("clip_path_to_rect", &_path_module::clip_path_to_rect,
"clip_path_to_rect(path, bbox, inside)");
-
+ add_varargs_method("affine_transform", &_path_module::affine_transform,
+ "affine_transform(vertices, transform)");
+
initialize("Helper functions for paths");
}
@@ -47,6 +56,7 @@
Py::Object point_in_path_collection(const Py::Tuple& args);
Py::Object path_in_path(const Py::Tuple& args);
Py::Object clip_path_to_rect(const Py::Tuple& args);
+ Py::Object affine_transform(const Py::Tuple& args);
};
//
@@ -97,7 +107,7 @@
inside_flag = 0;
unsigned code = 0;
- while (true) {
+ do {
if (code != agg::path_cmd_move_to)
code = path.vertex(&x, &y);
@@ -111,7 +121,7 @@
vty1 = x;
inside_flag = 0;
- while (true) {
+ do {
code = path.vertex(&x, &y);
// The following cases denote the beginning on a new subpath
@@ -151,12 +161,9 @@
vtx1 = x;
vty1 = y;
+ } while (code != agg::path_cmd_stop &&
+ (code & agg::path_cmd_end_poly) != agg::path_cmd_end_poly);
- if (code == agg::path_cmd_stop ||
- (code & agg::path_cmd_end_poly) == agg::path_cmd_end_poly)
- break;
- }
-
yflag1 = (vty1 >= ty);
if (yflag0 != yflag1) {
if ( ((vty1-ty) * (vtx0-vtx1) >=
@@ -167,11 +174,8 @@
if (inside_flag != 0)
return true;
+ } while (code != agg::path_cmd_stop);
- if (code == agg::path_cmd_stop)
- break;
- }
-
return (inside_flag != 0);
}
@@ -453,7 +457,7 @@
http://en.wikipedia.org/wiki/Sutherland-Hodgman_clipping_algorithm
*/
-typedef std::vector<std::pair<double, double> > Polygon;
+typedef std::vector<XY> Polygon;
namespace clip_to_rect_filters {
/* There are four different passes needed to create/remove vertices
@@ -476,7 +480,7 @@
struct xlt : public bisectx {
xlt(double x) : bisectx(x) {}
- bool operator()(double x, double y) const {
+ bool is_inside(double x, double y) const {
return x <= m_x;
}
};
@@ -484,7 +488,7 @@
struct xgt : public bisectx {
xgt(double x) : bisectx(x) {}
- bool operator()(double x, double y) const {
+ bool is_inside(double x, double y) const {
return x >= m_x;
}
};
@@ -505,7 +509,7 @@
struct ylt : public bisecty {
ylt(double y) : bisecty(y) {}
- bool operator()(double x, double y) const {
+ bool is_inside(double x, double y) const {
return y <= m_y;
}
};
@@ -513,7 +517,7 @@
struct ygt : public bisecty {
ygt(double y) : bisecty(y) {}
- bool operator()(double x, double y) const {
+ bool is_inside(double x, double y) const {
return y >= m_y;
}
};
@@ -528,29 +532,23 @@
if (polygon.size() == 0)
return;
- sx = polygon.back().first;
- sy = polygon.back().second;
+ sx = polygon.back().x;
+ sy = polygon.back().y;
for (Polygon::const_iterator i = polygon.begin(); i != polygon.end(); ++i) {
- px = i->first;
- py = i->second;
+ px = i->x;
+ py = i->y;
- sinside = filter(sx, sy);
- pinside = filter(px, py);
+ sinside = filter.is_inside(sx, sy);
+ pinside = filter.is_inside(px, py);
- if (sinside) {
- if (pinside) {
- result.push_back(std::make_pair(px, py));
- } else {
- filter.bisect(sx, sy, px, py, &bx, &by);
- result.push_back(std::make_pair(bx, by));
- }
- } else {
- if (pinside) {
- filter.bisect(sx, sy, px, py, &bx, &by);
- result.push_back(std::make_pair(bx, by));
- result.push_back(std::make_pair(px, py));
- }
+ if (sinside ^ pinside) {
+ filter.bisect(sx, sy, px, py, &bx, &by);
+ result.push_back(XY(bx, by));
}
+
+ if (pinside) {
+ result.push_back(XY(px, py));
+ }
sx = px; sy = py;
}
@@ -582,11 +580,12 @@
unsigned code = 0;
path.rewind(0);
- while (true) {
+ do {
+ // Grab the next subpath and store it in polygon1
polygon1.clear();
- while (true) {
+ do {
if (code == agg::path_cmd_move_to)
- polygon1.push_back(std::make_pair(x, y));
+ polygon1.push_back(XY(x, y));
code = path.vertex(&x, &y);
@@ -594,15 +593,9 @@
break;
if (code != agg::path_cmd_move_to)
- polygon1.push_back(std::make_pair(x, y));
+ polygon1.push_back(XY(x, y));
+ } while ((code & agg::path_cmd_end_poly) != agg::path_cmd_end_poly);
- if ((code & agg::path_cmd_end_poly) == agg::path_cmd_end_poly) {
- break;
- } else if (code == agg::path_cmd_move_to) {
- break;
- }
- }
-
// The result of each step is fed into the next (note the
// swapping of polygon1 and polygon2 at each step).
clip_to_rect_one_step(polygon1, polygon2, clip_to_rect_filters::xlt(xmax));
@@ -610,12 +603,10 @@
clip_to_rect_one_step(polygon1, polygon2, clip_to_rect_filters::ylt(ymax));
clip_to_rect_one_step(polygon2, polygon1, clip_to_rect_filters::ygt(ymin));
+ // Empty polygons aren't very useful, so skip them
if (polygon1.size())
results.push_back(polygon1);
-
- if (code == agg::path_cmd_stop)
- break;
- }
+ } while (code != agg::path_cmd_stop);
}
Py::Object _path_module::clip_path_to_rect(const Py::Tuple &args) {
@@ -633,30 +624,118 @@
::clip_to_rect(path, x0, y0, x1, y1, inside, results);
- // MGDTODO: Not exception safe
int dims[2];
dims[1] = 2;
PyObject* py_results = PyList_New(results.size());
- for (std::vector<Polygon>::const_iterator p = results.begin(); p != results.end(); ++p) {
- size_t size = p->size();
- dims[0] = p->size();
- PyArrayObject* pyarray = (PyArrayObject*)PyArray_FromDims(2, dims, PyArray_DOUBLE);
- for (size_t i = 0; i < size; ++i) {
- ((double *)pyarray->data)[2*i] = (*p)[i].first;
- ((double *)pyarray->data)[2*i+1] = (*p)[i].second;
+ if (!py_results)
+ throw Py::RuntimeError("Error creating results list");
+ try {
+ for (std::vector<Polygon>::const_iterator p = results.begin(); p != results.end(); ++p) {
+ size_t size = p->size();
+ dims[0] = p->size();
+ PyArrayObject* pyarray = (PyArrayObject*)PyArray_FromDims(2, dims, PyArray_DOUBLE);
+ for (size_t i = 0; i < size; ++i) {
+ ((double *)pyarray->data)[2*i] = (*p)[i].x;
+ ((double *)pyarray->data)[2*i+1] = (*p)[i].y;
+ }
+ if (PyList_SetItem(py_results, p - results.begin(), (PyObject *)pyarray) != -1) {
+ throw Py::RuntimeError("Error creating results list");
+ }
}
- // MGDTODO: Error check
- PyList_SetItem(py_results, p - results.begin(), (PyObject *)pyarray);
+ } catch (...) {
+ Py_XDECREF(py_results);
+ throw;
}
return Py::Object(py_results, true);
}
-struct XY {
- double x;
- double y;
-};
+Py::Object _path_module::affine_transform(const Py::Tuple& args) {
+ args.verify_length(2);
+
+ Py::Object vertices_obj = args[0];
+ Py::Object transform_obj = args[1];
+ PyArrayObject* vertices = NULL;
+ PyArrayObject* transform = NULL;
+ PyArrayObject* result = NULL;
+
+ try {
+ vertices = (PyArrayObject*)PyArray_FromObject
+ (vertices_obj.ptr(), PyArray_DOUBLE, 1, 2);
+ if (!vertices ||
+ (PyArray_NDIM(vertices) == 2 && PyArray_DIM(vertices, 1) != 2) ||
+ (PyArray_NDIM(vertices) == 1 && PyArray_DIM(vertices, 0) != 2))
+ throw Py::ValueError("Invalid vertices array.");
+
+ transform = (PyArrayObject*) PyArray_FromObject
+ (transform_obj.ptr(), PyArray_DOUBLE, 2, 2);
+ if (!transform || PyArray_NDIM(transform) != 2 || PyArray_DIM(transform, 0) != 3 || PyArray_DIM(transform, 1) != 3)
+ throw Py::ValueError("Invalid transform.");
+
+ double a, b, c, d, e, f;
+ {
+ size_t stride0 = PyArray_STRIDE(transform, 0);
+ size_t stride1 = PyArray_STRIDE(transform, 1);
+ char* row0 = PyArray_BYTES(transform);
+ char* row1 = row0 + stride0;
+
+ a = *(double*)(row0);
+ row0 += stride1;
+ c = *(double*)(row0);
+ row0 += stride1;
+ e = *(double*)(row0);
+
+ b = *(double*)(row1);
+ row1 += stride1;
+ d = *(double*)(row1);
+ row1 += stride1;
+ f = *(double*)(row1);
+ }
+
+ result = (PyArrayObject*)PyArray_FromDims
+ (PyArray_NDIM(vertices), PyArray_DIMS(vertices), PyArray_DOUBLE);
+ if (PyArray_NDIM(vertices) == 2) {
+ size_t n = PyArray_DIM(vertices, 0);
+ char* vertex_in = PyArray_BYTES(vertices);
+ double* vertex_out = (double*)PyArray_DATA(result);
+ size_t stride0 = PyArray_STRIDE(vertices, 0);
+ size_t stride1 = PyArray_STRIDE(vertices, 1);
+ double x;
+ double y;
+
+ for (size_t i = 0; i < n; ++i) {
+ x = *(double*)(vertex_in);
+ y = *(double*)(vertex_in + stride1);
+
+ *vertex_out++ = a*x + c*y + e;
+ *vertex_out++ = b*x + d*y + f;
+
+ vertex_in += stride0;
+ }
+ } else {
+ char* vertex_in = PyArray_BYTES(vertices);
+ double* vertex_out = (double*)PyArray_DATA(result);
+ size_t stride0 = PyArray_STRIDE(vertices, 0);
+ double x;
+ double y;
+ x = *(double*)(vertex_in);
+ y = *(double*)(vertex_in + stride0);
+ *vertex_out++ = a*x + c*y + e;
+ *vertex_out++ = b*x + d*y + f;
+ }
+ } catch (...) {
+ Py_XDECREF(vertices);
+ Py_XDECREF(transform);
+ Py_XDECREF(result);
+ }
+
+ Py_XDECREF(vertices);
+ Py_XDECREF(transform);
+
+ return Py::Object((PyObject*)result, true);
+}
+
extern "C"
DL_EXPORT(void)
init_path(void)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-15 15:15:22
|
Revision: 4304
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4304&view=rev
Author: mdboom
Date: 2007-11-15 07:15:21 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Minor speed improvements.
Modified Paths:
--------------
branches/transforms/lib/matplotlib/lines.py
Modified: branches/transforms/lib/matplotlib/lines.py
===================================================================
--- branches/transforms/lib/matplotlib/lines.py 2007-11-15 15:14:47 UTC (rev 4303)
+++ branches/transforms/lib/matplotlib/lines.py 2007-11-15 15:15:21 UTC (rev 4304)
@@ -395,8 +395,6 @@
self._xorig = x
self._yorig = y
self.recache()
- else:
- self._transformed_path = TransformedPath(self._path, self.get_transform())
def recache(self):
#if self.axes is None: print 'recache no axes'
@@ -741,11 +739,11 @@
gc, Path.unit_circle(), transform, path, path_trans,
rgbFace)
-
+ _draw_pixel_transform = Affine2D().translate(-0.5, -0.5)
def _draw_pixel(self, renderer, gc, path, path_trans):
rgbFace = self._get_rgb_face()
- transform = Affine2D().translate(-0.5, -0.5)
- renderer.draw_markers(gc, Path.unit_rectangle(), transform,
+ renderer.draw_markers(gc, Path.unit_rectangle(),
+ self._draw_pixel_transform,
path, path_trans, rgbFace)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-15 15:14:48
|
Revision: 4303
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4303&view=rev
Author: mdboom
Date: 2007-11-15 07:14:47 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Cairo backend fixes:
- Avoid crash when path is too long
- Fix alpha filling
- Fix path clipping
Modified Paths:
--------------
branches/transforms/lib/matplotlib/backends/backend_cairo.py
Modified: branches/transforms/lib/matplotlib/backends/backend_cairo.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_cairo.py 2007-11-15 15:13:38 UTC (rev 4302)
+++ branches/transforms/lib/matplotlib/backends/backend_cairo.py 2007-11-15 15:14:47 UTC (rev 4303)
@@ -105,29 +105,18 @@
# font transform?
- def _fill_and_stroke (self, ctx, fill_c):
- #assert fill_c or stroke_c
-
- #_.ctx.save()
-
+ def _fill_and_stroke (self, ctx, fill_c, alpha):
if fill_c is not None:
ctx.save()
if len(fill_c) == 3:
- ctx.set_source_rgb (*fill_c)
+ ctx.set_source_rgba (fill_c[0], fill_c[1], fill_c[2], alpha)
else:
ctx.set_source_rgba (*fill_c)
- #if stroke_c: # always (implicitly) set at the moment
ctx.fill_preserve()
- #else:
- # ctx.fill()
ctx.restore()
-
- #if stroke_c: # always stroke
- #ctx.set_source_rgb (stroke_c) # is already set
ctx.stroke()
- #_.ctx.restore() # revert to the default attributes
-
+
#@staticmethod
def convert_path(ctx, tpath):
for points, code in tpath.iter_segments():
@@ -144,19 +133,23 @@
elif code == Path.CLOSEPOLY:
ctx.close_path()
convert_path = staticmethod(convert_path)
-
+
+
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
- ctx.new_path()
transform = transform + \
Affine2D().scale(1.0, -1.0).translate(0, self.height)
tpath = transform.transform_path(path)
+ ctx.new_path()
self.convert_path(ctx, tpath)
- self._fill_and_stroke(ctx, rgbFace)
+ self._fill_and_stroke(ctx, rgbFace, gc.get_alpha())
- def draw_image(self, x, y, im, bbox):
+ def draw_image(self, x, y, im, bbox, clippath=None, clippath_trans=None):
# bbox - not currently used
if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
@@ -288,8 +281,8 @@
def points_to_pixels(self, points):
if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
return points/72.0 * self.dpi
-
-
+
+
class GraphicsContextCairo(GraphicsContextBase):
_joind = {
'bevel' : cairo.LINE_JOIN_BEVEL,
@@ -389,7 +382,7 @@
self._linewidth = w
self.ctx.set_line_width (self.renderer.points_to_pixels(w))
-
+
def new_figure_manager(num, *args, **kwargs): # called by backends/__init__.py
"""
Create a new figure manager instance
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-15 15:13:45
|
Revision: 4302
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4302&view=rev
Author: mdboom
Date: 2007-11-15 07:13:38 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
Fix Subplot backward-incompatibility.
Modified Paths:
--------------
branches/transforms/lib/matplotlib/axes.py
Modified: branches/transforms/lib/matplotlib/axes.py
===================================================================
--- branches/transforms/lib/matplotlib/axes.py 2007-11-15 14:59:53 UTC (rev 4301)
+++ branches/transforms/lib/matplotlib/axes.py 2007-11-15 15:13:38 UTC (rev 4302)
@@ -5465,6 +5465,7 @@
for label in self.get_yticklabels():
label.set_visible(firstcol)
+_subplot_classes = {}
def subplot_class_factory(axes_class=None):
# This makes a new class that inherits from SubclassBase and the
# given axes_class (which is assumed to be a subclass of Axes).
@@ -5472,11 +5473,21 @@
# This is perhaps a little bit roundabout to make a new class on
# the fly like this, but it means that a new Subplot class does
# not have to be created for every type of Axes.
- new_class = new.classobj("%sSubplot" % (axes_class.__name__),
- (SubplotBase, axes_class),
- {'_axes_class': axes_class})
+ if axes_class is None:
+ axes_class = Axes
+
+ new_class = _subplot_classes.get(axes_class)
+ if new_class is None:
+ new_class = new.classobj("%sSubplot" % (axes_class.__name__),
+ (SubplotBase, axes_class),
+ {'_axes_class': axes_class})
+ _subplot_classes[axes_class] = new_class
+
return new_class
-
+
+# This is provided for backward compatibility
+Subplot = subplot_class_factory()
+
martist.kwdocd['Axes'] = martist.kwdocd['Subplot'] = martist.kwdoc(Axes)
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-15 14:59:59
|
Revision: 4301
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4301&view=rev
Author: jswhit
Date: 2007-11-15 06:59:53 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
link geos lib too (necessary if they are static libs)
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-15 14:59:03 UTC (rev 4300)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-15 14:59:53 UTC (rev 4301)
@@ -80,7 +80,7 @@
extensions.append(Extension("matplotlib.toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
# for some reason, pickling won't work if this extension is installed
# as "matplotlib.toolkits.basemap._geos"
-extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c']))
+extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c','geos']))
# install shapelib and dbflib.
packages = packages + ['shapelib','dbflib']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-15 14:59:08
|
Revision: 4300
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4300&view=rev
Author: jswhit
Date: 2007-11-15 06:59:03 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
dont build geostest
Modified Paths:
--------------
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in
Modified: trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in
===================================================================
--- trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in 2007-11-15 13:19:14 UTC (rev 4299)
+++ trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in 2007-11-15 14:59:03 UTC (rev 4300)
@@ -294,9 +294,6 @@
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
-geostest$(EXEEXT): $(geostest_OBJECTS) $(geostest_DEPENDENCIES)
- @rm -f geostest$(EXEEXT)
- $(LINK) $(geostest_LDFLAGS) $(geostest_OBJECTS) $(geostest_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-15 13:19:17
|
Revision: 4299
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4299&view=rev
Author: jswhit
Date: 2007-11-15 05:19:14 -0800 (Thu, 15 Nov 2007)
Log Message:
-----------
updated install instructions for MacOS X
Modified Paths:
--------------
trunk/toolkits/basemap-testing/README
Modified: trunk/toolkits/basemap-testing/README
===================================================================
--- trunk/toolkits/basemap-testing/README 2007-11-14 22:58:40 UTC (rev 4298)
+++ trunk/toolkits/basemap-testing/README 2007-11-15 13:19:14 UTC (rev 4299)
@@ -84,6 +84,26 @@
3) cd back to the top level basemap directory (basemap-X.Y.Z) and
run the usual 'python setup.py install'.
+Note for Mac OS X users:
+-----------------------
+On intel, your build may fail with a message like this:
+
+/usr/bin/ld: for architecture ppc /usr/bin/ld: warning
+/sw/lib/libgeos_c.dylib cputype (7, architecture i386) does not match
+cputype (18) for specified -arch flag: ppc (file not loaded) lipo: can't
+open input file: /var/tmp//ccJKju2Z.out (No such file or directory)
+error: Command "gcc -arch i386 -arch ppc -isysroot
+/Developer/SDKs/MacOSX10.4u.sdk -g -bundle -undefined dynamic_lookup
+build/temp.macosx-10.3-fat-2.4/src/_geos.o -L/sw/lib -L/sw/lib -lgeos_c
+-o build/lib.macosx-10.3-fat-2.4/_geos.so" failed with exit status 1
+
+If so, just cut and past the gcc command in double quotes, removing the
+'-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk' flags. Then run
+'setup.py install' again to finish the build.
+
+On ppc, there may be a similar failure, but remove the '-arch i386' flag
+instead.
+
**Contact**
Jeff Whitaker <jef...@no...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 22:58:44
|
Revision: 4298
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4298&view=rev
Author: jswhit
Date: 2007-11-14 14:58:40 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
fix building of _geos extension
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-14 22:51:09 UTC (rev 4297)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-14 22:58:40 UTC (rev 4298)
@@ -80,7 +80,7 @@
extensions.append(Extension("matplotlib.toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
# for some reason, pickling won't work if this extension is installed
# as "matplotlib.toolkits.basemap._geos"
-extensions.append(Extension("_geos",deps+['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c']))
+extensions.append(Extension("_geos",['src/_geos.c'],library_dirs=geos_library_dirs,include_dirs=geos_include_dirs,runtime_library_dirs=geos_library_dirs,libraries=['geos_c']))
# install shapelib and dbflib.
packages = packages + ['shapelib','dbflib']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 22:51:10
|
Revision: 4297
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4297&view=rev
Author: jswhit
Date: 2007-11-14 14:51:09 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
added full-resolution data files.
Added Paths:
-----------
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_f.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_f.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhs_f.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhsmeta_f.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/rivers_f.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_f.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/states_f.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/statesmeta_f.dat
Added: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_f.dat
===================================================================
(Binary files differ)
Property changes on: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_f.dat
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_f.dat
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_f.dat (rev 0)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_f.dat 2007-11-14 22:51:09 UTC (rev 4297)
@@ -0,0 +1,4245 @@
+-1 -1 52 70.00000 70.08890 0 416
+-1 -1 20 70.00000 70.08830 416 160
+-1 -1 2 70.06720 70.06880 576 16
+-1 -1 14 69.00000 69.05750 592 112
+-1 -1 57 69.00000 69.09640 704 456
+-1 -1 69 69.03330 69.32610 1160 552
+-1 -1 6 69.00000 69.07620 1712 48
+-1 -1 143 69.00000 69.71070 1760 1144
+-1 -1 93 69.71070 69.95190 2904 744
+-1 -1 38 69.90780 70.00000 3648 304
+-1 -1 4 69.99260 70.00000 3952 32
+-1 -1 19 69.00000 69.05060 3984 152
+-1 -1 83 69.72160 69.99260 4136 664
+-1 -1 63 69.03810 69.31650 4800 504
+-1 -1 90 69.31650 69.72160 5304 720
+-1 -1 105 69.02830 69.46890 6024 840
+-1 -1 143 69.46890 69.79360 6864 1144
+-1 -1 21 69.00000 69.64560 8008 168
+-1 -1 5 68.00000 68.05100 8176 40
+-1 -1 42 68.00000 68.09060 8216 336
+-1 -1 51 68.05100 68.53920 8552 408
+-1 -1 5 68.53000 68.55950 8960 40
+-1 -1 38 68.33670 68.48040 9000 304
+-1 -1 30 68.55950 69.00000 9304 240
+-1 -1 32 68.37670 68.53000 9544 256
+-1 -1 31 68.87900 69.00000 9800 248
+-1 -1 107 68.52210 68.87900 10048 856
+-1 -1 37 68.69140 69.00000 10904 296
+-1 -1 96 68.30560 68.52210 11200 768
+-1 -1 95 68.62860 68.83390 11968 760
+-1 -1 88 68.00000 68.30560 12728 704
+-1 -1 102 68.55690 68.83030 13432 816
+-1 -1 100 68.60970 69.00000 14248 800
+-1 -1 146 68.14310 69.00000 15048 1168
+-1 -1 15 68.00000 68.14310 16216 120
+-1 -1 32 68.00000 69.00000 16336 256
+-1 -1 111 67.00000 67.97710 16592 888
+-1 -1 24 67.94560 68.00000 17480 192
+-1 -1 3 67.97710 68.00000 17672 24
+-1 -1 238 67.00000 68.00000 17696 1904
+-1 -1 19 67.70550 68.00000 19600 152
+-1 -1 135 67.00000 67.67800 19752 1080
+-1 -1 4 67.67800 67.70550 20832 32
+-1 -1 23 67.00000 67.73280 20864 184
+-1 -1 10 67.73280 68.00000 21048 80
+-1 -1 22 66.00000 66.14950 21128 176
+-1 -1 51 66.14950 66.88320 21304 408
+-1 -1 10 66.88320 67.00000 21712 80
+-1 -1 45 66.81120 67.00000 21792 360
+-1 -1 167 66.05560 66.79150 22152 1336
+-1 -1 6 66.79150 66.81120 23488 48
+-1 -1 14 66.00000 66.05560 23536 112
+-1 -1 221 66.00000 67.00000 23648 1768
+-1 -1 32 66.00000 67.00000 25416 256
+-1 -1 120 65.00000 66.00000 25672 960
+-1 -1 47 65.51330 66.00000 26632 376
+-1 -1 10 65.95880 66.00000 27008 80
+-1 -1 190 65.00000 65.68650 27088 1520
+-1 -1 74 65.66500 65.95880 28608 592
+-1 -1 32 65.00000 66.00000 29200 256
+-1 -1 26 64.00000 64.06560 29456 208
+-1 -1 53 64.49300 64.87290 29664 424
+-1 -1 46 64.01310 64.09300 30088 368
+-1 -1 18 64.87290 65.00000 30456 144
+-1 -1 73 64.03170 64.49300 30600 584
+-1 -1 64 64.79250 65.00000 31184 512
+-1 -1 8 64.53680 64.59080 31696 64
+-1 -1 3 64.52370 64.53540 31760 24
+-1 -1 52 64.59080 64.79580 31784 416
+-1 -1 3 64.53540 64.53680 32200 24
+-1 -1 124 64.00000 64.52370 32224 992
+-1 -1 32 64.00000 65.00000 33216 256
+-1 -1 10 63.20959 63.32480 33472 80
+-1 -1 117 63.32480 64.00000 33552 936
+-1 -1 14 63.00000 63.20959 34488 112
+-1 -1 6 63.73330 63.75010 34600 48
+-1 -1 66 63.75010 64.00000 34648 528
+-1 -1 118 63.29960 63.73330 35176 944
+-1 -1 75 63.00000 63.29960 36120 600
+-1 -1 32 63.00000 64.00000 36720 256
+-1 -1 105 62.00000 63.00000 36976 840
+-1 -1 89 62.00000 62.36720 37816 712
+-1 -1 22 62.91440 63.00000 38528 176
+-1 -1 108 62.36720 62.91250 38704 864
+-1 -1 31 62.00000 63.00000 39568 248
+-1 -1 156 61.00000 62.00000 39816 1248
+-1 -1 46 61.00000 61.17640 41064 368
+-1 -1 140 61.17640 61.73620 41432 1120
+-1 -1 55 61.73620 62.00000 42552 440
+-1 -1 32 61.00000 62.00000 42992 256
+-1 -1 204 60.00000 61.00000 43248 1632
+-1 -1 30 60.54750 60.65780 44880 240
+-1 -1 13 60.25529 60.54560 45120 104
+-1 -1 91 60.65780 61.00000 45224 728
+-1 -1 22 60.32570 61.00000 45952 176
+-1 -1 47 60.19260 60.32570 46128 376
+-1 -1 65 60.00000 60.35220 46504 520
+-1 -1 201 59.00000 59.89780 47024 1608
+-1 -1 52 59.00000 59.10640 48632 416
+-1 -1 45 59.88580 60.00000 49048 360
+-1 -1 33 59.00000 59.15970 49408 264
+-1 -1 27 59.15970 59.30330 49672 216
+-1 -1 30 59.30220 59.35690 49888 240
+-1 -1 33 59.35250 59.47860 50128 264
+-1 -1 4 59.98540 60.00000 50392 32
+-1 -1 61 59.45470 59.98540 50424 488
+-1 -1 11 59.00000 59.08890 50912 88
+-1 -1 36 59.00000 59.45470 51000 288
+-1 -1 105 59.08890 59.66479 51288 840
+-1 -1 6 59.33030 59.37531 52128 48
+-1 -1 91 59.39370 59.80190 52176 728
+-1 -1 57 59.00000 59.33030 52904 456
+-1 -1 4 59.37531 59.39370 53360 32
+-1 -1 11 58.91360 58.95590 53392 88
+-1 -1 58 58.88360 59.00000 53480 464
+-1 -1 16 58.95590 59.00000 53944 128
+-1 -1 25 58.00000 58.02950 54072 200
+-1 -1 4 58.00000 58.00080 54272 32
+-1 -1 72 58.00000 58.08440 54304 576
+-1 -1 55 58.00000 58.07670 54880 440
+-1 -1 207 58.00970 59.00000 55320 1656
+-1 -1 7 58.00000 58.00970 56976 56
+-1 -1 47 58.90610 59.00000 57032 376
+-1 -1 47 58.78050 59.00000 57408 376
+-1 -1 110 58.00000 58.78050 57784 880
+-1 -1 22 57.98000 58.00000 58664 176
+-1 -1 87 57.86890 58.00000 58840 696
+-1 -1 107 57.85390 58.00000 59536 856
+-1 -1 11 57.99220 58.00000 60392 88
+-1 -1 241 57.52220 57.85630 60480 1928
+-1 -1 67 57.52220 57.61700 62408 536
+-1 -1 218 57.00000 57.53640 62944 1744
+-1 -1 201 57.53580 58.00000 64688 1608
+-1 -1 14 57.95500 58.00000 66296 112
+-1 -1 205 57.00000 57.95500 66408 1640
+-1 -1 193 56.07809 56.39670 68048 1544
+-1 -1 193 56.07809 56.39670 69592 1544
+-1 -1 175 56.35670 56.42440 71136 1400
+-1 -1 175 56.35670 56.42440 72536 1400
+-1 -1 194 56.30560 56.38110 73936 1552
+-1 -1 194 56.30560 56.38110 75488 1552
+-1 -1 236 56.26110 56.45081 77040 1888
+-1 -1 236 56.26110 56.45081 78928 1888
+-1 -1 186 56.00000 56.29560 80816 1488
+-1 -1 186 56.00000 56.29560 82304 1488
+-1 -1 152 56.69490 57.00000 83792 1216
+-1 -1 56 56.00000 56.12580 85008 448
+-1 -1 56 56.00000 56.12580 85456 448
+-1 -1 14 56.00000 56.02130 85904 112
+-1 -1 129 56.00000 56.14940 86016 1032
+-1 -1 14 56.00000 56.02130 87048 112
+-1 -1 129 56.00000 56.14940 87160 1032
+-1 -1 174 56.15110 56.69490 88192 1392
+-1 -1 35 56.12580 56.16780 89584 280
+-1 -1 35 56.12580 56.16780 89864 280
+-1 -1 36 56.00000 56.03280 90144 288
+-1 -1 36 56.00000 56.03280 90432 288
+-1 -1 17 56.83800 57.00000 90720 136
+-1 -1 130 56.39190 56.83800 90856 1040
+-1 -1 66 56.00000 56.39190 91896 528
+-1 -1 14 55.00000 55.08640 92424 112
+-1 -1 154 55.07780 55.28860 92536 1232
+-1 -1 112 55.02670 55.08850 93768 896
+-1 -1 21 55.00000 55.07190 94664 168
+-1 -1 24 55.95890 56.00000 94832 192
+-1 -1 24 55.95890 56.00000 95024 192
+-1 -1 139 55.67500 55.95890 95216 1112
+-1 -1 139 55.67500 55.95890 96328 1112
+-1 -1 333 55.00000 55.67470 97440 2664
+-1 -1 333 55.00000 55.67470 100104 2664
+-1 -1 94 55.67500 55.83470 102768 752
+-1 -1 94 55.67500 55.83470 103520 752
+-1 -1 70 55.78720 55.84669 104272 560
+-1 -1 70 55.78720 55.84669 104832 560
+-1 -1 71 55.79190 56.00000 105392 568
+-1 -1 71 55.79190 56.00000 105960 568
+-1 -1 41 55.78889 55.82640 106528 328
+-1 -1 41 55.78889 55.82640 106856 328
+-1 -1 59 55.94220 56.00000 107184 472
+-1 -1 59 55.94220 56.00000 107656 472
+-1 -1 235 55.68890 56.00000 108128 1880
+-1 -1 235 55.68890 56.00000 110008 1880
+-1 -1 202 55.59360 55.86610 111888 1616
+-1 -1 202 55.59360 55.86610 113504 1616
+-1 -1 24 55.00000 55.03470 115120 192
+-1 -1 11 55.09400 55.12300 115312 88
+-1 -1 159 55.14570 55.60310 115400 1272
+-1 -1 26 55.02640 55.09400 116672 208
+-1 -1 9 55.12300 55.14570 116880 72
+-1 -1 137 55.00000 55.36720 116952 1096
+-1 -1 37 55.28280 55.37061 118048 296
+-1 -1 27 55.35450 55.44470 118344 216
+-1 -1 14 55.28720 55.35450 118560 112
+-1 -1 52 55.20420 55.43550 118672 416
+-1 -1 95 55.08580 55.31890 119088 760
+-1 -1 10 55.00000 55.05380 119848 80
+-1 -1 42 55.13890 55.29720 119928 336
+-1 -1 6 55.06110 55.08580 120264 48
+-1 -1 3 55.05380 55.06110 120312 24
+-1 -1 53 55.00000 55.26100 120336 424
+-1 -1 129 55.31890 56.00000 120760 1032
+-1 -1 16 55.26100 55.31890 121792 128
+-1 -1 39 55.00000 55.07060 121920 312
+-1 -1 36 54.88700 55.00000 122232 288
+-1 -1 69 54.78329 54.88700 122520 552
+-1 -1 5 54.76580 54.78329 123072 40
+-1 -1 67 54.41949 54.47670 123112 536
+-1 -1 147 54.35390 54.41949 123648 1176
+-1 -1 139 54.32560 54.35390 124824 1112
+-1 -1 157 54.33440 54.40860 125936 1256
+-1 -1 220 54.36501 55.00000 127192 1760
+-1 -1 167 54.00000 54.38310 128952 1336
+-1 -1 75 54.00000 54.15860 130288 600
+-1 -1 4 54.00000 54.00190 130888 32
+-1 -1 75 54.00000 54.15860 130920 600
+-1 -1 4 54.00000 54.00190 131520 32
+-1 -1 527 54.12970 54.95610 131552 4216
+-1 -1 527 54.12970 54.95610 135768 4216
+-1 -1 29 54.95040 54.97720 139984 232
+-1 -1 29 54.95040 54.97720 140216 232
+-1 -1 10 54.97720 55.00000 140448 80
+-1 -1 10 54.97720 55.00000 140528 80
+-1 -1 118 54.71330 55.00000 140608 944
+-1 -1 114 54.46080 54.71330 141552 912
+-1 -1 202 54.00220 54.46060 142464 1616
+-1 -1 2 54.00000 54.00220 144080 16
+-1 -1 30 54.00000 54.06920 144096 240
+-1 -1 6 54.00000 54.00190 144336 48
+-1 -1 3 54.00000 54.00031 144384 24
+-1 -1 9 54.00000 54.00890 144408 72
+-1 -1 41 54.00000 54.04000 144480 328
+-1 -1 63 54.00000 54.10860 144808 504
+-1 -1 48 54.09560 54.18781 145312 384
+-1 -1 13 54.19780 54.22410 145696 104
+-1 -1 12 54.26510 54.31250 145800 96
+-1 -1 76 54.16920 54.25999 145896 608
+-1 -1 54 54.34109 54.40970 146504 432
+-1 -1 54 54.34109 54.40970 146936 432
+-1 -1 12 54.22410 54.26510 147368 96
+-1 -1 77 54.29810 54.39250 147464 616
+-1 -1 202 54.31250 54.71360 148080 1616
+-1 -1 202 54.31250 54.71360 149696 1616
+-1 -1 101 54.64500 54.77310 151312 808
+-1 -1 6 54.61940 54.64310 152120 48
+-1 -1 6 54.61940 54.64310 152168 48
+-1 -1 131 54.77140 54.98330 152216 1048
+-1 -1 30 54.95030 55.00000 153264 240
+-1 -1 29 54.86710 55.00000 153504 232
+-1 -1 8 54.27790 54.33920 153736 64
+-1 -1 58 54.10330 54.25810 153800 464
+-1 -1 89 54.31750 54.86710 154264 712
+-1 -1 11 54.19310 54.27790 154976 88
+-1 -1 128 54.00000 54.38780 155064 1024
+-1 -1 77 54.00000 54.14530 156088 616
+-1 -1 8 54.00000 54.05550 156704 64
+-1 -1 39 54.00000 54.08690 156768 312
+-1 -1 13 54.11030 54.20430 157080 104
+-1 -1 19 54.00000 54.11530 157184 152
+-1 -1 239 54.00000 54.47860 157336 1912
+-1 -1 78 54.70780 55.00000 159248 624
+-1 -1 84 54.35720 54.54610 159872 672
+-1 -1 293 54.53080 55.00000 160544 2344
+-1 -1 349 54.11220 54.41780 162888 2792
+-1 -1 234 54.03690 54.40840 165680 1872
+-1 -1 186 53.32420 53.60750 167552 1488
+-1 -1 156 53.00000 53.32420 169040 1248
+-1 -1 119 53.00000 53.27000 170288 952
+-1 -1 301 53.00000 54.00000 171240 2408
+-1 -1 100 53.90470 53.95580 173648 800
+-1 -1 100 53.90470 53.95580 174448 800
+-1 -1 34 53.96860 54.00000 175248 272
+-1 -1 146 53.88810 54.00000 175520 1168
+-1 -1 34 53.96860 54.00000 176688 272
+-1 -1 146 53.88810 54.00000 176960 1168
+-1 -1 52 53.00000 53.12110 178128 416
+-1 -1 141 53.09440 53.21830 178544 1128
+-1 -1 46 53.77750 53.80530 179672 368
+-1 -1 60 53.80330 54.00000 180040 480
+-1 -1 218 53.08720 53.43890 180520 1744
+-1 -1 229 53.43860 53.82000 182264 1832
+-1 -1 29 53.61830 53.66420 184096 232
+-1 -1 9 53.89030 53.93430 184328 72
+-1 -1 20 53.00000 53.02190 184400 160
+-1 -1 22 53.00000 53.02970 184560 176
+-1 -1 258 53.13950 53.62000 184736 2064
+-1 -1 79 53.63920 53.89030 186800 632
+-1 -1 53 53.91250 54.00000 187432 424
+-1 -1 21 53.95530 54.00000 187856 168
+-1 -1 3 53.99969 54.00000 188024 24
+-1 -1 10 53.98810 54.00000 188048 80
+-1 -1 17 53.94189 54.00000 188128 136
+-1 -1 36 53.00000 53.13950 188264 288
+-1 -1 8 53.93970 54.00000 188552 64
+-1 -1 67 53.87939 54.00000 188616 536
+-1 -1 67 53.90891 54.00000 189152 536
+-1 -1 28 53.94860 54.00000 189688 224
+-1 -1 65 53.43610 54.00000 189912 520
+-1 -1 35 53.43610 53.65421 190432 280
+-1 -1 77 53.47169 53.84440 190712 616
+-1 -1 25 53.80670 54.00000 191328 200
+-1 -1 39 53.76360 54.00000 191528 312
+-1 -1 45 53.34579 53.76360 191840 360
+-1 -1 33 53.17599 53.34530 192200 264
+-1 -1 14 53.00000 53.17599 192464 112
+-1 -1 99 53.00000 53.28360 192576 792
+-1 -1 128 53.26920 53.42220 193368 1024
+-1 -1 131 53.41190 53.49471 194392 1048
+-1 -1 156 53.41410 53.55420 195440 1248
+-1 -1 178 53.08690 53.41410 196688 1424
+-1 -1 101 53.00000 53.19749 198112 808
+-1 -1 148 52.00000 52.22850 198920 1184
+-1 -1 222 52.43440 52.65421 200104 1776
+-1 -1 101 52.22850 52.44980 201880 808
+-1 -1 149 52.63250 53.00000 202688 1192
+-1 -1 517 52.00000 53.00000 203880 4136
+-1 -1 424 52.00000 53.00000 208016 3392
+-1 -1 42 52.00000 52.08310 211408 336
+-1 -1 54 52.03640 52.11140 211744 432
+-1 -1 339 52.10810 53.00000 212176 2712
+-1 -1 141 52.04560 52.12000 214888 1128
+-1 -1 249 52.04330 52.33580 216016 1992
+-1 -1 250 52.22231 52.37970 218008 2000
+-1 -1 77 52.00000 52.22231 220008 616
+-1 -1 3 52.00000 52.00080 220624 24
+-1 -1 3 52.00000 52.00031 220648 24
+-1 -1 89 52.00000 52.31860 220672 712
+-1 -1 99 52.39510 52.87780 221384 792
+-1 -1 3 52.97690 52.97890 222176 24
+-1 -1 2 52.00000 52.00080 222200 16
+-1 -1 15 52.31860 52.39510 222216 120
+-1 -1 20 52.87780 52.97690 222336 160
+-1 -1 13 52.97890 53.00000 222496 104
+-1 -1 15 52.99190 53.00000 222600 120
+-1 -1 66 52.93750 53.00000 222720 528
+-1 -1 20 52.94901 53.00000 223248 160
+-1 -1 63 52.07540 53.00000 223408 504
+-1 -1 7 52.00000 52.07540 223912 56
+-1 -1 50 52.00000 52.14360 223968 400
+-1 -1 39 52.00000 52.08770 224368 312
+-1 -1 314 52.00000 53.00000 224680 2512
+-1 -1 96 52.75970 53.00000 227192 768
+-1 -1 22 52.57070 52.66120 227960 176
+-1 -1 48 52.66120 52.78550 228136 384
+-1 -1 194 52.00000 52.59000 228520 1552
+-1 -1 29 51.00000 51.09109 230072 232
+-1 -1 176 51.20530 51.37330 230304 1408
+-1 -1 323 51.23810 51.50360 231712 2584
+-1 -1 74 51.00000 51.08200 234296 592
+-1 -1 69 51.73540 51.83141 234888 552
+-1 -1 307 51.00000 51.48720 235440 2456
+-1 -1 364 51.08200 51.73540 237896 2912
+-1 -1 322 51.82809 52.00000 240808 2576
+-1 -1 124 51.00000 51.05360 243384 992
+-1 -1 9 51.00000 51.00860 244376 72
+-1 -1 58 51.00000 51.14310 244448 464
+-1 -1 5 51.15460 51.16240 244912 40
+-1 -1 333 51.31850 52.00000 244952 2664
+-1 -1 41 51.00000 51.02810 247616 328
+-1 -1 21 51.00000 51.01920 247944 168
+-1 -1 7 51.14310 51.15460 248112 56
+-1 -1 66 51.16240 51.31850 248168 528
+-1 -1 357 51.00000 52.00000 248696 2856
+-1 -1 117 51.51860 51.65250 251552 936
+-1 -1 216 51.59340 51.91479 252488 1728
+-1 -1 99 51.91479 51.96030 254216 792
+-1 -1 73 51.91100 51.93920 255008 584
+-1 -1 187 51.74890 51.91750 255592 1496
+-1 -1 168 51.46560 51.63029 257088 1344
+-1 -1 134 51.59579 51.77110 258432 1072
+-1 -1 291 51.41110 51.66110 259504 2328
+-1 -1 127 51.37310 51.63860 261832 1016
+-1 -1 159 51.37500 51.49969 262848 1272
+-1 -1 139 51.25280 51.49330 264120 1112
+-1 -1 264 51.25310 51.94440 265232 2112
+-1 -1 39 51.94440 52.00000 267344 312
+-1 -1 84 51.84390 52.00000 267656 672
+-1 -1 164 51.17140 51.26390 268328 1312
+-1 -1 211 51.36810 51.84330 269640 1688
+-1 -1 41 51.25940 51.36890 271328 328
+-1 -1 131 51.00000 51.22141 271656 1048
+-1 -1 99 51.00000 51.23430 272704 792
+-1 -1 210 51.23430 51.76920 273496 1680
+-1 -1 34 51.68719 51.76940 275176 272
+-1 -1 229 51.45470 51.69420 275448 1832
+-1 -1 125 51.46440 51.78220 277280 1000
+-1 -1 68 51.44860 51.50420 278280 544
+-1 -1 123 51.16840 51.50670 278824 984
+-1 -1 52 51.47530 51.51500 279808 416
+-1 -1 33 51.00000 51.03720 280224 264
+-1 -1 44 51.00000 51.16840 280488 352
+-1 -1 55 51.00000 51.09310 280840 440
+-1 -1 43 51.00000 51.08330 281280 344
+-1 -1 25 51.00000 51.12000 281624 200
+-1 -1 55 51.00000 51.10941 281824 440
+-1 -1 29 51.07440 51.12000 282264 232
+-1 -1 52 51.00000 51.15610 282496 416
+-1 -1 55 51.05390 51.15610 282912 440
+-1 -1 2 51.08470 51.08470 283352 16
+-1 -1 8 51.99890 52.00000 283368 64
+-1 -1 155 51.62000 52.00000 283432 1240
+-1 -1 28 51.49360 51.62000 284672 224
+-1 -1 56 51.00000 51.26470 284896 448
+-1 -1 67 51.42330 51.49390 285344 536
+-1 -1 42 51.26670 51.43000 285880 336
+-1 -1 41 51.00000 51.66920 286216 328
+-1 -1 21 51.66920 52.00000 286544 168
+-1 -1 138 51.00000 51.31440 286712 1104
+-1 -1 60 51.00000 51.20420 287816 480
+-1 -1 6 51.00000 51.00250 288296 48
+-1 -1 15 51.00000 51.00280 288344 120
+-1 -1 80 51.00000 51.37600 288464 640
+-1 -1 182 51.37600 52.00000 289104 1456
+-1 -1 111 51.74160 52.00000 290560 888
+-1 -1 123 51.59460 51.74670 291448 984
+-1 -1 140 51.39460 51.59460 292432 1120
+-1 -1 100 51.00000 51.39460 293552 800
+-1 -1 131 51.00000 51.50170 294352 1048
+-1 -1 145 51.50170 52.00000 295400 1160
+-1 -1 300 51.00780 52.00000 296560 2400
+-1 -1 4 51.00000 51.00780 298960 32
+-1 -1 166 50.69610 51.00000 298992 1328
+-1 -1 327 50.30560 50.79330 300320 2616
+-1 -1 127 50.00000 50.16750 302936 1016
+-1 -1 175 50.00000 50.35609 303952 1400
+-1 -1 17 50.78300 50.80420 305352 136
+-1 -1 40 50.97190 51.00000 305488 320
+-1 -1 170 50.75360 51.00000 305808 1360
+-1 -1 90 50.00000 50.17430 307168 720
+-1 -1 502 50.00000 50.78300 307888 4016
+-1 -1 103 50.80050 50.98060 311904 824
+-1 -1 4 50.75620 50.75670 312728 32
+-1 -1 57 50.12670 50.18221 312760 456
+-1 -1 361 50.16750 50.45440 313216 2888
+-1 -1 181 50.00000 50.32310 316104 1448
+-1 -1 375 50.43030 50.81530 317552 3000
+-1 -1 194 50.80140 51.00000 320552 1552
+-1 -1 194 50.81810 51.00000 322104 1552
+-1 -1 8 50.90750 50.92200 323656 64
+-1 -1 14 50.98170 51.00000 323720 112
+-1 -1 59 50.86580 51.00000 323832 472
+-1 -1 19 50.86640 50.90750 324304 152
+-1 -1 29 50.92200 50.98580 324456 232
+-1 -1 17 50.98860 51.00000 324688 136
+-1 -1 321 50.66920 51.00000 324824 2568
+-1 -1 7 50.60520 50.61510 327392 56
+-1 -1 29 50.61510 50.67430 327448 232
+-1 -1 589 50.09750 50.67060 327680 4712
+-1 -1 100 50.29720 50.44030 332392 800
+-1 -1 43 50.21470 50.29720 333192 344
+-1 -1 460 50.00000 50.42419 333536 3680
+-1 -1 13 50.00000 50.00790 337216 104
+-1 -1 82 50.00000 50.05920 337320 656
+-1 -1 211 50.00000 50.41210 337976 1688
+-1 -1 30 50.76440 50.83110 339664 240
+-1 -1 30 50.92390 51.00000 339904 240
+-1 -1 126 50.41210 50.76690 340144 1008
+-1 -1 65 50.82780 50.92390 341152 520
+-1 -1 294 50.34669 50.95940 341672 2352
+-1 -1 14 50.95940 51.00000 344024 112
+-1 -1 251 50.21220 50.43920 344136 2008
+-1 -1 264 50.00000 50.43970 346144 2112
+-1 -1 69 50.00000 50.07390 348256 552
+-1 -1 103 50.19830 50.46080 348808 824
+-1 -1 92 50.00000 50.37690 349632 736
+-1 -1 198 50.00000 50.67200 350368 1584
+-1 -1 46 50.00000 50.19830 351952 368
+-1 -1 100 50.67200 51.00000 352320 800
+-1 -1 37 50.89861 51.00000 353120 296
+-1 -1 119 50.52831 51.00000 353416 952
+-1 -1 121 50.52859 51.00000 354368 968
+-1 -1 174 50.53250 50.90250 355336 1392
+-1 -1 22 50.97780 51.00000 356728 176
+-1 -1 98 50.67210 51.00000 356904 784
+-1 -1 91 50.86470 51.00000 357688 728
+-1 -1 101 50.68110 51.00000 358416 808
+-1 -1 214 50.47830 50.85110 359224 1712
+-1 -1 133 50.65970 50.86501 360936 1064
+-1 -1 89 50.71190 51.00000 362000 712
+-1 -1 24 50.80830 51.00000 362712 192
+-1 -1 117 50.75670 51.00000 362904 936
+-1 -1 57 50.73580 50.79330 363840 456
+-1 -1 116 50.73610 51.00000 364296 928
+-1 -1 159 50.70940 50.91810 365224 1272
+-1 -1 28 50.88920 51.00000 366496 224
+-1 -1 9 50.99440 51.00000 366720 72
+-1 -1 100 50.69370 51.00000 366792 800
+-1 -1 211 50.08250 50.69370 367592 1688
+-1 -1 4 50.00000 50.00310 369280 32
+-1 -1 25 50.00310 50.08250 369312 200
+-1 -1 162 50.00000 50.42120 369512 1296
+-1 -1 145 50.42120 50.71500 370808 1160
+-1 -1 204 50.64709 50.87469 371968 1632
+-1 -1 121 50.57890 50.64709 373600 968
+-1 -1 194 50.02440 50.58360 374568 1552
+-1 -1 10 50.00000 50.03700 376120 80
+-1 -1 22 50.00000 50.02610 376200 176
+-1 -1 10 50.00000 50.00690 376376 80
+-1 -1 5 50.00000 50.00730 376456 40
+-1 -1 23 50.73050 50.82780 376496 184
+-1 -1 38 50.86520 51.00000 376680 304
+-1 -1 178 50.00730 50.73050 376984 1424
+-1 -1 10 50.82780 50.86520 378408 80
+-1 -1 201 50.30290 51.00000 378488 1608
+-1 -1 145 50.13560 50.31281 380096 1160
+-1 -1 136 50.14170 50.39170 381256 1088
+-1 -1 128 50.39170 50.48360 382344 1024
+-1 -1 143 50.20360 50.40750 383368 1144
+-1 -1 76 50.00000 50.20360 384512 608
+-1 -1 71 50.00000 50.16780 385120 568
+-1 -1 140 50.16180 50.28419 385688 1120
+-1 -1 46 50.00000 50.16180 386808 368
+-1 -1 37 50.00000 50.02831 387176 296
+-1 -1 266 50.00000 51.00000 387472 2128
+-1 -1 195 50.20830 51.00000 389600 1560
+-1 -1 41 50.00000 50.20309 391160 328
+-1 -1 103 49.78889 50.00000 391488 824
+-1 -1 115 49.93860 50.00000 392312 920
+-1 -1 326 49.44830 49.79970 393232 2608
+-1 -1 256 49.54500 50.00000 395840 2048
+-1 -1 630 49.15310 50.00000 397888 5040
+-1 -1 114 49.44720 49.50830 402928 912
+-1 -1 367 49.02320 49.19160 403840 2936
+-1 -1 19 49.00000 49.02320 406776 152
+-1 -1 419 49.30680 50.00000 406928 3352
+-1 -1 177 49.00000 49.30680 410280 1416
+-1 -1 8 49.00000 49.01640 411696 64
+-1 -1 31 49.00000 49.01891 411760 248
+-1 -1 41 49.97639 50.00000 412008 328
+-1 -1 106 49.00000 49.02900 412336 848
+-1 -1 435 49.39400 50.00000 413184 3480
+-1 -1 546 49.02100 49.51801 416664 4368
+-1 -1 483 49.19170 49.61169 421032 3864
+-1 -1 285 49.17530 49.41810 424896 2280
+-1 -1 273 49.29180 49.45670 427176 2184
+-1 -1 138 49.07830 49.29180 429360 1104
+-1 -1 402 49.00000 49.85060 430464 3216
+-1 -1 58 49.85060 50.00000 433680 464
+-1 -1 22 49.94690 50.00000 434144 176
+-1 -1 18 49.90140 49.94690 434320 144
+-1 -1 53 49.90421 50.00000 434464 424
+-1 -1 157 49.80670 50.00000 434888 1256
+-1 -1 261 49.54940 49.88110 436144 2088
+-1 -1 85 49.00000 49.14970 438232 680
+-1 -1 25 49.60330 49.61670 438912 200
+-1 -1 22 49.14970 49.18390 439112 176
+-1 -1 93 49.18390 49.60060 439288 744
+-1 -1 85 49.25150 49.89760 440032 680
+-1 -1 17 49.00000 49.05460 440712 136
+-1 -1 43 49.89760 50.00000 440848 344
+-1 -1 42 49.05460 49.25150 441192 336
+-1 -1 133 49.81689 50.00000 441528 1064
+-1 -1 23 49.90120 50.00000 442592 184
+-1 -1 202 49.48470 49.90120 442776 1616
+-1 -1 47 49.00000 49.11280 444392 376
+-1 -1 280 49.30900 49.80251 444768 2240
+-1 -1 151 49.00000 49.17330 447008 1208
+-1 -1 21 49.16250 49.18300 448216 168
+-1 -1 72 49.09220 49.30900 448384 576
+-1 -1 205 49.18300 49.54890 448960 1640
+-1 -1 225 49.46250 49.97810 450600 1800
+-1 -1 7 49.97810 50.00000 452400 56
+-1 -1 108 49.89330 50.00000 452456 864
+-1 -1 20 49.94420 50.00000 453320 160
+-1 -1 13 49.95980 50.00000 453480 104
+-1 -1 133 49.86310 50.00000 453584 1064
+-1 -1 174 49.73080 50.00000 454648 1392
+-1 -1 61 49.66610 49.94580 456040 488
+-1 -1 79 49.94250 50.00000 456528 632
+-1 -1 161 49.33141 49.67720 457160 1288
+-1 -1 134 49.19000 49.36030 458448 1072
+-1 -1 143 49.14220 49.25500 459520 1144
+-1 -1 143 49.20950 49.41610 460664 1144
+-1 -1 140 49.41610 49.59100 461808 1120
+-1 -1 117 49.59100 50.00000 462928 936
+-1 -1 118 49.88060 50.00000 463864 944
+-1 -1 153 49.00000 50.00000 464808 1224
+-1 -1 11 49.97660 50.00000 466032 88
+-1 -1 47 49.70560 49.82940 466120 376
+-1 -1 140 49.50780 49.70560 466496 1120
+-1 -1 163 49.58590 49.98690 467616 1304
+-1 -1 10 49.99060 50.00000 468920 80
+-1 -1 13 49.97639 49.98940 469000 104
+-1 -1 125 49.57720 50.00000 469104 1000
+-1 -1 170 49.43750 49.61169 470104 1360
+-1 -1 216 49.00000 49.43750 471464 1728
+-1 -1 2 49.00000 49.00000 473192 16
+-1 -1 2 49.00000 49.00000 473208 16
+-1 -1 2 49.00000 49.00000 473224 16
+-1 -1 2 49.00000 49.00000 473240 16
+-1 -1 2 49.00000 49.00000 473256 16
+-1 -1 2 49.00000 49.00000 473272 16
+-1 -1 2 49.00000 49.00000 473288 16
+-1 -1 2 49.00000 49.00000 473304 16
+-1 -1 2 49.00000 49.00000 473320 16
+-1 -1 2 49.00000 49.00000 473336 16
+-1 -1 2 49.00000 49.00000 473352 16
+-1 -1 2 49.00000 49.00000 473368 16
+-1 -1 2 49.00000 49.00000 473384 16
+-1 -1 2 49.00000 49.00000 473400 16
+-1 -1 2 49.00000 49.00000 473416 16
+-1 -1 2 49.00000 49.00000 473432 16
+-1 -1 2 49.00000 49.00000 473448 16
+-1 -1 2 49.00000 49.00000 473464 16
+-1 -1 2 49.00000 49.00000 473480 16
+-1 -1 2 49.00000 49.00000 473496 16
+-1 -1 2 49.00000 49.00000 473512 16
+-1 -1 2 49.00000 49.00000 473528 16
+-1 -1 2 49.00000 49.00000 473544 16
+-1 -1 2 49.00000 49.00000 473560 16
+-1 -1 2 49.00000 49.00000 473576 16
+-1 -1 2 49.00000 49.00000 473592 16
+-1 -1 2 49.00000 49.00000 473608 16
+-1 -1 2 49.00000 49.00000 473624 16
+-1 -1 2 49.00000 49.00000 473640 16
+-1 -1 2 49.00000 49.00000 473656 16
+-1 -1 2 49.00000 49.00000 473672 16
+-1 -1 2 49.00000 49.00000 473688 16
+-1 -1 2 49.00000 49.00000 473704 16
+-1 -1 2 49.00000 49.00000 473720 16
+-1 -1 2 49.00000 49.00000 473736 16
+-1 -1 2 49.00000 49.00000 473752 16
+-1 -1 2 49.00000 49.00000 473768 16
+-1 -1 2 49.00000 49.00000 473784 16
+-1 -1 2 49.00000 49.00000 473800 16
+-1 -1 2 49.00000 49.00000 473816 16
+-1 -1 2 49.00000 49.00000 473832 16
+-1 -1 2 49.00000 49.00000 473848 16
+-1 -1 2 49.00000 49.00000 473864 16
+-1 -1 2 49.00000 49.00000 473880 16
+-1 -1 2 49.00000 49.00000 473896 16
+-1 -1 2 49.00000 49.00000 473912 16
+-1 -1 2 49.00000 49.00000 473928 16
+-1 -1 2 49.00000 49.00000 473944 16
+-1 -1 2 49.00000 49.00000 473960 16
+-1 -1 2 49.00000 49.00000 473976 16
+-1 -1 2 49.00000 49.00000 473992 16
+-1 -1 3 49.00000 49.00031 474008 24
+-1 -1 2 49.00000 49.00000 474032 16
+-1 -1 2 49.00000 49.00000 474048 16
+-1 -1 2 49.00000 49.00000 474064 16
+-1 -1 2 49.00000 49.00000 474080 16
+-1 -1 2 49.00000 49.00000 474096 16
+-1 -1 4 49.00000 49.00031 474112 32
+-1 -1 2 49.00000 49.00000 474144 16
+-1 -1 2 49.00000 49.00000 474160 16
+-1 -1 2 49.00000 49.00000 474176 16
+-1 -1 2 49.00000 49.00000 474192 16
+-1 -1 2 49.00000 49.00000 474208 16
+-1 -1 3 49.00000 49.00031 474224 24
+-1 -1 2 49.00000 49.00000 474248 16
+-1 -1 2 49.00000 49.00000 474264 16
+-1 -1 2 49.00000 49.00000 474280 16
+-1 -1 3 49.00000 49.00031 474296 24
+-1 -1 2 49.00000 49.00000 474320 16
+-1 -1 2 49.00000 49.00000 474336 16
+-1 -1 2 49.00000 49.00000 474352 16
+-1 -1 2 49.00000 49.00000 474368 16
+-1 -1 2 49.00000 49.00000 474384 16
+-1 -1 2 49.00000 49.00000 474400 16
+-1 -1 2 49.00000 49.00000 474416 16
+-1 -1 2 49.00000 49.00000 474432 16
+-1 -1 2 49.00000 49.00000 474448 16
+-1 -1 2 49.00000 49.00000 474464 16
+-1 -1 3 49.00000 49.00031 474480 24
+-1 -1 2 49.00000 49.00000 474504 16
+-1 -1 3 49.00000 49.00031 474520 24
+-1 -1 3 49.00000 49.00031 474544 24
+-1 -1 2 49.00000 49.00000 474568 16
+-1 -1 2 49.00000 49.00000 474584 16
+-1 -1 2 49.00000 49.00000 474600 16
+-1 -1 2 49.00000 49.00000 474616 16
+-1 -1 2 49.00000 49.00000 474632 16
+-1 -1 2 49.00000 49.00000 474648 16
+-1 -1 2 49.00000 49.00000 474664 16
+-1 -1 3 49.00000 49.00031 474680 24
+-1 -1 2 49.00000 49.00000 474704 16
+-1 -1 2 49.00000 49.00000 474720 16
+-1 -1 2 49.00000 49.00000 474736 16
+-1 -1 3 49.00000 49.00031 474752 24
+-1 -1 3 49.00000 49.00031 474776 24
+-1 -1 3 49.00000 49.00031 474800 24
+-1 -1 2 49.00000 49.00000 474824 16
+-1 -1 2 49.00000 49.00000 474840 16
+-1 -1 2 49.00000 49.00000 474856 16
+-1 -1 2 49.00000 49.00000 474872 16
+-1 -1 2 49.00000 49.00000 474888 16
+-1 -1 2 49.00000 49.00000 474904 16
+-1 -1 2 49.00000 49.00000 474920 16
+-1 -1 2 49.00000 49.00000 474936 16
+-1 -1 2 49.00000 49.00000 474952 16
+-1 -1 3 49.00000 49.00031 474968 24
+-1 -1 2 49.00000 49.00000 474992 16
+-1 -1 2 49.00000 49.00000 475008 16
+-1 -1 35 49.00000 49.37670 475024 280
+-1 -1 107 49.00000 49.36220 475304 856
+-1 -1 257 48.00000 48.75670 476160 2056
+-1 -1 154 48.75470 49.00000 478216 1232
+-1 -1 111 48.00000 48.24300 479448 888
+-1 -1 439 48.24300 49.00000 480336 3512
+-1 -1 38 48.71370 48.77330 483848 304
+-1 -1 363 48.55640 49.00000 484152 2904
+-1 -1 228 48.78810 49.00000 487056 1824
+-1 -1 3 48.72300 48.72400 488880 24
+-1 -1 6 48.70399 48.70800 488904 48
+-1 -1 4 48.70100 48.70300 488952 32
+-1 -1 13 48.69400 48.69901 488984 104
+-1 -1 323 48.61400 48.69300 489088 2584
+-1 -1 396 48.16810 48.81330 491672 3168
+-1 -1 37 48.00000 48.02580 494840 296
+-1 -1 530 48.72400 49.00000 495136 4240
+-1 -1 27 48.70700 48.72300 499376 216
+-1 -1 6 48.70600 48.70800 499592 48
+-1 -1 6 48.70200 48.70399 499640 48
+-1 -1 11 48.69800 48.70100 499688 88
+-1 -1 7 48.69000 48.69600 499776 56
+-1 -1 18 48.14170 48.16810 499832 144
+-1 -1 61 48.01250 48.14360 499976 488
+-1 -1 47 48.00000 48.06850 500464 376
+-1 -1 250 48.04970 48.23390 500840 2000
+-1 -1 273 48.17030 48.57640 502840 2184
+-1 -1 245 48.34000 48.57610 505024 1960
+-1 -1 17 48.00000 48.01360 506984 136
+-1 -1 198 48.41190 49.00000 507120 1584
+-1 -1 279 48.00000 48.41859 508704 2232
+-1 -1 97 48.00000 48.10860 510936 776
+-1 -1 3 48.00000 48.00050 511712 24
+-1 -1 13 48.00000 48.00920 511736 104
+-1 -1 246 48.00000 48.26390 511840 1968
+-1 -1 18 48.12711 48.14890 513808 144
+-1 -1 129 48.25860 48.40500 513952 1032
+-1 -1 5 48.14890 48.15590 514984 40
+-1 -1 66 48.00000 48.13280 515024 528
+-1 -1 121 48.32021 48.48669 515552 968
+-1 -1 134 48.36280 48.46500 516520 1072
+-1 -1 6 48.00000 48.00999 517592 48
+-1 -1 203 48.07110 48.32021 517640 1624
+-1 -1 120 48.00970 48.16310 519264 960
+-1 -1 100 48.00000 48.24100 520224 800
+-1 -1 63 48.27750 48.36750 521024 504
+-1 -1 109 48.58810 48.82470 521528 872
+-1 -1 83 48.86000 49.00000 522400 664
+-1 -1 102 48.36750 48.58890 523064 816
+-1 -1 18 48.24100 48.29680 523880 144
+-1 -1 48 48.79700 48.89640 524024 384
+-1 -1 90 48.30110 49.00000 524408 720
+-1 -1 69 48.00000 48.24860 525128 552
+-1 -1 9 48.24860 48.30110 525680 72
+-1 -1 114 48.00000 48.43320 525752 912
+-1 -1 189 48.42470 49.00000 526664 1512
+-1 -1 77 48.76140 49.00000 528176 616
+-1 -1 18 48.56160 48.62350 528792 144
+-1 -1 41 48.62350 48.76320 528936 328
+-1 -1 180 48.06530 48.56160 529264 1440
+-1 -1 18 48.00000 48.06530 530704 144
+-1 -1 51 48.00000 48.04720 530848 408
+-1 -1 84 48.00000 48.72549 531256 672
+-1 -1 31 48.72549 49.00000 531928 248
+-1 -1 25 48.00000 48.01920 532176 200
+-1 -1 59 48.00000 48.03940 532376 472
+-1 -1 3 48.99580 49.00000 532848 24
+-1 -1 312 48.00000 48.99580 532872 2496
+-1 -1 21 48.00000 48.03011 535368 168
+-1 -1 159 48.03011 48.27700 535536 1272
+-1 -1 61 48.00000 48.26750 536808 488
+-1 -1 120 48.26640 48.39000 537296 960
+-1 -1 77 48.28670 48.50110 538256 616
+-1 -1 163 48.22220 48.76390 538872 1304
+-1 -1 44 48.82210 48.99969 540176 352
+-1 -1 12 48.76390 48.82210 540528 96
+-1 -1 3 48.99950 49.00000 540624 24
+-1 -1 7 48.99950 49.00000 540648 56
+-1 -1 5 48.99950 49.00000 540704 40
+-1 -1 5 48.99950 49.00000 540744 40
+-1 -1 4 48.99950 49.00000 540784 32
+-1 -1 8 48.99950 49.00000 540816 64
+-1 -1 3 48.99969 49.00000 540880 24
+-1 -1 3 48.99969 49.00000 540904 24
+-1 -1 2 48.99969 49.00000 540928 16
+-1 -1 3 48.99969 49.00000 540944 24
+-1 -1 6 48.99950 49.00000 540968 48
+-1 -1 7 48.99950 49.00000 541016 56
+-1 -1 4 48.99950 49.00000 541072 32
+-1 -1 6 48.99950 49.00000 541104 48
+-1 -1 8 48.99950 49.00000 541152 64
+-1 -1 9 48.99950 49.00000 541216 72
+-1 -1 5 48.99950 49.00000 541288 40
+-1 -1 5 48.99950 49.00000 541328 40
+-1 -1 7 48.99950 49.00000 541368 56
+-1 -1 4 48.99950 49.00000 541424 32
+-1 -1 3 48.99950 49.00000 541456 24
+-1 -1 3 48.99969 49.00000 541480 24
+-1 -1 3 48.99969 49.00000 541504 24
+-1 -1 3 48.99969 49.00000 541528 24
+-1 -1 8 48.99950 49.00000 541552 64
+-1 -1 4 48.99950 49.00000 541616 32
+-1 -1 5 48.99950 49.00000 541648 40
+-1 -1 5 48.99950 49.00000 541688 40
+-1 -1 3 48.99950 49.00000 541728 24
+-1 -1 5 48.99950 49.00000 541752 40
+-1 -1 15 48.99950 49.00000 541792 120
+-1 -1 7 48.99950 49.00000 541912 56
+-1 -1 5 48.99950 49.00000 541968 40
+-1 -1 2 48.99950 49.00000 542008 16
+-1 -1 5 48.99950 49.00000 542024 40
+-1 -1 9 48.99950 49.00000 542064 72
+-1 -1 3 48.99969 49.00000 542136 24
+-1 -1 3 48.99969 49.00000 542160 24
+-1 -1 3 48.99969 49.00000 542184 24
+-1 -1 3 48.99969 49.00000 542208 24
+-1 -1 3 48.99950 49.00000 542232 24
+-1 -1 4 48.99950 49.00000 542256 32
+-1 -1 6 48.99950 49.00000 542288 48
+-1 -1 3 48.99969 49.00000 542336 24
+-1 -1 4 48.99950 49.00000 542360 32
+-1 -1 6 48.99950 49.00000 542392 48
+-1 -1 9 48.99950 49.00000 542440 72
+-1 -1 5 48.99969 49.00000 542512 40
+-1 -1 5 48.99950 49.00000 542552 40
+-1 -1 5 48.99950 49.00000 542592 40
+-1 -1 5 48.99950 49.00000 542632 40
+-1 -1 4 48.99950 49.00000 542672 32
+-1 -1 4 48.99950 49.00000 542704 32
+-1 -1 8 48.99950 49.00000 542736 64
+-1 -1 5 48.99950 49.00000 542800 40
+-1 -1 2 49.00000 49.00000 542840 16
+-1 -1 6 48.99950 49.00000 542856 48
+-1 -1 4 48.99969 49.00000 542904 32
+-1 -1 4 48.99969 49.00000 542936 32
+-1 -1 4 48.99950 49.00000 542968 32
+-1 -1 6 48.99950 49.00000 543000 48
+-1 -1 7 48.99950 49.00000 543048 56
+-1 -1 5 48.99950 49.00000 543104 40
+-1 -1 8 48.99950 49.00000 543144 64
+-1 -1 6 48.99950 49.00000 543208 48
+-1 -1 5 48.99950 49.00000 543256 40
+-1 -1 10 48.99950 49.00000 543296 80
+-1 -1 3 48.99969 49.00000 543376 24
+-1 -1 3 48.99950 49.00000 543400 24
+-1 -1 3 48.99969 49.00000 543424 24
+-1 -1 3 48.99969 49.00000 543448 24
+-1 -1 3 48.99969 49.00000 543472 24
+-1 -1 3 48.99969 49.00000 543496 24
+-1 -1 3 48.99969 49.00000 543520 24
+-1 -1 3 48.99950 49.00000 543544 24
+-1 -1 4 48.99950 49.00000 543568 32
+-1 -1 4 48.99950 49.00000 543600 32
+-1 -1 4 48.99950 49.00000 543632 32
+-1 -1 5 48.99950 49.00000 543664 40
+-1 -1 4 48.99950 49.00000 543704 32
+-1 -1 5 48.99950 49.00000 543736 40
+-1 -1 16 48.99950 49.00000 543776 128
+-1 -1 7 48.99950 49.00000 543904 56
+-1 -1 5 48.99950 49.00000 543960 40
+-1 -1 2 48.99950 49.00000 544000 16
+-1 -1 7 48.99950 49.00000 544016 56
+-1 -1 3 48.99969 49.00000 544072 24
+-1 -1 4 48.99950 49.00000 544096 32
+-1 -1 3 48.99969 49.00000 544128 24
+-1 -1 3 48.99950 49.00000 544152 24
+-1 -1 3 48.99969 49.00000 544176 24
+-1 -1 3 48.99950 49.00000 544200 24
+-1 -1 6 48.99950 49.00000 544224 48
+-1 -1 4 48.99950 49.00000 544272 32
+-1 -1 3 48.99969 49.00000 544304 24
+-1 -1 3 48.99969 49.00000 544328 24
+-1 -1 8 48.99950 49.00000 544352 64
+-1 -1 6 48.99950 49.00000 544416 48
+-1 -1 10 48.99950 49.00000 544464 80
+-1 -1 6 48.99950 49.00000 544544 48
+-1 -1 4 48.99950 49.00000 544592 32
+-1 -1 5 48.99950 49.00000 544624 40
+-1 -1 4 48.99969 49.00000 544664 32
+-1 -1 4 48.99950 49.00000 544696 32
+-1 -1 3 48.99969 49.00000 544728 24
+-1 -1 9 48.99950 49.00000 544752 72
+-1 -1 6 48.99950 49.00000 544824 48
+-1 -1 3 48.99950 49.00000 544872 24
+-1 -1 4 48.99950 49.00000 544896 32
+-1 -1 8 48.99950 49.00000 544928 64
+-1 -1 4 48.99950 49.00000 544992 32
+-1 -1 5 48.99969 49.00000 545024 40
+-1 -1 3 48.99969 49.00000 545064 24
+-1 -1 2 49.00000 49.00000 545088 16
+-1 -1 11 48.99950 49.00000 545104 88
+-1 -1 8 48.99950 49.00000 545192 64
+-1 -1 5 48.99950 49.00000 545256 40
+-1 -1 5 48.99950 49.00000 545296 40
+-1 -1 4 48.99950 49.00000 545336 32
+-1 -1 2 49.00000 49.00000 545368 16
+-1 -1 4 48.99950 49.00000 545384 32
+-1 -1 3 48.99950 49.00000 545416 24
+-1 -1 3 48.99969 49.00000 545440 24
+-1 -1 9 48.99950 49.00000 545464 72
+-1 -1 3 48.99969 49.00000 545536 24
+-1 -1 4 48.99950 49.00000 545560 32
+-1 -1 3 48.99969 49.00000 545592 24
+-1 -1 4 48.99950 49.00000 545616 32
+-1 -1 3 48.99969 49.00000 545648 24
+-1 -1 3 48.99950 49.00000 545672 24
+-1 -1 5 48.99950 49.00000 545696 40
+-1 -1 7 48.99950 49.00000 545736 56
+-1 -1 8 48.99950 49.00000 545792 64
+-1 -1 6 48.99950 49.00000 545856 48
+-1 -1 5 48.99969 49.00000 545904 40
+-1 -1 4 48.99950 49.00000 545944 32
+-1 -1 4 48.99969 49.00000 545976 32
+-1 -1 4 48.99950 49.00000 546008 32
+-1 -1 3 48.99969 49.00000 546040 24
+-1 -1 5 48.99950 49.00000 546064 40
+-1 -1 3 48.99969 49.00000 546104 24
+-1 -1 3 48.99950 49.00000 546128 24
+-1 -1 3 48.99969 49.00000 546152 24
+-1 -1 3 48.99950 49.00000 546176 24
+-1 -1 6 48.99969 49.00000 546200 48
+-1 -1 4 48.99950 49.00000 546248 32
+-1 -1 4 48.99969 49.00000 546280 32
+-1 -1 4 48.99969 49.00000 546312 32
+-1 -1 7 48.99950 49.00000 546344 56
+-1 -1 3 48.99969 49.00000 546400 24
+-1 -1 3 48.99969 49.00000 546424 24
+-1 -1 3 48.99969 49.00000 546448 24
+-1 -1 6 48.99950 49.00000 546472 48
+-1 -1 5 48.99950 49.00000 546520 40
+-1 -1 3 48.99950 49.00000 546560 24
+-1 -1 5 48.99950 49.00000 546584 40
+-1 -1 4 48.99950 49.00000 546624 32
+-1 -1 3 48.99969 49.00000 546656 24
+-1 -1 2 49.00000 49.00000 546680 16
+-1 -1 4 48.99950 49.00000 546696 32
+-1 -1 3 48.99950 49.00000 546728 24
+-1 -1 3 48.99950 49.00000 546752 24
+-1 -1 3 48.99969 49.00000 546776 24
+-1 -1 3 48.99969 49.00000 546800 24
+-1 -1 3 48.99950 49.00000 546824 24
+-1 -1 3 48.99969 49.00000 546848 24
+-1 -1 4 48.99969 49.00000 546872 32
+-1 -1 4 48.99969 49.00000 546904 32
+-1 -1 3 48.99969 49.00000 546936 24
+-1 -1 3 48.99969 49.00000 546960 24
+-1 -1 5 48.99969 49.00000 546984 40
+-1 -1 2 49.00000 49.00000 547024 16
+-1 -1 6 48.99950 49.00000 547040 48
+-1 -1 14 48.99950 49.00000 547088 112
+-1 -1 5 48.99969 49.00000 547200 40
+-1 -1 3 48.99969 49.00000 547240 24
+-1 -1 5 48.99950 49.00000 547264 40
+-1 -1 4 48.99969 49.00000 547304 32
+-1 -1 3 48.99969 49.00000 547336 24
+-1 -1 3 48.99969 49.00000 547360 24
+-1 -1 4 48.99950 49.00000 547384 32
+-1 -1 3 48.99969 49.00000 547416 24
+-1 -1 3 48.99969 49.00000 547440 24
+-1 -1 3 48.99969 49.00000 547464 24
+-1 -1 3 48.99969 49.00000 547488 24
+-1 -1 4 48.99950 49.00000 547512 32
+-1 -1 2 48.99980 49.00000 547544 16
+-1 -1 3 48.99969 49.00000 547560 24
+-1 -1 4 48.99950 49.00000 547584 32
+-1 -1 4 48.99950 49.00000 547616 32
+-1 -1 4 48.99950 49.00000 547648 32
+-1 -1 5 48.99950 49.00000 547680 40
+-1 -1 6 48.99969 49.00000 547720 48
+-1 -1 4 48.99969 49.00000 547768 32
+-1 -1 2 49.00000 49.00000 547800 16
+-1 -1 3 48.99969 49.00000 547816 24
+-1 -1 4 48.99969 49.00000 547840 32
+-1 -1 6 48.99950 49.00000 547872 48
+-1 -1 3 48.99969 49.00000 547920 24
+-1 -1 4 48.99950 49.00000 547944 32
+-1 -1 3 48.99969 49.00000 547976 24
+-1 -1 4 48.99969 49.00000 548000 32
+-1 -1 3 48.99950 49.00000 548032 24
+-1 -1 4 48.99969 49.00000 548056 32
+-1 -1 2 49.00000 49.00000 548088 16
+-1 -1 3 48.99969 49.00000 548104 24
+-1 -1 3 48.99969 49.00000 548128 24
+-1 -1 3 48.99950 49.00000 548152 24
+-1 -1 3 48.99969 49.00000 548176 24
+-1 -1 6 48.99969 49.00000 548200 48
+-1 -1 3 48.99969 49.00000 548248 24
+-1 -1 4 48.99969 49.00000 548272 32
+-1 -1 4 48.99969 49.00000 548304 32
+-1 -1 4 48.99969 49.00000 548336 32
+-1 -1 3 48.99950 49.00000 548368 24
+-1 -1 169 48.63810 49.00000 548392 1352
+-1 -1 182 48.51390 48.64059 549744 1456
+-1 -1 334 48.22830 48.62580 551200 2672
+-1 -1 203 48.04110 48.26960 553872 1624
+-1 -1 154 48.08970 48.23750 555496 1232
+-1 -1 59 48.03011 48.12250 556728 472
+-1 -1 13 48.00000 48.03011 557200 104
+-1 -1 47 48.00000 48.03000 557304 376
+-1 -1 14 48.00000 48.00390 557680 112
+-1 -1 29 48.00000 48.12810 557792 232
+-1 -1 99 48.12810 48.31219 558024 792
+-1 -1 49 48.00000 48.17150 558816 392
+-1 -1 140 47.00000 47.30180 559208 1120
+-1 -1 65 47.35690 47.44770 560328 520
+-1 -1 11 47.47130 47.49860 560848 88
+-1 -1 132 47.58500 48.00000 560936 1056
+-1 -1 42 47.30180 47.37170 561992 336
+-1 -1 10 47.44770 47.47130 562328 80
+-1 -1 316 47.42080 47.60609 562408 2528
+-1 -1 473 47.55580 47.80690 564936 3784
+-1 -1 21 47.69300 47.71360 568720 168
+-1 -1 248 47.00000 47.54060 568888 1984
+-1 -1 93 47.48800 47.59500 570872 744
+-1 -1 96 47.52890 47.68890 571616 768
+-1 -1 78 47.06420 47.27420 572384 624
+-1 -1 7 47.00000 47.00360 573008 56
+-1 -1 443 47.27470 47.59190 573064 3544
+-1 -1 247 47.39530 47.62340 576608 1976
+-1 -1 37 47.00000 47.04830 578584 296
+-1 -1 5 47.00000 47.00050 578880 40
+-1 -1 24 47.00000 47.01310 578920 192
+-1 -1 17 47.00000 47.01420 579112 136
+-1 -1 327 47.47330 47.74310 579248 2616
+-1 -1 59 47.71220 47.84570 581864 472
+-1 -1 54 47.86100 48.00000 582336 432
+-1 -1 85 47.00000 47.09470 582768 680
+-1 -1 102 47.46920 47.72530 583448 816
+-1 -1 8 47.84570 47.86100 584264 64
+-1 -1 38 47.00000 47.01860 584328 304
+-1 -1 510 47.00000 47.76030 584632 4080
+-1 -1 132 47.70250 48.00000 588712 1056
+-1 -1 171 47.74610 48.00000 589768 1368
+-1 -1 237 47.73720 48.00000 591136 1896
+-1 -1 146 47.00000 47.37310 593032 1168
+-1 -1 312 47.37310 48.00000 594200 2496
+-1 -1 4 47.99620 48.00000 596696 32
+-1 -1 21 47.95360 48.00000 596728 168
+-1 -1 13 47.98940 48.00000 596896 104
+-1 -1 7 47.99750 48.00000 597000 56
+-1 -1 27 47.97720 48.00000 597056 216
+-1 -1 93 47.92860 48.00000 597272 744
+-1 -1 241 47.71170 47.95970 598016 1928
+-1 -1 214 47.72450 47.97580 599944 1712
+-1 -1 38 47.97580 48.00000 601656 304
+-1 -1 404 47.02560 48.00000 601960 3232
+-1 -1 17 47.00000 47.02610 605192 136
+-1 -1 32 47.93350 48.00000 605328 256
+-1 -1 484 47.00000 47.98750 605584 3872
+-1 -1 337 47.10941 47.86830 609456 2696
+-1 -1 193 47.81830 48.00000 612152 1544
+-1 -1 10 47.86220 47.86830 613696 80
+-1 -1 189 47.68610 48.00000 613776 1512
+-1 -1 146 47.00000 47.78280 615288 1168
+-1 -1 161 47.00000 47.22580 616456 1288
+-1 -1 28 47.00000 47.00750 617744 224
+-1 -1 6 47.00000 47.00140 617968 48
+-1 -1 229 47.00000 48.00000 618016 1832
+-1 -1 32 47.98000 48.00000 619848 256
+-1 -1 80 47.82640 48.00000 620104 640
+-1 -1 226 47.00000 47.89340 620744 1808
+-1 -1 48 47.68690 48.00000 622552 384
+-1 -1 74 47.71609 47.88810 622936 592
+-1 -1 121 47.65359 48.00000 623528 968
+-1 -1 48 47.70220 48.00000 624496 384
+-1 -1 168 47.00000 47.70220 624880 1344
+-1 -1 77 47.68430 48.00000 626224 616
+-1 -1 147 47.65610 47.73860 626840 1176
+-1 -1 156 47.69279 48.00000 628016 1248
+-1 -1 260 47.00000 48.00000 629264 2080
+-1 -1 11 47.98920 48.00000 631344 88
+-1 -1 4 47.99920 48.00000 631432 32
+-1 -1 15 47.97970 48.00000 631464 120
+-1 -1 62 47.78011 48.00000 631584 496
+-1 -1 110 47.37730 47.78011 632080 880
+-1 -1 102 47.00000 47.37730 632960 816
+-1 -1 146 47.00000 47.47141 633776 1168
+-1 -1 141 47.18810 47.36580 634944 1128
+-1 -1 19 47.18781 47.24210 636072 152
+-1 -1 52 47.00000 47.22000 636224 416
+-1 -1 21 46.13970 46.17419 636640 168
+-1 -1 24 46.17419 46.22970 636808 192
+-1 -1 415 46.00230 46.46420 637000 3320
+-1 -1 335 46.22970 47.00000 640320 2680
+-1 -1 5 46.00000 46.00350 643000 40
+-1 -1 3 46.00000 46.00230 643040 24
+-1 -1 406 46.00000 46.46330 643064 3248
+-1 -1 429 46.00000 46.50940 646312 3432
+-1 -1 47 46.90390 47.00000 649744 376
+-1 -1 451 46.22030 47.00000 650120 3608
+-1 -1 111 46.84940 47.00000 653728 888
+-1 -1 139 46.77060 46.87500 654616 1112
+-1 -1 33 46.97750 47.00000 655728 264
+-1 -1 4 46.99950 47.00000 655992 32
+-1 -1 9 46.99471 47.00000 656024 72
+-1 -1 134 46.77250 47.00000 656096 1072
+-1 -1 250 46.60470 47.00000 657168 2000
+-1 -1 59 46.48880 46.52750 659168 472
+-1 -1 432 46.00000 46.60609 659640 3456
+-1 -1 273 46.38550 46.63530 663096 2184
+-1 -1 223 46.61690 46.72330 665280 1784
+-1 -1 35 46.72549 46.83450 667064 280
+-1 -1 73 46.00000 46.30300 667344 584
+-1 -1 35 46.65970 46.72549 667928 280
+-1 -1 367 46.23040 46.87670 668208 2936
+-1 -1 58 46.86920 47.00000 671144 464
+-1 -1 6 46.99610 47.00000 671608 48
+-1 -1 75 46.30300 46.53880 671656 600
+-1 -1 153 46.00000 46.23040 672256 1224
+-1 -1 25 46.00000 46.02580 673480 200
+-1 -1 180 46.00000 46.18140 673680 1440
+-1 -1 108 46.00000 46.16840 675120 864
+-1 -1 202 46.11810 46.27921 675984 1616
+-1 -1 325 46.23890 47.00000 677600 2600
+-1 -1 330 46.00000 47.00000 680200 2640
+-1 -1 191 46.55110 47.00000 682840 1528
+-1 -1 35 46.48780 46.55110 684368 280
+-1 -1 50 46.41560 46.49460 684648 400
+-1 -1 15 46.80400 47.00000 685048 120
+-1 -1 168 46.43980 46.77500 685168 1344
+-1 -1 6 46.75300 46.80400 686512 48
+-1 -1 37 46.34560 46.43980 686560 296
+-1 -1 199 46.00000 46.93440 686856 1592
+-1 -1 14 46.93440 47.00000 688448 112
+-1 -1 24 46.97280 47.00000 688560 192
+-1 -1 27 46.97141 47.00000 688752 216
+-1 -1 3 46.99969 47.00000 688968 24
+-1 -1 111 46.82610 47.00000 688992 888
+-1 -1 34 46.90900 47.00000 689880 272
+-1 -1 63 46.78110 47.00000 690152 504
+-1 -1 59 46.14740 46.42350 690656 472
+-1 -1 73 46.42350 46.78110 691128 584
+-1 -1 30 46.00000 46.14740 691712 240
+-1 -1 99 46.00000 46.39360 691952 792
+-1 -1 115 46.35941 46.63029 692744 920
+-1 -1 162 46.63029 46.77280 693664 1296
+-1 -1 212 46.59780 47.00000 694960 1696
+-1 -1 173 46.00000 46.63750 696656 1384
+-1 -1 72 46.63750 47.00000 698040 576
+-1 -1 11 46.96300 47.00000 698616 88
+-1 -1 227 46.11920 46.96300 698704 1816
+-1 -1 98 46.00000 46.12610 700520 784
+-1 -1 31 46.00000 46.12250 701304 248
+-1 -1 119 46.11971 46.70760 701552 952
+-1 -1 52 46.70760 47.00000 702504 416
+-1 -1 137 46.00000 47.00000 702920 1096
+-1 -1 158 45.00000 45.22360 704016 1264
+-1 -1 163 45.51801 45.89270 705280 1304
+-1 -1 139 45.22030 45.51801 706584 1112
+-1 -1 254 45.87920 46.00000 707696 2032
+-1 -1 25 45.93221 46.00000 709728 200
+-1 -1 91 45.82510 46.00000 709928 728
+-1 -1 5 45.96870 45.97890 710656 40
+-1 -1 63 45.82060 45.96870 710696 504
+-1 -1 12 45.97890 46.00000 711200 96
+-1 -1 220 45.58450 46.00000 711296 1760
+-1 -1 55 45.42860 45.48570 713056 440
+-1 -1 181 45.46040 45.63870 713496 1448
+-1 -1 48 45.00000 45.21900 714944 384
+-1 -1 180 45.41310 46.00000 715328 1440
+-1 -1 104 45.00000 45.23920 716768 832
+-1 -1 26 45.00000 45.18700 717600 208
+-1 -1 238 45.76780 46.00000 717808 1904
+-1 -1 137 45.04400 45.23170 719712 1096
+-1 -1 260 45.74830 45.93920 720808 2080
+-1 -1 7 45.94270 45.95760 722888 56
+-1 -1 137 45.00000 45.14530 722944 1096
+-1 -1 72 45.54070 45.90739 724040 576
+-1 -1 5 45.37460 45.39530 724616 40
+-1 -1 8 45.92860 45.94270 724656 64
+-1 -1 29 45.95760 46.00000 724720 232
+-1 -1 33 45.98669 46.00000 724952 264
+-1 -1 43 45.39530 45.55320 725216 344
+-1 -1 138 45.00000 45.37460 725560 1104
+-1 -1 289 45.33940 46.00000 726664 2312
+-1 -1 196 45.00000 45.33940 728976 1568
+-1 -1 435 45.22000 46.00000 730544 3480
+-1 -1 191 45.21190 45.43920 734024 1528
+-1 -1 84 45.13720 45.43190 735552 672
+-1 -1 3 45.00000 45.00310 736224 24
+-1 -1 2 45.00250 45.00320 736248 16
+-1 -1 48 45.00320 45.23351 736264 384
+-1 -1 47 45.23351 45.45180 736648 376
+-1 -1 54 45.36990 45.57110 737024 432
+-1 -1 29 45.15190 45.36990 737456 232
+-1 -1 135 45.00000 45.16800 737688 1080
+-1 -1 159 45.15390 45.35190 738768 1272
+-1 -1 294 45.11830 46.00000 740040 2352
+-1 -1 161 45.19170 45.99420 742392 1288
+-1 -1 4 45.99420 46.00000 743680 32
+-1 -1 146 45.06200 45.22470 743712 1168
+-1 -1 139 45.00310 45.08420 744880 1112
+-1 -1 30 45.00000 45.01690 745992 240
+-1 -1 19 45.00000 45.09380 746232 152
+-1 -1 43 45.00000 45.10060 746384 344
+-1 -1 114 45.00000 45.44220 746728 912
+-1 -1 75 45.38800 45.65981 747640 600
+-1 -1 86 45.65981 46.00000 748240 688
+-1 -1 122 45.00000 45.34610 748928 976
+-1 -1 119 45.02030 45.24001 749904 952
+-1 -1 256 45.04691 46.00000 750856 2048
+-1 -1 99 45.56190 46.00000 752904 792
+-1 -1 103 45.00000 45.56190 753696 824
+-1 -1 52 45.00000 45.01920 754520 416
+-1 -1 2 45.00000 45.00000 754936 16
+-1 -1 90 45.00000 45.01740 754952 720
+-1 -1 102 45.01720 45.02060 755672 816
+-1 -1 176 45.01891 45.35530 756488 1408
+-1 -1 256 45.23810 46.00000 757896 2048
+-1 -1 123 45.59330 46.00000 759944 984
+-1 -1 129 45.14750 45.59470 760928 1032
+-1 -1 174 44.24850 44.69890 761960 1392
+-1 -1 83 44.85381 45.00000 763352 664
+-1 -1 226 44.00000 44.24969 764016 1808
+-1 -1 71 44.68920 44.85381 765824 568
+-1 -1 48 44.64211 45.00000 766392 384
+-1 -1 7 44.99510 45.00000 766776 56
+-1 -1 70 44.00000 44.64211 766832 560
+-1 -1 43 44.85240 45.00000 767392 344
+-1 -1 5 44.85310 44.88920 767736 40
+-1 -1 8 44.00000 44.01680 767776 64
+-1 -1 192 44.00000 44.91750 767840 1536
+-1 -1 32 44.88920 45.00000 769376 256
+-1 -1 264 44.63181 45.00000 769632 2112
+-1 -1 486 44.10020 44.71560 771744 3888
+-1 -1 22 44.00000 44.01630 775632 176
+-1 -1 107 44.00000 44.22639 775808 856
+-1 -1 33 44.01630 44.10020 776664 264
+-1 -1 172 44.00000 44.14410 776928 1376
+-1 -1 169 44.00000 44.14810 778304 1352
+-1 -1 9 44.00000 44.00560 779656 72
+-1 -1 73 44.00000 45.00000 779728 584
+-1 -1 24 44.42070 44.60530 780312 192
+-1 -1 68 44.00000 44.42070 780504 544
+-1 -1 55 44.79850 44.97650 781048 440
+-1 -1 224 44.00000 44.82560 781488 1792
+-1 -1 10 44.97650 45.00000 783280 80
+-1 -1 120 44.76270 45.00000 783360 960
+-1 -1 178 44.26600 44.76270 784320 1424
+-1 -1 118 44.00000 44.29640 785744 944
+-1 -1 154 44.00000 45.00000 786688 1232
+-1 -1 42 44.82809 45.00000 787920 336
+-1 -1 90 44.74530 44.92610 788256 720
+-1 -1 24 44.92610 45.00000 788976 192
+-1 -1 25 44.78250 44.86070 789168 200
+-1 -1 85 44.86070 45.00000 789368 680
+-1 -1 125 44.00000 44.78250 790048 1000
+-1 -1 140 44.00000 45.00000 791048 1120
+-1 -1 75 44.00000 44.35510 792168 600
+-1 -1 197 44.35510 44.98140 792768 1576
+-1 -1 18 44.98140 45.00000 794344 144
+-1 -1 51 44.99220 45.00000 794488 408
+-1 -1 9 44.99810 45.00000 794896 72
+-1 -1 80 43.78860 44.00000 794968 640
+-1 -1 24 43.72940 43.77310 795608 192
+-1 -1 73 43.00000 43.18221 795800 584
+-1 -1 80 43.89560 43.98920 796384 640
+-1 -1 25 43.60890 44.00000 797024 200
+-1 -1 66 43.00000 43.60890 797224 528
+-1 -1 57 43.00000 43.36610 797752 456
+-1 -1 20 43.43890 43.55050 798208 160
+-1 -1 22 43.26930 43.43890 798368 176
+-1 -1 94 43.53460 44.00000 798544 752
+-1 -1 22 43.96111 44.00000 799296 176
+-1 -1 39 43.05790 43.53460 799472 312
+-1 -1 8 43.00000 43.05790 799784 64
+-1 -1 75 43.81450 44.00000 799848 600
+-1 -1 65 43.00000 43.18640 800448 520
+-1 -1 305 43.20560 44.00000 800968 2440
+-1 -1 207 43.74040 43.85609 803408 1656
+-1 -1 8 43.18640 43.20560 805064 64
+-1 -1 209 43.68440 43.76220 805128 1672
+-1 -1 248 43.62250 43.88420 806800 1984
+-1 -1 64 43.88420 44.00000 808784 512
+-1 -1 11 43.90440 43.92940 809296 88
+-1 -1 56 43.95920 44.00000 809384 448
+-1 -1 48 43.85580 44.00000 809832 384
+-1 -1 118 43.74060 43.85580 810216 944
+-1 -1 171 43.40090 43.58470 811160 1368
+-1 -1 171 43.40090 43.58470 812528 1368
+-1 -1 154 43.19530 43.40090 813896 1232
+-1 -1 154 43.19530 43.40090 815128 1232
+-1 -1 155 43.11180 43.23940 816360 1240
+-1 -1 155 43.11180 43.23940 817600 1240
+-1 -1 32 43.00000 43.11180 818840 256
+-1 -1 32 43.00000 43.11180 819096 256
+-1 -1 73 43.00000 44.00000 819352 584
+-1 -1 44 43.50681 44.00000 819936 352
+-1 -1 48 43.48560 43.61020 820288 384
+-1 -1 48 43.48560 43.61020 820672 384
+-1 -1 3 43.48610 43.50681 821056 24
+-1 -1 54 43.57060 43.63640 821080 432
+-1 -1 54 43.57060 43.63640 821512 432
+-1 -1 55 43.54810 43.73780 821944 440
+-1 -1 55 43.54810 43.73780 822384 440
+-1 -1 57 43.00000 43.67661 822824 456
+-1 -1 57 43.00000 43.67661 823280 456
+-1 -1 84 43.00000 43.22390 823736 672
+-1 -1 51 43.18810 43.26860 824408 408
+-1 -1 99 43.00000 43.26860 824816 792
+-1 -1 251 43.00000 44.00000 825608 2008
+-1 -1 159 43.17250 44.00000 827616 1272
+-1 -1 20 43.00000 43.17250 828888 160
+-1 -1 49 43.00000 43.32230 829048 392
+-1 -1 132 43.32230 44.00000 829440 1056
+-1 -1 9 43.00000 43.00830 830496 72
+-1 -1 212 43.00000 44.00000 830568 1696
+-1 -1 148 43.01610 44.00000 832264 1184
+-1 -1 4 43.00000 43.01331 833448 32
+-1 -1 101 43.00000 43.53180 833480 808
+-1 -1 100 43.53180 43.63940 834288 800
+-1 -1 104 43.63470 43.63940 835088 832
+-1 -1 82 43.63310 44.00000 835920 656
+-1 -1 298 43.01360 43.39720 836576 2384
+-1 -1 9 43.00000 43.01360 838960 72
+-1 -1 273 42.70110 42.87610 839032 2184
+-1 -1 136 42.60220 42.80780 841216 1088
+-1 -1 60 42.41570 42.50700 842304 480
+-1 -1 248 42.44310 42.66720 842784 1984
+-1 -1 11 42.46111 42.48800 844768 88
+-1 -1 5 42.45530 42.46220 844856 40
+-1 -1 270 42.33970 42.48720 844896 2160
+-1 -1 40 42.45530 42.50940 847056 320
+-1 -1 54 42.43390 42.48720 847376 432
+-1 -1 17 42.95280 43.00000 847808 136
+-1 -1 47 42.48640 42.66280 847944 376
+-1 -1 50 42.79190 43.00000 848320 400
+-1 -1 56 42.54610 43.00000 848720 448
+-1 -1 34 42.54610 42.79190 849168 272
+-1 -1 360 42.00000 42.66200 849440 2880
+-1 -1 250 42.00000 42.56390 852320 2000
+-1 -1 30 42.00000 42.18600 854320 240
+-1 -1 84 42.56330 43.00000 854560 672
+-1 -1 80 42.15460 42.28140 855232 640
+-1 -1 478 42.00000 43.00000 855872 3824
+-1 -1 32 42.26160 42.36180 859696 256
+-1 -1 24 42.00000 42.03940 859952 192
+-1 -1 8 42.00000 42.00560 860144 64
+-1 -1 5 42.00000 42.00190 860208 40
+-1 -1 119 42.00000 42.11000 860248 952
+-1 -1 144 42.55780 42.89920 861200 1152
+-1 -1 144 42.55780 42.89920 862352 1152
+-1 -1 144 42.55780 42.89920 863504 1152
+-1 -1 50 42.89920 43.00000 864656 400
+-1 -1 50 42.89920 43.00000 865056 400
+-1 -1 189 42.57770 42.76310 865456 1512
+-1 -1 189 42.57770 42.76310 866968 1512
+-1 -1 189 42.57770 42.76310 868480 1512
+-1 -1 253 42.02330 42.72090 869992 2024
+-1 -1 253 42.02330 42.72090 872016 2024
+-1 -1 253 42.02330 42.72090 874040 2024
+-1 -1 7 42.00000 42.00280 876064 56
+-1 -1 24 42.00000 42.04310 876120 192
+-1 -1 7 42.00000 42.00280 876312 56
+-1 -1 24 42.00000 42.04310 876368 192
+-1 -1 7 42.00000 42.00280 876560 56
+-1 -1 24 42.00000 42.04310 876616 192
+-1 -1 45 42.00000 42.13320 876808 360
+-1 -1 155 42.13320 42.34860 877168 1240
+-1 -1 138 42.00000 42.35060 878408 1104
+-1 -1 15 42.00000 42.18830 879512 120
+-1 -1 58 42.21640 43.00000 879632 464
+-1 -1 2 42.18830 42.20250 880096 16
+-1 -1 2 42.20250 42.21640 880112 16
+-1 -1 188 42.00000 42.47840 880128 1504
+-1 -1 359 42.29440 42.79780 881632 2872
+-1 -1 8 42.00000 42.00250 884504 64
+-1 -1 10 42.10470 42.14700 884568 80
+-1 -1 181 42.22300 42.54670 884648 1448
+-1 -1 25 42.00250 42.10470 886096 200
+-1 -1 27 42.14700 42.22300 886296 216
+-1 -1 18 42.87720 43.00000 886512 144
+-1 -1 18 42.87720 43.00000 886656 144
+-1 -1 49 42.42419 42.99690 886800 392
+-1 -1 49 42.42419 42.99690 887192 392
+-1 -1 58 42.00000 42.42390 887584 464
+-1 -1 28 42.00000 42.05070 888048 224
+-1 -1 8 42.25280 42.27500 888272 64
+-1 -1 61 42.25330 42.48669 888336 488
+-1 -1 133 42.00000 42.25280 888824 1064
+-1 -1 103 42.05070 42.30530 889888 824
+-1 -1 214 42.46080 42.84280 890712 1712
+-1 -1 157 42.53889 42.80450 892424 1256
+-1 -1 206 42.40470 43.00000 893680 1648
+-1 -1 43 42.93250 43.00000 895328 344
+-1 -1 58 42.80640 42.94690 895672 464
+-1 -1 104 42.80640 42.93250 896136 832
+-1 -1 156 42.89190 42.99640 896968 1248
+-1 -1 159 42.86720 42.98880 898216 1272
+-1 -1 146 42.77010 42.88750 899488 1168
+-1 -1 20 42.00000 42.03500 900656 160
+-1 -1 190 42.39190 42.79780 900816 1520
+-1 -1 278 42.02580 43.00000 902336 2224
+-1 -1 53 42.19640 42.39190 904560 424
+-1 -1 73 42.73109 43.00000 904984 584
+-1 -1 73 42.67810 42.79750 905568 584
+-1 -1 74 42.60130 42.67810 906152 592
+-1 -1 72 42.57080 42.65359 906744 576
+-1 -1 76 42.64110 42.69110 907320 608
+-1 -1 79 42.31440 42.64700 907928 632
+-1 -1 79 42.05040 42.31440 908560 632
+-1 -1 12 42.00000 42.05040 909192 96
+-1 -1 9 42.00000 42.03320 909288 72
+-1 -1 69 42.03320 42.31290 909360 552
+-1 -1 90 42.31290 42.46640 909912 720
+-1 -1 73 42.40000 42.46280 910632 584
+-1 -1 74 42.43000 42.64250 911216 592
+-1 -1 59 42.64250 43.00000 911808 472
+-1 -1 78 42.00000 42.09050 912280 624
+-1 -1 62 42.00000 42.03970 912904 496
+-1 -1 13 42.96140 43.00000 913400 104
+-1 -1 316 42.09050 43.00000 913504 2528
+-1 -1 196 42.41940 42.98060 916032 1568
+-1 -1 213 42.29560 42.87610 917600 1704
+-1 -1 43 42.85500 43.00000 919304 344
+-1 -1 71 42.00000 42.33940 919648 568
+-1 -1 69 42.33940 42.55000 920216 552
+-1 -1 94 42.55360 43.00000 920768 752
+-1 -1 71 42.00000 42.26020 921520 568
+-1 -1 101 42.26020 42.43380 922088 808
+-1 -1 92 42.43380 42.81520 922896 736
+-1 -1 9 42.97460 43.00000 923632 72
+-1 -1 44 42.81520 42.97460 923704 352
+-1 -1 185 42.00000 42.15421 924056 1480
+-1 -1 271 42.71000 43.00000 925536 2168
+-1 -1 28 41.29250 41.41060 927704 224
+-1 -1 59 41.85060 42.00000 927928 472
+-1 -1 342 41.00000 42.00000 928400 2736
+-1 -1 12 41.94070 42.00000 931136 96
+-1 -1 58 41.00000 41.13530 931232 464
+-1 -1 299 41.11940 41.34860 931696 2392
+-1 -1 109 41.34140 41.67950 934088 872
+-1 -1 80 41.77020 42.00000 934960 640
+-1 -1 259 41.32030 41.48030 935600 2072
+-1 -1 32 41.67950 41.77020 937672 256
+-1 -1 347 41.35220 41.57220 937928 2776
+-1 -1 259 41.24310 41.37840 940704 2072
+-1 -1 548 41.00000 41.75000 942776 4384
+-1 -1 194 41.71250 42.00000 947160 1552
+-1 -1 31 41.98000 42.00000 948712 248
+-1 -1 5 41.99830 42.00000 948960 40
+-1 -1 156 41.90720 42.00000 949000 1248
+-1 -1 4 41.98220 41.98510 950248 32
+-1 -1 128 41.42830 41.52390 950280 1024
+-1 -1 314 41.40860 41.59470 951304 2512
+-1 -1 239 41.00000 41.40860 953816 1912
+-1 -1 76 41.11080 41.16710 955728 608
+-1 -1 76 41.11080 41.16710 956336 608
+-1 -1 191 41.16710 41.28690 956944 1528
+-1 -1 191 41.16710 41.28690 958472 1528
+-1 -1 13 41.03920 41.08860 960000...
[truncated message content] |
|
From: <js...@us...> - 2007-11-14 22:12:48
|
Revision: 4296
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4296&view=rev
Author: jswhit
Date: 2007-11-14 14:12:39 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
regenerate boundary files.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_l.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_l.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhs_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhs_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhs_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhs_l.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/rivers_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/rivers_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/rivers_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/rivers_l.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_l.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/states_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/states_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/states_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/states_l.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/statesmeta_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/statesmeta_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/statesmeta_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/statesmeta_l.dat
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_c.dat
===================================================================
(Binary files differ)
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_h.dat
===================================================================
(Binary files differ)
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_i.dat
===================================================================
(Binary files differ)
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countries_l.dat
===================================================================
(Binary files differ)
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_c.dat
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_c.dat 2007-11-14 20:23:16 UTC (rev 4295)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_c.dat 2007-11-14 22:12:39 UTC (rev 4296)
@@ -1,563 +1,564 @@
--1 -1 2 70.00000 70.06738 0 16
--1 -1 2 70.00000 70.08789 16 16
--1 -1 7 50.00000 51.01855 32 56
--1 -1 7 50.00000 53.60742 88 56
--1 -1 2 54.46582 54.47656 144 16
--1 -1 2 50.00000 50.32324 160 16
--1 -1 18 58.90527 68.50879 176 144
--1 -1 3 50.00000 50.16699 320 24
--1 -1 2 50.00000 51.09082 344 16
--1 -1 4 50.86621 53.26953 360 32
--1 -1 3 50.75684 51.48633 392 24
--1 -1 2 50.00000 50.12695 416 16
--1 -1 2 54.76562 55.08594 432 16
--1 -1 6 50.00000 54.46582 448 48
--1 -1 2 68.40625 69.05762 496 16
--1 -1 8 65.51367 70.00000 512 64
--1 -1 7 62.91406 69.05078 576 56
--1 -1 4 55.67578 56.45020 632 32
--1 -1 4 55.67578 56.45020 664 32
--1 -1 3 53.94824 54.97754 696 24
--1 -1 3 53.94824 54.97754 720 24
--1 -1 4 50.00000 50.95996 744 32
--1 -1 3 51.84375 52.36719 776 24
--1 -1 3 57.53613 58.08496 800 24
--1 -1 2 55.60352 56.14941 824 16
--1 -1 2 55.60352 56.14941 840 16
--1 -1 2 51.37500 51.62988 856 16
--1 -1 2 60.54785 62.91211 872 16
--1 -1 2 56.15137 57.53613 888 16
--1 -1 4 69.02930 70.00000 904 32
--1 -1 2 54.46094 55.60352 936 16
--1 -1 2 51.53125 51.92285 952 16
--1 -1 2 51.62988 51.92090 968 16
--1 -1 2 52.10840 53.12109 984 16
--1 -1 2 53.12109 53.43848 1000 16
--1 -1 3 54.97754 55.67480 1016 24
--1 -1 3 54.97754 55.67480 1040 24
--1 -1 2 50.95996 51.25977 1064 16
--1 -1 2 51.25293 51.37500 1080 16
--1 -1 2 53.43848 53.80469 1096 16
--1 -1 2 51.25293 51.94434 1112 16
--1 -1 2 55.07227 55.24902 1128 16
--1 -1 2 54.36523 55.07227 1144 16
--1 -1 2 58.00977 59.16016 1160 16
--1 -1 2 51.94434 52.10840 1176 16
--1 -1 2 51.36914 51.84375 1192 16
--1 -1 2 57.53613 58.00977 1208 16
--1 -1 2 54.00195 54.45996 1224 16
--1 -1 2 55.67480 55.82617 1240 16
--1 -1 2 55.67480 55.82617 1256 16
--1 -1 2 55.79199 56.14941 1272 16
--1 -1 2 55.79199 56.14941 1288 16
--1 -1 2 53.80273 54.00195 1304 16
--1 -1 2 59.16016 59.35254 1320 16
--1 -1 2 55.79199 55.82617 1336 16
--1 -1 2 55.79199 55.82617 1352 16
--1 -1 2 51.25977 51.36914 1368 16
--1 -1 2 59.35254 59.47852 1384 16
--1 -1 2 60.25488 60.54590 1400 16
--1 -1 3 50.00000 51.76953 1416 24
--1 -1 2 50.00000 50.37500 1440 16
--1 -1 6 50.52832 51.12012 1456 48
--1 -1 3 50.47852 51.15625 1504 24
--1 -1 4 51.45508 51.78125 1528 32
--1 -1 2 50.00000 50.37695 1560 16
--1 -1 2 50.52832 51.50684 1576 16
--1 -1 2 51.46387 51.50684 1592 16
--1 -1 2 51.08496 51.15625 1608 16
--1 -1 2 51.08496 51.12012 1624 16
--1 -1 9 52.00098 54.18262 1640 72
--1 -1 4 50.79297 51.26465 1712 32
--1 -1 2 50.85352 51.66895 1744 16
--1 -1 6 53.43555 54.38770 1760 48
--1 -1 3 54.64551 55.36719 1808 24
--1 -1 4 53.34570 54.47559 1832 32
--1 -1 2 54.39062 54.64258 1864 16
--1 -1 2 54.39062 54.64258 1880 16
--1 -1 3 54.19336 55.29688 1896 24
--1 -1 2 55.29688 55.36816 1920 16
--1 -1 2 51.62012 52.00098 1936 16
--1 -1 3 53.43555 54.11133 1952 24
--1 -1 2 51.66895 53.34570 1976 16
--1 -1 2 54.19824 54.39258 1992 16
--1 -1 2 51.42773 51.62012 2008 16
--1 -1 2 54.18262 54.19727 2024 16
--1 -1 2 51.26660 51.42969 2040 16
--1 -1 5 50.00000 50.87500 2056 40
--1 -1 5 50.00000 52.14355 2096 40
--1 -1 3 50.00000 51.00293 2136 24
--1 -1 4 50.73633 51.31445 2160 32
--1 -1 3 50.00000 50.28418 2192 24
--1 -1 6 50.00000 51.87988 2216 48
--1 -1 2 50.00000 51.12988 2264 16
--1 -1 7 50.20801 53.55371 2280 56
--1 -1 2 50.00000 50.20312 2336 16
--1 -1 3 60.30762 69.64551 2352 24
--1 -1 9 54.70801 60.35254 2376 72
--1 -1 3 54.09961 55.07031 2448 24
--1 -1 4 49.23242 50.00000 2472 32
--1 -1 5 45.76758 46.87109 2504 40
--1 -1 4 47.58496 50.00000 2544 32
--1 -1 6 30.00000 33.17285 2576 48
--1 -1 14 43.78906 47.54102 2624 112
--1 -1 10 47.27441 50.00000 2736 80
--1 -1 6 46.86914 48.15430 2816 48
--1 -1 6 45.93262 47.80664 2864 48
--1 -1 2 39.80664 39.84473 2912 16
--1 -1 3 41.85059 42.62598 2928 24
--1 -1 2 48.61719 49.51855 2952 16
--1 -1 3 49.45996 50.00000 2968 24
--1 -1 3 49.98047 50.00000 2992 24
--1 -1 6 45.59766 47.09473 3016 48
--1 -1 7 30.23340 36.94336 3064 56
--1 -1 5 48.14453 49.01855 3120 40
--1 -1 2 42.60254 42.70898 3160 16
--1 -1 2 49.54492 50.00000 3176 16
--1 -1 2 42.43457 42.50684 3192 16
--1 -1 3 42.50684 42.56543 3208 24
--1 -1 2 42.95312 43.18262 3232 16
--1 -1 2 39.87012 39.93066 3248 16
--1 -1 2 43.91309 43.91602 3264 16
--1 -1 2 47.06445 47.27441 3280 16
--1 -1 2 48.01270 48.14355 3296 16
--1 -1 2 42.46094 42.46191 3312 16
--1 -1 2 42.48633 42.66309 3328 16
--1 -1 2 41.34180 41.41113 3344 16
--1 -1 2 43.72949 43.75781 3360 16
--1 -1 2 47.69336 47.69336 3376 16
--1 -1 10 42.54590 45.18652 3392 80
--1 -1 2 43.12305 43.53418 3472 16
--1 -1 3 44.85352 45.90723 3488 24
--1 -1 4 45.45898 46.48340 3512 32
--1 -1 4 49.07812 49.43652 3544 32
--1 -1 9 43.62500 46.15137 3576 72
--1 -1 8 30.00000 33.37793 3648 64
--1 -1 3 30.00000 31.64746 3712 24
--1 -1 9 45.21191 48.26367 3736 72
--1 -1 4 48.41211 50.00000 3808 32
--1 -1 3 47.95312 48.57617 3840 24
--1 -1 6 40.73535 41.75000 3864 48
--1 -1 5 35.92676 36.83398 3912 40
--1 -1 5 39.66895 42.54004 3952 40
--1 -1 2 30.00000 31.32227 3992 16
--1 -1 6 41.34180 44.22656 4008 48
--1 -1 5 30.00000 31.83301 4056 40
--1 -1 2 49.90332 50.00000 4096 16
--1 -1 2 31.98633 32.75000 4112 16
--1 -1 2 46.55078 48.00977 4128 16
--1 -1 2 49.62305 49.90430 4144 16
--1 -1 3 41.71289 42.08789 4160 24
--1 -1 2 33.37500 33.94434 4184 16
--1 -1 2 31.93848 32.23633 4200 16
--1 -1 3 47.83105 48.36719 4216 24
--1 -1 3 47.10938 47.86816 4240 24
--1 -1 2 48.58789 49.06543 4264 16
--1 -1 2 48.07129 48.46484 4280 16
--1 -1 2 48.25879 48.46484 4296 16
--1 -1 2 33.09375 33.24902 4312 16
--1 -1 2 36.03027 36.20508 4328 16
--1 -1 2 31.21777 31.59668 4344 16
--1 -1 2 48.00977 48.07129 4360 16
--1 -1 2 48.36719 48.58789 4376 16
--1 -1 2 37.64844 37.83984 4392 16
--1 -1 2 36.46875 36.49121 4408 16
--1 -1 2 45.13770 45.43164 4424 16
--1 -1 2 46.41602 46.55078 4440 16
--1 -1 2 36.56250 36.76660 4456 16
--1 -1 2 37.25195 37.50488 4472 16
--1 -1 2 38.11230 38.32422 4488 16
--1 -1 2 39.38770 39.39844 4504 16
--1 -1 2 36.92969 37.06445 4520 16
--1 -1 2 39.81445 40.03613 4536 16
--1 -1 2 36.62988 36.64160 4552 16
--1 -1 2 38.48438 38.70117 4568 16
--1 -1 2 40.25488 40.40332 4584 16
--1 -1 2 38.88086 39.07520 4600 16
--1 -1 2 31.80762 31.80859 4616 16
--1 -1 2 33.20703 33.25195 4632 16
--1 -1 2 43.90430 43.92871 4648 16
--1 -1 2 41.94238 42.32617 4664 16
--1 -1 3 42.56348 43.12305 4680 24
--1 -1 4 33.09473 34.65625 4704 32
--1 -1 14 30.00000 39.64844 4736 112
--1 -1 2 36.83398 37.32129 4848 16
--1 -1 7 36.95215 38.28223 4864 56
--1 -1 8 41.26270 42.79785 4920 64
--1 -1 5 39.63281 41.58301 4984 40
--1 -1 6 38.44531 39.71973 5024 48
--1 -1 3 49.94238 50.00000 5072 24
--1 -1 5 38.87793 41.29883 5096 40
--1 -1 5 36.97070 37.38477 5136 40
--1 -1 4 41.89648 42.89941 5176 32
--1 -1 4 41.89648 42.89941 5208 32
--1 -1 4 41.89648 42.89941 5240 32
--1 -1 6 46.34570 48.24902 5272 48
--1 -1 4 41.28711 42.33691 5320 32
--1 -1 2 49.60547 49.62305 5352 16
--1 -1 3 42.89941 43.54590 5368 24
--1 -1 3 42.89941 43.54590 5392 24
--1 -1 3 41.04980 41.89551 5416 24
--1 -1 3 41.19629 41.89746 5440 24
--1 -1 4 33.94434 37.06152 5464 32
--1 -1 3 30.00000 31.93848 5496 24
--1 -1 3 38.84180 39.70605 5520 24
--1 -1 3 48.24902 50.00000 5544 24
--1 -1 2 49.06543 49.18359 5568 16
--1 -1 3 30.00000 30.01562 5584 24
--1 -1 2 41.11035 41.29785 5608 16
--1 -1 2 41.11035 41.29785 5624 16
--1 -1 2 41.32617 45.00293 5640 16
--1 -1 3 45.00195 45.57129 5656 24
--1 -1 2 37.05957 37.31934 5680 16
--1 -1 2 49.18359 49.60059 5696 16
--1 -1 2 40.66504 40.66504 5712 16
--1 -1 2 30.00000 30.00781 5728 16
--1 -1 2 41.00391 41.00586 5744 16
--1 -1 17 33.40723 41.93164 5760 136
--1 -1 3 44.86230 44.92969 5896 24
--1 -1 23 30.00000 38.47168 5920 184
--1 -1 12 30.00000 37.02539 6104 96
--1 -1 7 30.86523 33.40527 6200 56
--1 -1 3 30.00000 31.59668 6256 24
--1 -1 4 35.60547 36.95215 6280 32
--1 -1 4 41.23438 42.22363 6312 32
--1 -1 7 32.30273 35.50000 6344 56
--1 -1 3 37.36523 40.03125 6400 24
--1 -1 3 37.36523 40.03125 6424 24
--1 -1 6 41.00391 42.25293 6448 48
--1 -1 4 40.14551 41.00586 6496 32
--1 -1 6 42.25293 43.26855 6528 48
--1 -1 3 42.33008 42.80664 6576 24
--1 -1 4 39.50781 40.24512 6600 32
--1 -1 5 40.60742 42.25293 6632 40
--1 -1 4 39.19238 39.62012 6672 32
--1 -1 4 37.18555 39.29395 6704 32
--1 -1 5 40.22461 41.05078 6736 40
--1 -1 4 39.29395 40.14941 6776 32
--1 -1 3 40.03027 41.23535 6808 24
--1 -1 5 42.42383 43.73730 6832 40
--1 -1 5 42.42383 43.73730 6872 40
--1 -1 2 31.59863 32.30371 6912 16
--1 -1 2 42.80664 43.26855 6928 16
--1 -1 3 39.89355 40.16309 6944 24
--1 -1 2 43.48633 44.60547 6968 16
--1 -1 4 41.14355 42.42383 6984 32
--1 -1 2 41.14355 41.19434 7016 16
--1 -1 2 39.88770 39.88867 7032 16
--1 -1 2 40.42969 40.72461 7048 16
--1 -1 2 40.18457 40.22461 7064 16
--1 -1 2 41.05176 41.19434 7080 16
--1 -1 2 40.99902 41.00098 7096 16
--1 -1 2 40.14160 40.14941 7112 16
--1 -1 6 41.93164 44.86230 7128 48
--1 -1 19 42.68750 49.17285 7176 152
--1 -1 2 49.17090 50.00000 7328 16
--1 -1 3 49.73438 50.00000 7344 24
--1 -1 3 30.00000 30.86523 7368 24
--1 -1 5 49.09180 50.00000 7392 40
--1 -1 2 42.19629 42.33008 7432 16
--1 -1 3 30.00000 30.34180 7448 24
--1 -1 19 41.58105 50.00000 7472 152
--1 -1 5 49.14258 50.00000 7624 40
--1 -1 2 49.94336 50.00000 7664 16
--1 -1 2 49.99023 50.00000 7680 16
--1 -1 3 49.50781 49.98926 7696 24
--1 -1 8 40.09277 43.00586 7720 64
--1 -1 8 42.29492 48.26758 7784 64
--1 -1 6 47.68555 50.00000 7848 48
--1 -1 2 38.22461 38.30664 7896 16
--1 -1 2 38.30664 38.62109 7912 16
--1 -1 2 39.82910 40.09570 7928 16
--1 -1 2 38.00098 38.22461 7944 16
--1 -1 2 37.69531 37.83301 7960 16
--1 -1 2 37.83203 38.00098 7976 16
--1 -1 2 37.75879 38.02539 7992 16
--1 -1 2 37.75879 37.99707 8008 16
--1 -1 2 37.65723 37.66406 8024 16
--1 -1 2 37.99707 38.02539 8040 16
--1 -1 4 48.27832 49.00000 8056 32
--1 -1 9 30.00000 32.71777 8088 72
--1 -1 3 49.00000 49.00000 8160 24
--1 -1 5 48.09570 49.37695 8184 40
--1 -1 4 41.67578 42.54980 8224 32
--1 -1 8 43.01660 48.31250 8256 64
--1 -1 2 42.55469 43.01367 8320 16
--1 -1 8 42.48242 46.12207 8336 64
--1 -1 5 45.59277 47.36426 8400 40
--1 -1 3 46.11914 47.47168 8440 24
--1 -1 2 45.18359 45.59473 8464 16
--1 -1 7 30.00000 35.08594 8480 56
--1 -1 8 37.18848 41.99805 8536 64
--1 -1 2 42.70996 43.39746 8600 16
--1 -1 2 35.27344 35.32910 8616 16
--1 -1 2 35.84180 35.91602 8632 16
--1 -1 2 36.15137 36.15137 8648 16
--1 -1 13 10.00000 13.89062 8664 104
--1 -1 11 21.49805 30.00000 8768 88
--1 -1 7 15.35742 21.81543 8856 56
--1 -1 2 10.00000 10.27344 8912 16
--1 -1 4 10.00000 12.39355 8928 32
--1 -1 6 13.71680 23.00098 8960 48
--1 -1 4 10.00000 12.83008 9008 32
--1 -1 3 10.00000 10.99609 9040 24
--1 -1 7 11.89551 15.00195 9064 56
--1 -1 4 11.02441 11.67871 9120 32
--1 -1 2 20.84668 23.52148 9152 16
--1 -1 3 11.67871 12.39648 9168 24
--1 -1 2 14.99219 15.35938 9192 16
--1 -1 3 11.69336 13.89160 9208 24
--1 -1 3 19.14648 20.85254 9232 24
--1 -1 2 10.27344 10.60449 9256 16
--1 -1 2 12.82812 13.08203 9272 16
--1 -1 2 10.96387 11.09668 9288 16
--1 -1 2 10.00000 10.92188 9304 16
--1 -1 10 10.00000 17.99316 9320 80
--1 -1 4 29.18848 30.00000 9400 32
--1 -1 6 19.50000 30.00000 9432 48
--1 -1 8 10.00000 19.50000 9480 64
--1 -1 2 29.48535 30.00000 9544 16
--1 -1 5 21.99805 22.23242 9560 40
--1 -1 2 29.55078 30.00000 9600 16
--1 -1 3 21.76855 23.12598 9616 24
--1 -1 2 29.54590 29.57617 9640 16
--1 -1 3 10.00000 11.47754 9656 24
--1 -1 2 29.85352 30.00000 9680 16
--1 -1 5 22.70020 24.97949 9696 40
--1 -1 4 28.54492 29.47461 9736 32
--1 -1 3 29.45996 30.00000 9768 24
--1 -1 5 10.98242 12.70898 9792 40
--1 -1 3 25.77539 26.72559 9832 24
--1 -1 2 29.10449 30.00000 9856 16
--1 -1 2 27.17773 28.69824 9872 16
--1 -1 2 27.17773 28.69824 9888 16
--1 -1 3 28.77441 29.20508 9904 24
--1 -1 6 18.99902 25.47949 9928 48
--1 -1 2 25.63574 26.06543 9976 16
--1 -1 2 25.63574 26.06543 9992 16
--1 -1 2 25.63770 25.79004 10008 16
--1 -1 2 29.90137 30.00000 10024 16
--1 -1 2 24.55566 24.62012 10040 16
--1 -1 8 16.37793 18.99902 10056 64
--1 -1 9 25.19336 30.00000 10120 72
--1 -1 4 29.38867 30.00000 10192 32
--1 -1 11 24.26855 30.00000 10224 88
--1 -1 3 23.64844 24.32129 10312 24
--1 -1 19 21.14062 26.63184 10336 152
--1 -1 12 10.34473 20.38867 10488 96
--1 -1 7 26.53320 30.00000 10584 56
--1 -1 17 21.98242 29.46777 10640 136
--1 -1 14 22.04883 28.54883 10776 112
--1 -1 9 26.37305 28.32520 10888 72
--1 -1 4 27.76465 29.32715 10960 32
--1 -1 4 27.86426 30.00000 10992 32
--1 -1 2 21.96973 22.05078 11024 16
--1 -1 2 10.00000 10.35156 11040 16
--1 -1 14 21.14258 23.37793 11056 112
--1 -1 2 20.34668 20.35254 11168 16
--1 -1 10 13.92090 18.42090 11184 80
--1 -1 12 19.61230 22.39746 11264 96
--1 -1 4 11.63574 14.35059 11360 32
--1 -1 4 16.62695 19.69238 11392 32
--1 -1 5 17.52734 20.15527 11424 40
--1 -1 5 10.42285 11.66992 11464 40
--1 -1 5 14.70508 16.62891 11504 40
--1 -1 4 20.15723 21.68262 11544 32
--1 -1 3 11.86914 13.79590 11576 24
--1 -1 4 17.53027 18.21387 11600 32
--1 -1 3 14.32422 14.70703 11632 24
--1 -1 4 10.03223 10.42383 11656 32
--1 -1 5 22.14355 22.60938 11688 40
--1 -1 2 13.92969 14.70801 11728 16
--1 -1 2 21.43262 21.96973 11744 16
--1 -1 2 21.43457 21.68555 11760 16
--1 -1 2 22.20312 22.20410 11776 16
--1 -1 2 21.44922 21.66699 11792 16
--1 -1 2 11.66504 11.87109 11808 16
--1 -1 2 13.79590 13.93359 11824 16
--1 -1 6 28.14453 30.00000 11840 48
--1 -1 10 14.54883 17.82031 11888 80
--1 -1 4 25.96680 28.14453 11968 32
--1 -1 8 13.00000 14.99316 12000 64
--1 -1 3 10.70801 11.06250 12064 24
--1 -1 3 13.81836 14.43164 12088 24
--1 -1 2 14.27441 15.07324 12112 16
--1 -1 3 17.81934 18.48730 12128 24
--1 -1 2 13.74609 14.22754 12152 16
--1 -1 2 15.07324 15.72461 12168 16
--1 -1 2 13.40527 13.81836 12184 16
--1 -1 2 12.98633 13.00000 12200 16
--1 -1 3 10.00000 11.85352 12216 24
--1 -1 2 18.04199 19.70605 12240 16
--1 -1 9 20.76465 30.00000 12256 72
--1 -1 7 10.00000 13.50391 12328 56
--1 -1 4 14.72461 16.63867 12384 32
--1 -1 5 12.32324 13.70801 12416 40
--1 -1 6 10.00000 12.00781 12456 48
--1 -1 6 13.06055 13.82617 12504 48
--1 -1 7 14.72559 15.70508 12552 56
--1 -1 6 15.49805 27.29004 12608 48
--1 -1 2 10.00000 11.00391 12656 16
--1 -1 4 10.95801 12.15527 12672 32
--1 -1 4 10.15137 10.66504 12704 32
--1 -1 6 13.27637 15.08984 12736 48
--1 -1 3 11.89551 12.25195 12784 24
--1 -1 4 11.89355 12.40820 12808 32
--1 -1 2 11.00098 11.10938 12840 16
--1 -1 2 21.82520 25.00000 12856 16
--1 -1 2 13.70898 14.76465 12872 16
--1 -1 3 10.25684 10.72168 12888 24
--1 -1 2 12.00781 12.50293 12912 16
--1 -1 2 10.25781 10.43359 12928 16
--1 -1 2 27.66699 27.66699 12944 16
--1 -1 2 12.15430 12.29297 12960 16
--1 -1 2 12.25000 12.50391 12976 16
--1 -1 2 12.29395 12.67578 12992 16
--1 -1 2 10.60840 10.91797 13008 16
--1 -1 2 11.09863 11.13965 13024 16
--1 -1 2 10.92871 10.96094 13040 16
--1 -1 7 -8.09766 -5.85645 13056 56
--1 -1 7 4.68164 10.00000 13112 56
--1 -1 18 -3.92285 2.26660 13168 144
--1 -1 5 7.98535 9.08594 13312 40
--1 -1 4 3.47852 5.13574 13352 32
--1 -1 9 -5.01465 2.42383 13384 72
--1 -1 7 1.72168 7.52930 13456 56
--1 -1 4 6.58887 10.00000 13512 32
--1 -1 7 7.52637 9.99023 13544 56
--1 -1 4 7.89355 10.00000 13600 32
--1 -1 4 2.22168 3.64160 13632 32
--1 -1 2 9.99219 10.00000 13664 16
--1 -1 4 0.97559 2.34473 13680 32
--1 -1 4 6.28125 10.00000 13712 32
--1 -1 4 -5.77930 -4.63379 13744 32
--1 -1 2 6.36426 7.89551 13776 16
--1 -1 2 7.54590 7.98633 13792 16
--1 -1 2 -6.05273 -5.85645 13808 16
--1 -1 2 2.42773 3.07422 13824 16
--1 -1 2 6.10059 6.59277 13840 16
--1 -1 2 6.21777 6.28027 13856 16
--1 -1 3 -10.00000 -8.48145 13872 24
--1 -1 4 -10.00000 -7.05566 13896 32
--1 -1 23 -4.67090 10.00000 13928 184
--1 -1 13 3.40625 10.00000 14112 104
--1 -1 4 -10.00000 -9.39648 14216 32
--1 -1 3 9.08594 10.00000 14248 24
--1 -1 9 4.12695 5.38184 14272 72
--1 -1 10 -4.46094 -2.30957 14344 80
--1 -1 4 -8.47949 -4.44922 14424 32
--1 -1 6 3.49121 4.61914 14456 48
--1 -1 4 1.11230 4.22266 14504 32
--1 -1 2 -9.40625 -8.19336 14536 16
--1 -1 3 -2.39844 -1.06152 14552 24
--1 -1 3 4.60059 5.02344 14576 24
--1 -1 2 -2.73828 -1.69238 14600 16
--1 -1 2 0.23438 1.11328 14616 16
--1 -1 2 -1.00098 0.23633 14632 16
--1 -1 2 -1.69238 -1.38477 14648 16
--1 -1 9 3.72363 10.00000 14664 72
--1 -1 3 -1.67188 2.82129 14736 24
--1 -1 2 2.83301 3.99023 14760 16
--1 -1 2 6.41992 6.42188 14776 16
--1 -1 2 9.52832 10.00000 14792 16
--1 -1 9 0.85352 4.36133 14808 72
--1 -1 7 5.63086 6.71094 14880 56
--1 -1 3 4.01855 4.89551 14936 24
--1 -1 3 4.31445 4.90234 14960 24
--1 -1 2 1.27832 1.31152 14984 16
--1 -1 2 -9.10156 -2.60547 15000 16
--1 -1 2 -4.37109 -4.28320 15016 16
--1 -1 3 8.02930 9.56836 15032 24
--1 -1 4 -4.42773 -3.36914 15056 32
--1 -1 13 -4.22461 1.43750 15088 104
--1 -1 4 -10.00000 -9.69238 15192 32
--1 -1 9 -10.00000 -4.14648 15224 72
--1 -1 4 -10.00000 -9.42969 15296 32
--1 -1 3 4.38281 5.23242 15328 24
--1 -1 9 6.11914 10.00000 15352 72
--1 -1 8 -4.99609 -0.10742 15424 64
--1 -1 8 0.64941 4.22168 15488 64
--1 -1 6 3.56055 5.20605 15552 48
--1 -1 5 7.22852 8.67480 15600 40
--1 -1 7 5.20312 7.84668 15640 56
--1 -1 4 2.79199 6.19336 15696 32
--1 -1 6 1.22461 2.14355 15728 48
--1 -1 3 1.22168 2.79004 15776 24
--1 -1 4 0.61914 1.71387 15800 32
--1 -1 2 7.84570 8.11621 15832 16
--1 -1 11 1.18555 5.48535 15848 88
--1 -1 8 1.89355 4.03516 15936 64
--1 -1 4 2.33008 5.76465 16000 32
--1 -1 3 8.11621 8.53516 16032 24
--1 -1 4 9.48145 10.00000 16056 32
--1 -1 4 8.37793 10.00000 16088 32
--1 -1 5 4.35352 7.56055 16120 40
--1 -1 5 8.27539 9.99805 16160 40
--1 -1 7 7.19434 8.44629 16200 56
--1 -1 3 7.41797 8.56836 16256 24
--1 -1 2 8.78125 10.00000 16280 16
--1 -1 2 6.92676 8.48828 16296 16
--1 -1 4 5.58984 8.78027 16312 32
--1 -1 2 5.10059 5.58887 16344 16
--1 -1 2 5.08594 5.11426 16360 16
--1 -1 6 -17.90332 -16.96875 16376 48
--1 -1 3 -23.97559 -22.00098 16424 24
--1 -1 6 -28.96094 -28.02832 16448 48
--1 -1 2 -28.42578 -26.45508 16496 16
--1 -1 3 -23.23926 -22.68555 16512 24
--1 -1 17 -13.45410 -10.00000 16536 136
--1 -1 20 -17.13574 -10.00000 16672 160
--1 -1 2 -11.56543 -10.00000 16832 16
--1 -1 8 -17.95898 -14.01270 16848 64
--1 -1 2 -18.01465 -17.90332 16912 16
--1 -1 5 -26.89551 -25.29980 16928 40
--1 -1 5 -17.62598 -10.87109 16968 40
--1 -1 4 -22.00098 -17.99902 17008 32
--1 -1 4 -26.89648 -23.97559 17040 32
--1 -1 4 -20.50977 -17.47852 17072 32
--1 -1 3 -24.63184 -22.19238 17104 24
--1 -1 4 -30.00000 -28.61328 17128 32
--1 -1 10 -27.31641 -22.41797 17160 80
--1 -1 5 -21.34473 -18.40430 17240 40
--1 -1 4 -17.34570 -15.63379 17280 32
--1 -1 3 -18.48535 -17.79785 17312 24
--1 -1 3 -22.06543 -20.50781 17336 24
--1 -1 3 -22.41602 -21.34766 17360 24
--1 -1 2 -11.41602 -10.68945 17384 16
--1 -1 3 -29.64160 -28.61426 17400 24
--1 -1 2 -26.45508 -24.76660 17424 16
--1 -1 2 -18.41113 -17.35742 17440 16
--1 -1 2 -18.01660 -17.47949 17456 16
--1 -1 2 -30.00000 -29.64258 17472 16
--1 -1 2 -25.62402 -24.73926 17488 16
--1 -1 2 -26.83984 -25.95801 17504 16
--1 -1 2 -24.74414 -24.63086 17520 16
--1 -1 2 -22.19238 -22.06348 17536 16
--1 -1 2 -10.68945 -10.47949 17552 16
--1 -1 13 -30.00000 -17.50488 17568 104
--1 -1 2 -10.69141 -10.00000 17672 16
--1 -1 10 -16.26465 -10.00000 17688 80
--1 -1 3 -10.00391 -10.00000 17768 24
--1 -1 4 -11.13477 -10.00000 17792 32
--1 -1 7 -18.34766 -10.95117 17824 56
--1 -1 8 -24.16602 -21.78809 17880 64
--1 -1 3 -22.23926 -19.29883 17944 24
--1 -1 5 -20.16895 -16.26465 17968 40
--1 -1 3 -30.00000 -27.17188 18008 24
--1 -1 6 -27.43359 -22.08594 18032 48
--1 -1 2 -24.34863 -24.16602 18080 16
--1 -1 3 -27.29492 -24.24902 18096 24
--1 -1 5 -22.08984 -19.29688 18120 40
--1 -1 3 -27.17188 -25.57324 18160 24
--1 -1 2 -27.43262 -27.29688 18184 16
--1 -1 2 -22.08887 -22.08203 18200 16
--1 -1 4 -30.65918 -30.00000 18216 32
--1 -1 2 -30.31738 -30.00000 18248 16
--1 -1 2 -30.40430 -30.31738 18264 16
--1 -1 21 -50.00000 -30.00000 18280 168
--1 -1 3 -32.45020 -30.00000 18448 24
--1 -1 8 -33.74609 -30.11035 18472 64
--1 -1 2 -34.17383 -32.45410 18536 16
--1 -1 5 -51.99805 -50.00000 18552 40
--1 -1 2 -54.88574 -52.64355 18592 16
--1 -1 2 -52.37793 -51.99512 18608 16
+-1 -1 2 70.00000 70.06710 0 16
+-1 -1 2 70.00000 70.08820 16 16
+-1 -1 7 50.00000 51.01900 32 56
+-1 -1 7 50.00000 53.60750 88 56
+-1 -1 2 54.46630 54.47670 144 16
+-1 -1 2 50.00000 50.32320 160 16
+-1 -1 18 58.90490 68.50860 176 144
+-1 -1 3 50.00000 50.16690 320 24
+-1 -1 2 50.00000 51.09100 344 16
+-1 -1 4 50.86580 53.27000 360 32
+-1 -1 3 50.75650 51.48650 392 24
+-1 -1 2 50.00000 50.12660 416 16
+-1 -1 2 54.76570 55.08640 432 16
+-1 -1 6 50.00000 54.46630 448 48
+-1 -1 2 68.40670 69.05760 496 16
+-1 -1 8 65.51320 70.00000 512 64
+-1 -1 7 62.91430 69.05060 576 56
+-1 -1 4 55.67540 56.45060 632 32
+-1 -1 4 55.67540 56.45060 664 32
+-1 -1 3 53.94780 54.97720 696 24
+-1 -1 3 53.94780 54.97720 720 24
+-1 -1 4 50.00000 50.95950 744 32
+-1 -1 3 51.84390 52.36700 776 24
+-1 -1 3 57.53580 58.08450 800 24
+-1 -1 2 55.60310 56.14940 824 16
+-1 -1 2 55.60310 56.14940 840 16
+-1 -1 2 51.37510 51.63029 856 16
+-1 -1 2 60.54760 62.91250 872 16
+-1 -1 2 56.15120 57.53640 888 16
+-1 -1 4 69.02950 70.00000 904 32
+-1 -1 2 54.46080 55.60310 936 16
+-1 -1 2 51.53110 51.92260 952 16
+-1 -1 2 51.63029 51.92080 968 16
+-1 -1 2 52.10820 53.12110 984 16
+-1 -1 2 53.12110 53.43880 1000 16
+-1 -1 3 54.97720 55.67480 1016 24
+-1 -1 3 54.97720 55.67480 1040 24
+-1 -1 2 50.95950 51.25950 1064 16
+-1 -1 2 51.25280 51.37510 1080 16
+-1 -1 2 53.43850 53.80440 1096 16
+-1 -1 2 51.25310 51.94431 1112 16
+-1 -1 2 55.07210 55.24879 1128 16
+-1 -1 2 54.36501 55.07180 1144 16
+-1 -1 2 58.00980 59.15970 1160 16
+-1 -1 2 51.94431 52.10820 1176 16
+-1 -1 2 51.36900 51.84330 1192 16
+-1 -1 2 57.53580 58.00980 1208 16
+-1 -1 2 54.00211 54.46021 1224 16
+-1 -1 2 55.67509 55.82650 1240 16
+-1 -1 2 55.67509 55.82650 1256 16
+-1 -1 2 55.79200 56.14940 1272 16
+-1 -1 2 55.79200 56.14940 1288 16
+-1 -1 2 53.80320 54.00211 1304 16
+-1 -1 2 59.15970 59.35260 1320 16
+-1 -1 2 55.79200 55.82650 1336 16
+-1 -1 2 55.79200 55.82650 1352 16
+-1 -1 2 51.25950 51.36900 1368 16
+-1 -1 2 59.35260 59.47860 1384 16
+-1 -1 2 60.25529 60.54550 1400 16
+-1 -1 3 50.00000 51.76910 1416 24
+-1 -1 2 50.00000 50.37510 1440 16
+-1 -1 6 50.52831 51.12000 1456 48
+-1 -1 3 50.47820 51.15600 1504 24
+-1 -1 4 51.45480 51.78100 1528 32
+-1 -1 2 50.00000 50.37690 1560 16
+-1 -1 2 50.52859 51.50670 1576 16
+-1 -1 2 51.46429 51.50670 1592 16
+-1 -1 2 51.08490 51.15600 1608 16
+-1 -1 2 51.08459 51.12000 1624 16
+-1 -1 9 52.00080 54.18250 1640 72
+-1 -1 4 50.79260 51.26470 1712 32
+-1 -1 2 50.85330 51.66930 1744 16
+-1 -1 6 53.43600 54.38790 1760 48
+-1 -1 3 54.64520 55.36720 1808 24
+-1 -1 4 53.34570 54.47549 1832 32
+-1 -1 2 54.39090 54.64301 1864 16
+-1 -1 2 54.39090 54.64301 1880 16
+-1 -1 3 54.19320 55.29670 1896 24
+-1 -1 2 55.29730 55.36840 1920 16
+-1 -1 2 51.61990 52.00080 1936 16
+-1 -1 3 53.43600 54.11110 1952 24
+-1 -1 2 51.66930 53.34540 1976 16
+-1 -1 2 54.19780 54.39250 1992 16
+-1 -1 2 51.42820 51.61990 2008 16
+-1 -1 2 54.18250 54.19680 2024 16
+-1 -1 2 51.26680 51.43010 2040 16
+-1 -1 5 50.00000 50.87460 2056 40
+-1 -1 5 50.00000 52.14360 2096 40
+-1 -1 3 50.00000 51.00250 2136 24
+-1 -1 4 50.73610 51.31440 2160 32
+-1 -1 3 50.00000 50.28410 2192 24
+-1 -1 6 50.00000 51.88020 2216 48
+-1 -1 2 50.00000 51.12950 2264 16
+-1 -1 7 50.20840 53.55410 2280 56
+-1 -1 2 50.00000 50.20290 2336 16
+-1 -1 3 60.30750 69.64570 2352 24
+-1 -1 9 54.70770 60.35229 2376 72
+-1 -1 3 54.09950 55.07060 2448 24
+-1 -1 4 49.23280 50.00000 2472 32
+-1 -1 5 45.76780 46.87100 2504 40
+-1 -1 4 47.58510 50.00000 2544 32
+-1 -1 6 30.00000 33.17240 2576 48
+-1 -1 14 43.78870 47.54060 2624 112
+-1 -1 10 47.27470 50.00000 2736 80
+-1 -1 6 46.86920 48.15460 2816 48
+-1 -1 6 45.93221 47.80700 2864 48
+-1 -1 2 39.80700 39.84480 2912 16
+-1 -1 3 41.85049 42.62590 2928 24
+-1 -1 2 48.61690 49.51810 2952 16
+-1 -1 3 49.46010 50.00000 2968 24
+-1 -1 3 49.98020 50.00000 2992 24
+-1 -1 6 45.59810 47.09470 3016 48
+-1 -1 7 30.23380 36.94350 3064 56
+-1 -1 5 48.14420 49.01880 3120 40
+-1 -1 2 42.60210 42.70920 3160 16
+-1 -1 2 49.54500 50.00000 3176 16
+-1 -1 2 42.43460 42.50690 3192 16
+-1 -1 3 42.50690 42.56550 3208 24
+-1 -1 2 42.95280 43.18230 3232 16
+-1 -1 2 39.87010 39.93060 3248 16
+-1 -1 2 43.91350 43.91620 3264 16
+-1 -1 2 47.06420 47.27410 3280 16
+-1 -1 2 48.01241 48.14360 3296 16
+-1 -1 2 42.46111 42.46230 3312 16
+-1 -1 2 42.48650 42.66290 3328 16
+-1 -1 2 41.34140 41.41071 3344 16
+-1 -1 2 43.72950 43.75750 3360 16
+-1 -1 2 47.69310 47.69310 3376 16
+-1 -1 10 42.54601 45.18640 3392 80
+-1 -1 2 43.12340 43.53440 3472 16
+-1 -1 3 44.85310 45.90750 3488 24
+-1 -1 4 45.45860 46.48370 3512 32
+-1 -1 4 49.07840 49.43690 3544 32
+-1 -1 9 43.62480 46.15140 3576 72
+-1 -1 8 30.00000 33.37800 3648 64
+-1 -1 3 30.00000 31.64710 3712 24
+-1 -1 9 45.21201 48.26380 3736 72
+-1 -1 4 48.41180 50.00000 3808 32
+-1 -1 3 47.95350 48.57600 3840 24
+-1 -1 6 40.73530 41.75010 3864 48
+-1 -1 5 35.92661 36.83360 3912 40
+-1 -1 5 39.66900 42.53990 3952 40
+-1 -1 2 30.00000 31.32270 3992 16
+-1 -1 6 41.34140 44.22630 4008 48
+-1 -1 5 30.00000 31.83290 4056 40
+-1 -1 2 49.90331 50.00000 4096 16
+-1 -1 2 31.98670 32.75000 4112 16
+-1 -1 2 46.55120 48.00990 4128 16
+-1 -1 2 49.62310 49.90421 4144 16
+-1 -1 3 41.71250 42.08820 4160 24
+-1 -1 2 33.37531 33.94480 4184 16
+-1 -1 2 31.93850 32.23610 4200 16
+-1 -1 3 47.83141 48.36760 4216 24
+-1 -1 3 47.10930 47.86830 4240 24
+-1 -1 2 48.58820 49.06550 4264 16
+-1 -1 2 48.07130 48.46490 4280 16
+-1 -1 2 48.25860 48.46490 4296 16
+-1 -1 2 33.09390 33.24900 4312 16
+-1 -1 2 36.02980 36.20490 4328 16
+-1 -1 2 31.21740 31.59670 4344 16
+-1 -1 2 48.00960 48.07130 4360 16
+-1 -1 2 48.36760 48.58820 4376 16
+-1 -1 2 37.64870 37.83950 4392 16
+-1 -1 2 36.46920 36.49150 4408 16
+-1 -1 2 45.13730 45.43180 4424 16
+-1 -1 2 46.41570 46.55120 4440 16
+-1 -1 2 36.56290 36.76649 4456 16
+-1 -1 2 37.25170 37.50470 4472 16
+-1 -1 2 38.11230 38.32440 4488 16
+-1 -1 2 39.38741 39.39861 4504 16
+-1 -1 2 36.93000 37.06400 4520 16
+-1 -1 2 39.81400 40.03620 4536 16
+-1 -1 2 36.62970 36.64130 4552 16
+-1 -1 2 38.48400 38.70130 4568 16
+-1 -1 2 40.25439 40.40359 4584 16
+-1 -1 2 38.88040 39.07550 4600 16
+-1 -1 2 31.80760 31.80820 4616 16
+-1 -1 2 33.20710 33.25170 4632 16
+-1 -1 2 43.90430 43.92900 4648 16
+-1 -1 2 41.94230 42.32650 4664 16
+-1 -1 3 42.56340 43.12340 4680 24
+-1 -1 4 33.09450 34.65610 4704 32
+-1 -1 14 30.00000 39.64861 4736 112
+-1 -1 2 36.83360 37.32160 4848 16
+-1 -1 7 36.95200 38.28200 4864 56
+-1 -1 8 41.26270 42.79770 4920 64
+-1 -1 5 39.63271 41.58310 4984 40
+-1 -1 6 38.44530 39.71970 5024 48
+-1 -1 3 49.94200 50.00000 5072 24
+-1 -1 5 38.87800 41.29870 5096 40
+-1 -1 5 36.97060 37.38480 5136 40
+-1 -1 4 41.89680 42.89910 5176 32
+-1 -1 4 41.89680 42.89910 5208 32
+-1 -1 4 41.89680 42.89910 5240 32
+-1 -1 6 46.34550 48.24860 5272 48
+-1 -1 4 41.28680 42.33720 5320 32
+-1 -1 2 49.60510 49.62310 5352 16
+-1 -1 3 42.89910 43.54570 5368 24
+-1 -1 3 42.89910 43.54570 5392 24
+-1 -1 3 41.05000 41.89590 5416 24
+-1 -1 3 41.19620 41.89720 5440 24
+-1 -1 4 33.94480 37.06190 5464 32
+-1 -1 3 30.00000 31.93850 5496 24
+-1 -1 3 38.84200 39.70570 5520 24
+-1 -1 3 48.24860 50.00000 5544 24
+-1 -1 2 49.06550 49.18390 5568 16
+-1 -1 3 30.00000 30.01530 5584 24
+-1 -1 2 41.11070 41.29780 5608 16
+-1 -1 2 41.11070 41.29780 5624 16
+-1 -1 2 41.32620 45.00300 5640 16
+-1 -1 3 45.00240 45.57120 5656 24
+-1 -1 2 37.05970 37.31980 5680 16
+-1 -1 2 49.18390 49.60049 5696 16
+-1 -1 2 40.66479 40.66510 5712 16
+-1 -1 2 30.00000 30.00790 5728 16
+-1 -1 2 41.00420 41.00570 5744 16
+-1 -1 17 33.40760 41.93130 5760 136
+-1 -1 3 44.86230 44.92970 5896 24
+-1 -1 23 30.00000 38.47210 5920 184
+-1 -1 12 30.00000 37.02560 6104 96
+-1 -1 7 30.86490 33.40520 6200 56
+-1 -1 3 30.00000 31.59640 6256 24
+-1 -1 4 35.60520 36.95200 6280 32
+-1 -1 4 41.23430 42.22400 6312 32
+-1 -1 7 32.30320 35.50031 6344 56
+-1 -1 3 37.36550 40.03100 6400 24
+-1 -1 3 37.36550 40.03100 6424 24
+-1 -1 6 41.00420 42.25270 6448 48
+-1 -1 4 40.14570 41.00600 6496 32
+-1 -1 6 42.25330 43.26860 6528 48
+-1 -1 3 42.33051 42.80630 6576 24
+-1 -1 4 39.50760 40.24490 6600 32
+-1 -1 5 40.60750 42.25270 6632 40
+-1 -1 4 39.19200 39.62020 6672 32
+-1 -1 4 37.18580 39.29430 6704 32
+-1 -1 5 40.22450 41.05030 6736 40
+-1 -1 4 39.29370 40.14910 6776 32
+-1 -1 3 40.03070 41.23550 6808 24
+-1 -1 5 42.42419 43.73770 6832 40
+-1 -1 5 42.42419 43.73770 6872 40
+-1 -1 2 31.59910 32.30410 6912 16
+-1 -1 2 42.80630 43.26860 6928 16
+-1 -1 3 39.89330 40.16310 6944 24
+-1 -1 2 43.48620 44.60530 6968 16
+-1 -1 4 41.14370 42.42390 6984 32
+-1 -1 2 41.14340 41.19431 7016 16
+-1 -1 2 39.88750 39.88820 7032 16
+-1 -1 2 40.42979 40.72470 7048 16
+-1 -1 2 40.18480 40.22450 7064 16
+-1 -1 2 41.05150 41.19431 7080 16
+-1 -1 2 40.99930 41.00110 7096 16
+-1 -1 2 40.14180 40.14910 7112 16
+-1 -1 6 41.93130 44.86230 7128 48
+-1 -1 19 42.68790 49.17300 7176 152
+-1 -1 2 49.17050 50.00000 7328 16
+-1 -1 3 49.73450 50.00000 7344 24
+-1 -1 3 30.00000 30.86490 7368 24
+-1 -1 5 49.09210 50.00000 7392 40
+-1 -1 2 42.19650 42.33051 7432 16
+-1 -1 3 30.00000 30.34210 7448 24
+-1 -1 19 41.58130 50.00000 7472 152
+-1 -1 5 49.14211 50.00000 7624 40
+-1 -1 2 49.94350 50.00000 7664 16
+-1 -1 2 49.99050 50.00000 7680 16
+-1 -1 3 49.50771 49.98930 7696 24
+-1 -1 8 40.09290 43.00560 7720 64
+-1 -1 8 42.29539 48.26750 7784 64
+-1 -1 6 47.68550 50.00000 7848 48
+-1 -1 2 38.22490 38.30640 7896 16
+-1 -1 2 38.30640 38.62100 7912 16
+-1 -1 2 39.82930 40.09600 7928 16
+-1 -1 2 38.00060 38.22490 7944 16
+-1 -1 2 37.69540 37.83280 7960 16
+-1 -1 2 37.83220 38.00060 7976 16
+-1 -1 2 37.75860 38.02500 7992 16
+-1 -1 2 37.75860 37.99660 8008 16
+-1 -1 2 37.65700 37.66430 8024 16
+-1 -1 2 37.99660 38.02500 8040 16
+-1 -1 4 48.27820 48.99960 8056 32
+-1 -1 9 30.00000 32.71820 8088 72
+-1 -1 3 48.99960 48.99960 8160 24
+-1 -1 5 48.09600 49.37650 8184 40
+-1 -1 4 41.67560 42.54990 8224 32
+-1 -1 8 43.01630 48.31240 8256 64
+-1 -1 2 42.55420 43.01320 8320 16
+-1 -1 8 42.48280 46.12240 8336 64
+-1 -1 5 45.59320 47.36450 8400 40
+-1 -1 3 46.11960 47.47130 8440 24
+-1 -1 2 45.18390 45.59470 8464 16
+-1 -1 7 30.00000 35.08580 8480 56
+-1 -1 8 37.18820 41.99850 8536 64
+-1 -1 2 42.70980 43.39709 8600 16
+-1 -1 2 35.27350 35.32910 8616 16
+-1 -1 2 35.84180 35.91590 8632 16
+-1 -1 2 36.15150 36.15150 8648 16
+-1 -1 13 10.00000 13.89040 8664 104
+-1 -1 11 21.49830 30.00000 8768 88
+-1 -1 7 15.35710 21.81540 8856 56
+-1 -1 2 10.00000 10.27340 8912 16
+-1 -1 4 10.00000 12.39350 8928 32
+-1 -1 6 13.71710 23.00100 8960 48
+-1 -1 4 10.00000 12.82960 9008 32
+-1 -1 3 10.00000 10.99580 9040 24
+-1 -1 7 11.89520 15.00190 9064 56
+-1 -1 4 11.02480 11.67850 9120 32
+-1 -1 2 20.84640 23.52160 9152 16
+-1 -1 3 11.67910 12.39600 9168 24
+-1 -1 2 14.99180 15.35930 9192 16
+-1 -1 3 11.69380 13.89200 9208 24
+-1 -1 3 19.14660 20.85220 9232 24
+-1 -1 2 10.27340 10.60490 9256 16
+-1 -1 2 12.82780 13.08170 9272 16
+-1 -1 2 10.96410 11.09680 9288 16
+-1 -1 2 10.00000 10.92160 9304 16
+-1 -1 10 10.00000 17.99270 9320 80
+-1 -1 4 29.18880 30.00000 9400 32
+-1 -1 6 19.50030 30.00000 9432 48
+-1 -1 8 10.00000 19.49970 9480 64
+-1 -1 2 29.48550 30.00000 9544 16
+-1 -1 5 21.99850 22.23220 9560 40
+-1 -1 2 29.55110 30.00000 9600 16
+-1 -1 3 21.76810 23.12610 9616 24
+-1 -1 2 29.54620 29.57610 9640 16
+-1 -1 3 10.00000 11.47710 9656 24
+-1 -1 2 29.85320 30.00000 9680 16
+-1 -1 5 22.69980 24.97950 9696 40
+-1 -1 4 28.54520 29.47450 9736 32
+-1 -1 3 29.45950 30.00000 9768 24
+-1 -1 5 10.98210 12.70880 9792 40
+-1 -1 3 25.77510 26.72600 9832 24
+-1 -1 2 29.10430 30.00000 9856 16
+-1 -1 2 27.17740 28.69840 9872 16
+-1 -1 2 27.17740 28.69840 9888 16
+-1 -1 3 28.77470 29.20530 9904 24
+-1 -1 6 18.99920 25.47910 9928 48
+-1 -1 2 25.63620 26.06560 9976 16
+-1 -1 2 25.63620 26.06560 9992 16
+-1 -1 2 25.63780 25.79000 10008 16
+-1 -1 2 29.90110 30.00000 10024 16
+-1 -1 2 24.55590 24.62030 10040 16
+-1 -1 8 16.37770 18.99920 10056 64
+-1 -1 9 25.19310 30.00000 10120 72
+-1 -1 4 29.38840 30.00000 10192 32
+-1 -1 11 24.26900 30.00000 10224 88
+-1 -1 3 23.64830 24.32120 10312 24
+-1 -1 19 21.14090 26.63200 10336 152
+-1 -1 12 10.34490 20.38830 10488 96
+-1 -1 7 26.53280 30.00000 10584 56
+-1 -1 17 21.98230 29.46750 10640 136
+-1 -1 14 22.04850 28.54920 10776 112
+-1 -1 9 26.37260 28.32490 10888 72
+-1 -1 4 27.76490 29.32710 10960 32
+-1 -1 4 27.86430 30.00000 10992 32
+-1 -1 2 21.96980 22.05040 11024 16
+-1 -1 2 10.00000 10.35190 11040 16
+-1 -1 14 21.14270 23.37790 11056 112
+-1 -1 2 20.34620 20.35230 11168 16
+-1 -1 10 13.92070 18.42110 11184 80
+-1 -1 12 19.61200 22.39770 11264 96
+-1 -1 4 11.63550 14.35070 11360 32
+-1 -1 4 16.62730 19.69250 11392 32
+-1 -1 5 17.52760 20.15520 11424 40
+-1 -1 5 10.42240 11.66990 11464 40
+-1 -1 5 14.70530 16.62850 11504 40
+-1 -1 4 20.15760 21.68290 11544 32
+-1 -1 3 11.86950 13.79610 11576 24
+-1 -1 4 17.53030 18.21420 11600 32
+-1 -1 3 14.32410 14.70680 11632 24
+-1 -1 4 10.03200 10.42390 11656 32
+-1 -1 5 22.14370 22.60940 11688 40
+-1 -1 2 13.92980 14.70800 11728 16
+-1 -1 2 21.43270 21.96980 11744 16
+-1 -1 2 21.43480 21.68540 11760 16
+-1 -1 2 22.20330 22.20390 11776 16
+-1 -1 2 21.44910 21.66740 11792 16
+-1 -1 2 11.66480 11.87080 11808 16
+-1 -1 2 13.79580 13.93350 11824 16
+-1 -1 6 28.14420 30.00000 11840 48
+-1 -1 10 14.54840 17.81990 11888 80
+-1 -1 4 25.96640 28.14420 11968 32
+-1 -1 8 12.99990 14.99310 12000 64
+-1 -1 3 10.70830 11.06290 12064 24
+-1 -1 3 13.81870 14.43150 12088 24
+-1 -1 2 14.27440 15.07360 12112 16
+-1 -1 3 17.81900 18.48770 12128 24
+-1 -1 2 13.74610 14.22740 12152 16
+-1 -1 2 15.07360 15.72460 12168 16
+-1 -1 2 13.40520 13.81810 12184 16
+-1 -1 2 12.98680 12.99990 12200 16
+-1 -1 3 10.00000 11.85310 12216 24
+-1 -1 2 18.04210 19.70600 12240 16
+-1 -1 9 20.76490 30.00000 12256 72
+-1 -1 7 10.00000 13.50410 12328 56
+-1 -1 4 14.72480 16.63860 12384 32
+-1 -1 5 12.32330 13.70790 12416 40
+-1 -1 6 10.00000 12.00810 12456 48
+-1 -1 6 13.06100 13.82640 12504 48
+-1 -1 7 14.72600 15.70470 12552 56
+-1 -1 6 15.49840 27.29030 12608 48
+-1 -1 2 10.00000 11.00400 12656 16
+-1 -1 4 10.95800 12.15520 12672 32
+-1 -1 4 10.15110 10.66470 12704 32
+-1 -1 6 13.27640 15.09010 12736 48
+-1 -1 3 11.89580 12.25190 12784 24
+-1 -1 4 11.89390 12.40790 12808 32
+-1 -1 2 11.00130 11.10930 12840 16
+-1 -1 2 21.82510 25.00020 12856 16
+-1 -1 2 13.70890 14.76420 12872 16
+-1 -1 3 10.25700 10.72140 12888 24
+-1 -1 2 12.00810 12.50340 12912 16
+-1 -1 2 10.25820 10.43370 12928 16
+-1 -1 2 27.66660 27.66690 12944 16
+-1 -1 2 12.15400 12.29340 12960 16
+-1 -1 2 12.25010 12.50430 12976 16
+-1 -1 2 12.29400 12.67580 12992 16
+-1 -1 2 10.60820 10.91800 13008 16
+-1 -1 2 11.09860 11.13920 13024 16
+-1 -1 2 10.92840 10.96070 13040 16
+-1 -1 7 -8.09812 -5.85657 13056 56
+-1 -1 7 4.68162 10.00000 13112 56
+-1 -1 18 -3.92325 2.26642 13168 144
+-1 -1 5 7.98520 9.08598 13312 40
+-1 -1 4 3.47890 5.13542 13352 32
+-1 -1 9 -5.01427 2.42390 13384 72
+-1 -1 7 1.72198 7.52956 13456 56
+-1 -1 4 6.58839 10.00000 13512 32
+-1 -1 7 7.52682 9.98993 13544 56
+-1 -1 4 7.89364 10.00000 13600 32
+-1 -1 4 2.22156 3.64187 13632 32
+-1 -1 2 9.99237 10.00000 13664 16
+-1 -1 4 0.97551 2.34485 13680 32
+-1 -1 4 6.28077 10.00000 13712 32
+-1 -1 4 -5.77966 -4.63371 13744 32
+-1 -1 2 6.36469 7.89548 13776 16
+-1 -1 2 7.54574 7.98672 13792 16
+-1 -1 2 -6.05249 -5.85626 13808 16
+-1 -1 2 2.42725 3.07424 13824 16
+-1 -1 2 6.10040 6.59236 13840 16
+-1 -1 2 6.21820 6.28016 13856 16
+-1 -1 3 -10.00000 -8.48142 13872 24
+-1 -1 4 -10.00000 -7.05531 13896 32
+-1 -1 23 -4.67094 10.00000 13928 184
+-1 -1 13 3.40658 10.00000 14112 104
+-1 -1 4 -10.00000 -9.39605 14216 32
+-1 -1 3 9.08598 10.00000 14248 24
+-1 -1 9 4.12680 5.38140 14272 72
+-1 -1 10 -4.46098 -2.30945 14344 80
+-1 -1 4 -8.47929 -4.44938 14424 32
+-1 -1 6 3.49111 4.61936 14456 48
+-1 -1 4 1.11254 4.22263 14504 32
+-1 -1 2 -9.40612 -8.19303 14536 16
+-1 -1 3 -2.39796 -1.06126 14552 24
+-1 -1 3 4.60105 5.02373 14576 24
+-1 -1 2 -2.73854 -1.69268 14600 16
+-1 -1 2 0.23483 1.11376 14616 16
+-1 -1 2 -1.00114 0.23666 14632 16
+-1 -1 2 -1.69268 -1.38445 14648 16
+-1 -1 9 3.72335 10.00000 14664 72
+-1 -1 3 -1.67224 2.82094 14736 24
+-1 -1 2 2.83284 3.99008 14760 16
+-1 -1 2 6.41993 6.42145 14776 16
+-1 -1 2 9.52819 10.00000 14792 16
+-1 -1 9 0.85374 4.36118 14808 72
+-1 -1 7 5.63104 6.71107 14880 56
+-1 -1 3 4.01877 4.89586 14936 24
+-1 -1 3 4.31418 4.90257 14960 24
+-1 -1 2 1.27825 1.31121 14984 16
+-1 -1 2 -9.10155 -2.60548 15000 16
+-1 -1 2 -4.37064 -4.28275 15016 16
+-1 -1 3 8.02914 9.56847 15032 24
+-1 -1 4 -4.42802 -3.36934 15056 32
+-1 -1 13 -4.22416 1.43786 15088 104
+-1 -1 4 -10.00000 -9.69207 15192 32
+-1 -1 9 -10.00000 -4.14603 15224 72
+-1 -1 4 -10.00000 -9.42992 15296 32
+-1 -1 3 4.38285 5.23217 15328 24
+-1 -1 9 6.11872 10.00000 15352 72
+-1 -1 8 -4.99565 -0.10788 15424 64
+-1 -1 8 0.64957 4.22202 15488 64
+-1 -1 6 3.56039 5.20592 15552 48
+-1 -1 5 7.22896 8.67491 15600 40
+-1 -1 7 5.20348 7.84665 15640 56
+-1 -1 4 2.79225 6.19318 15696 32
+-1 -1 6 1.22484 2.14374 15728 48
+-1 -1 3 1.22210 2.79011 15776 24
+-1 -1 4 0.61875 1.71374 15800 32
+-1 -1 2 7.84543 8.11643 15832 16
+-1 -1 11 1.18547 5.48547 15848 88
+-1 -1 8 1.89319 4.03494 15936 64
+-1 -1 4 2.32959 5.76501 16000 32
+-1 -1 3 8.11643 8.53513 16032 24
+-1 -1 4 9.48180 10.00000 16056 32
+-1 -1 4 8.37827 10.00000 16088 32
+-1 -1 5 4.35355 7.56008 16120 40
+-1 -1 5 8.27543 9.99756 16160 40
+-1 -1 7 7.19387 8.44663 16200 56
+-1 -1 3 7.41817 8.56840 16256 24
+-1 -1 2 8.78080 10.00000 16280 16
+-1 -1 2 6.92653 8.48814 16296 16
+-1 -1 4 5.59014 8.77989 16312 32
+-1 -1 2 5.10033 5.58862 16344 16
+-1 -1 2 5.08598 5.11406 16360 16
+-1 -1 6 -17.90330 -16.96880 16376 48
+-1 -1 3 -23.97570 -22.00120 16424 24
+-1 -1 6 -28.96090 -28.02850 16448 48
+-1 -1 2 -28.42560 -26.45530 16496 16
+-1 -1 3 -23.23960 -22.68510 16512 24
+-1 -1 17 -13.45400 -10.00000 16536 136
+-1 -1 20 -17.13540 -10.00000 16672 160
+-1 -1 2 -11.56500 -10.00000 16832 16
+-1 -1 8 -17.95940 -14.01250 16848 64
+-1 -1 2 -18.01430 -17.90330 16912 16
+-1 -1 5 -26.89570 -25.29960 16928 40
+-1 -1 5 -17.62550 -10.87130 16968 40
+-1 -1 4 -22.00120 -17.99880 17008 32
+-1 -1 4 -26.89660 -23.97570 17040 32
+-1 -1 4 -20.51010 -17.47840 17072 32
+-1 -1 3 -24.63190 -22.19230 17104 24
+-1 -1 4 -30.00000 -28.61330 17128 32
+-1 -1 10 -27.31620 -22.41810 17160 80
+-1 -1 5 -21.34510 -18.40470 17240 40
+-1 -1 4 -17.34600 -15.63360 17280 32
+-1 -1 3 -18.48520 -17.79770 17312 24
+-1 -1 3 -22.06560 -20.50740 17336 24
+-1 -1 3 -22.41600 -21.34720 17360 24
+-1 -1 2 -11.41600 -10.68970 17384 16
+-1 -1 3 -29.64170 -28.61420 17400 24
+-1 -1 2 -26.45530 -24.76620 17424 16
+-1 -1 2 -18.41140 -17.35760 17440 16
+-1 -1 2 -18.01620 -17.47940 17456 16
+-1 -1 2 -30.00000 -29.64290 17472 16
+-1 -1 2 -25.62430 -24.73960 17488 16
+-1 -1 2 -12.01210 -12.01140 17504 16
+-1 -1 2 -26.83960 -25.95760 17520 16
+-1 -1 2 -24.74450 -24.63070 17536 16
+-1 -1 2 -22.19200 -22.06320 17552 16
+-1 -1 2 -10.68970 -10.47940 17568 16
+-1 -1 13 -30.00000 -17.50530 17584 104
+-1 -1 2 -10.69180 -10.00000 17688 16
+-1 -1 10 -16.26440 -10.00000 17704 80
+-1 -1 3 -10.00400 -10.00000 17784 24
+-1 -1 4 -11.13470 -10.00000 17808 32
+-1 -1 7 -18.34790 -10.95120 17840 56
+-1 -1 8 -24.16620 -21.78760 17896 64
+-1 -1 3 -22.23930 -19.29880 17960 24
+-1 -1 5 -20.16860 -16.26440 17984 40
+-1 -1 3 -30.00000 -27.17160 18024 24
+-1 -1 6 -27.43400 -22.08550 18048 48
+-1 -1 2 -24.34870 -24.16620 18096 16
+-1 -1 3 -27.29490 -24.24860 18112 24
+-1 -1 5 -22.08970 -19.29700 18136 40
+-1 -1 3 -27.17160 -25.57370 18176 24
+-1 -1 2 -27.43250 -27.29640 18200 16
+-1 -1 2 -22.08910 -22.08240 18216 16
+-1 -1 4 -30.65890 -30.00000 18232 32
+-1 -1 2 -30.31770 -30.00000 18264 16
+-1 -1 2 -30.40440 -30.31710 18280 16
+-1 -1 21 -50.00000 -30.00000 18296 168
+-1 -1 3 -32.45000 -30.00000 18464 24
+-1 -1 8 -33.74580 -30.10990 18488 64
+-1 -1 2 -34.17360 -32.45399 18552 16
+-1 -1 5 -51.99770 -50.00000 18568 40
+-1 -1 2 -54.88589 -52.64350 18608 16
+-1 -1 2 -52.37800 -51.99561 18624 16
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_h.dat
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_h.dat 2007-11-14 20:23:16 UTC (rev 4295)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_h.dat 2007-11-14 22:12:39 UTC (rev 4296)
@@ -1,1991 +1,1992 @@
--1 -1 14 70.00000 70.08887 0 112
--1 -1 4 70.00000 70.08789 112 32
--1 -1 2 70.06738 70.07031 144 16
--1 -1 3 68.00000 68.05078 160 24
--1 -1 7 68.00000 68.09082 184 56
--1 -1 3 68.53027 68.55957 240 24
--1 -1 14 68.05078 68.53906 264 112
--1 -1 7 68.55957 69.05762 376 56
--1 -1 8 68.37598 68.53027 432 64
--1 -1 53 68.52246 69.32617 496 424
--1 -1 23 68.62891 69.07617 920 184
--1 -1 53 68.00000 68.52246 1104 424
--1 -1 70 68.55762 69.70996 1528 560
--1 -1 32 69.70996 70.00000 2088 256
--1 -1 3 69.99219 70.00000 2344 24
--1 -1 24 68.00000 69.05078 2368 192
--1 -1 46 69.02930 69.99219 2560 368
--1 -1 33 69.46875 69.79395 2928 264
--1 -1 2 68.00000 69.64551 3192 16
--1 -1 8 66.00000 66.88379 3208 64
--1 -1 5 67.94531 68.00000 3272 40
--1 -1 18 66.88379 68.00000 3312 144
--1 -1 64 66.80957 68.00000 3456 512
--1 -1 35 66.05469 66.79199 3968 280
--1 -1 3 66.79199 66.80957 4248 24
--1 -1 4 66.00000 66.05469 4272 32
--1 -1 3 67.70508 68.00000 4304 24
--1 -1 37 66.00000 67.67773 4328 296
--1 -1 3 67.67773 67.70508 4624 24
+-1 -1 14 70.00000 70.08890 0 112
+-1 -1 4 70.00000 70.08830 112 32
+-1 -1 2 70.06720 70.07050 144 16
+-1 -1 3 68.00000 68.05120 160 24
+-1 -1 7 68.00000 68.09050 184 56
+-1 -1 3 68.52990 68.55990 240 24
+-1 -1 14 68.05120 68.53920 264 112
+-1 -1 7 68.55990 69.05750 376 56
+-1 -1 8 68.37630 68.52990 432 64
+-1 -1 53 68.52210 69.32610 496 424
+-1 -1 23 68.62860 69.07640 920 184
+-1 -1 53 68.00000 68.52210 1104 424
+-1 -1 70 68.55810 69.71000 1528 560
+-1 -1 32 69.71000 70.00000 2088 256
+-1 -1 3 69.99250 70.00000 2344 24
+-1 -1 24 68.00000 69.05060 2368 192
+-1 -1 46 69.02920 69.99250 2560 368
+-1 -1 33 69.46890 69.79360 2928 264
+-1 -1 2 68.00000 69.64560 3192 16
+-1 -1 8 66.00000 66.88340 3208 64
+-1 -1 5 67.94560 68.00000 3272 40
+-1 -1 18 66.88340 68.00000 3312 144
+-1 -1 64 66.80980 68.00000 3456 512
+-1 -1 35 66.05460 66.79170 3968 280
+-1 -1 3 66.79170 66.80980 4248 24
+-1 -1 4 66.00000 66.05460 4272 32
+-1 -1 3 67.70500 68.00000 4304 24
+-1 -1 37 66.00000 67.67800 4328 296
+-1 -1 3 67.67800 67.70500 4624 24
-1 -1 3 66.00000 68.00000 4648 24
--1 -1 9 64.49316 64.87402 4672 72
--1 -1 7 64.00000 64.09277 4744 56
--1 -1 13 64.87402 66.00000 4800 104
--1 -1 9 64.03320 64.49316 4904 72
--1 -1 14 65.51367 66.00000 4976 112
--1 -1 4 65.95703 66.00000 5088 32
--1 -1 41 64.79395 65.68652 5120 328
--1 -1 8 64.53711 64.59082 5448 64
--1 -1 3 64.52344 64.53516 5512 24
--1 -1 12 65.66504 65.95703 5536 96
--1 -1 17 64.59082 64.79590 5632 136
--1 -1 3 64.53516 64.53711 5768 24
--1 -1 26 64.00000 64.52344 5792 208
+-1 -1 9 64.49270 64.87450 4672 72
+-1 -1 7 64.00000 64.09300 4744 56
+-1 -1 13 64.87450 66.00000 4800 104
+-1 -1 9 64.03320 64.49270 4904 72
+-1 -1 14 65.51330 66.00000 4976 112
+-1 -1 4 65.95690 66.00000 5088 32
+-1 -1 41 64.79390 65.68610 5120 328
+-1 -1 8 64.53680 64.59080 5448 64
+-1 -1 3 64.52370 64.53530 5512 24
+-1 -1 12 65.66500 65.95690 5536 96
+-1 -1 17 64.59080 64.79550 5632 136
+-1 -1 3 64.53530 64.53680 5768 24
+-1 -1 26 64.00000 64.52370 5792 208
-1 -1 4 64.00000 66.00000 6000 32
--1 -1 3 63.20996 63.32422 6032 24
--1 -1 11 63.32422 64.00000 6056 88
--1 -1 13 62.00000 63.20996 6144 104
--1 -1 3 63.73438 63.74805 6248 24
--1 -1 10 63.74805 64.00000 6272 80
--1 -1 26 62.91406 63.73438 6352 208
--1 -1 23 62.00000 62.91211 6560 184
+-1 -1 3 63.21000 63.32460 6032 24
+-1 -1 11 63.32460 64.00000 6056 88
+-1 -1 13 62.00000 63.21000 6144 104
+-1 -1 3 63.73420 63.74789 6248 24
+-1 -1 10 63.74789 64.00000 6272 80
+-1 -1 26 62.91440 63.73420 6352 208
+-1 -1 23 62.00000 62.91250 6560 184
-1 -1 3 62.00000 64.00000 6744 24
-1 -1 45 60.00000 62.00000 6768 360
--1 -1 7 60.54785 60.65723 7128 56
--1 -1 11 60.25488 60.54590 7184 88
--1 -1 38 60.65723 61.73730 7272 304
--1 -1 7 61.73730 62.00000 7576 56
--1 -1 6 60.19336 62.00000 7632 48
--1 -1 7 60.00000 60.35254 7680 56
--1 -1 52 58.88379 59.89648 7736 416
--1 -1 9 59.88574 60.00000 8152 72
--1 -1 15 58.00000 58.08398 8224 120
--1 -1 13 58.00000 58.07617 8344 104
--1 -1 3 58.00000 58.00098 8448 24
--1 -1 33 58.00977 59.16016 8472 264
--1 -1 3 58.00000 58.00977 8736 24
--1 -1 12 59.16016 59.30371 8760 96
--1 -1 11 59.30273 59.35645 8856 88
--1 -1 8 59.35254 59.47852 8944 64
--1 -1 7 59.45215 60.00000 9008 56
--1 -1 28 58.90723 59.66406 9064 224
--1 -1 36 58.78027 59.80176 9288 288
--1 -1 12 58.00000 58.78027 9576 96
--1 -1 26 56.07812 56.39648 9672 208
--1 -1 26 56.07812 56.39648 9880 208
--1 -1 51 56.30566 56.42383 10088 408
--1 -1 51 56.30566 56.42383 10496 408
--1 -1 53 56.00000 56.45020 10904 424
--1 -1 53 56.00000 56.45020 11328 424
--1 -1 14 57.85547 58.00000 11752 112
--1 -1 4 57.99219 58.00000 11864 32
--1 -1 6 57.98047 58.00000 11896 48
--1 -1 15 57.86914 58.00000 11944 120
--1 -1 51 57.52246 57.85547 12064 408
--1 -1 47 56.69434 57.53613 12472 376
--1 -1 37 57.53613 58.00000 12848 296
--1 -1 7 56.00000 56.12500 13144 56
--1 -1 7 56.00000 56.12500 13200 56
--1 -1 7 56.00000 56.03320 13256 56
--1 -1 21 56.00000 56.14941 13312 168
--1 -1 7 56.00000 56.03320 13480 56
--1 -1 21 56.00000 56.14941 13536 168
--1 -1 23 56.15137 56.69434 13704 184
--1 -1 6 56.12500 56.16699 13888 48
--1 -1 6 56.12500 56.16699 13936 48
--1 -1 22 56.83789 58.00000 13984 176
--1 -1 30 56.00000 56.83789 14160 240
--1 -1 48 54.78320 55.08594 14400 384
--1 -1 2 54.76562 54.78320 14784 16
--1 -1 6 54.41992 54.47656 14800 48
--1 -1 16 54.32617 54.41992 14848 128
--1 -1 25 55.07812 55.28906 14976 200
--1 -1 46 54.00000 54.40820 15176 368
--1 -1 21 55.02734 55.08789 15544 168
--1 -1 36 54.36523 55.07227 15712 288
--1 -1 4 55.95898 56.00000 16000 32
--1 -1 4 55.95898 56.00000 16032 32
--1 -1 95 54.00000 54.95605 16064 760
--1 -1 4 54.00000 54.00195 16824 32
--1 -1 95 54.00000 54.95605 16856 760
--1 -1 4 54.00000 54.00195 17616 32
--1 -1 15 55.67578 55.95898 17648 120
--1 -1 15 55.67578 55.95898 17768 120
--1 -1 3 54.95117 54.97754 17888 24
--1 -1 3 54.95117 54.97754 17912 24
--1 -1 53 54.97754 55.67480 17936 424
--1 -1 53 54.97754 55.67480 18360 424
--1 -1 21 55.67480 55.84668 18784 168
--1 -1 21 55.67480 55.84668 18952 168
--1 -1 9 55.79199 56.00000 19120 72
--1 -1 9 55.79199 56.00000 19192 72
--1 -1 5 55.78906 55.82617 19264 40
--1 -1 5 55.78906 55.82617 19304 40
--1 -1 33 55.68848 56.00000 19344 264
--1 -1 10 55.94238 56.00000 19608 80
--1 -1 33 55.68848 56.00000 19688 264
--1 -1 10 55.94238 56.00000 19952 80
--1 -1 32 55.59375 55.86621 20032 256
--1 -1 32 55.59375 55.86621 20288 256
--1 -1 73 54.46094 55.60352 20544 584
--1 -1 24 54.00195 54.46094 21128 192
--1 -1 2 54.00000 54.00195 21320 16
--1 -1 8 54.00000 54.06934 21336 64
--1 -1 4 54.00000 54.00195 21400 32
--1 -1 4 54.00000 54.00879 21432 32
--1 -1 10 54.00000 54.04004 21464 80
--1 -1 27 54.00000 54.18750 21544 216
--1 -1 4 54.19824 54.22461 21760 32
--1 -1 6 54.26465 54.31152 21792 48
--1 -1 13 54.16992 54.25977 21840 104
--1 -1 51 54.31250 54.71387 21944 408
--1 -1 51 54.31250 54.71387 22352 408
--1 -1 6 54.22461 54.26465 22760 48
--1 -1 21 54.29785 54.39258 22808 168
--1 -1 27 54.64453 54.98242 22976 216
--1 -1 2 54.61914 54.64355 23192 16
--1 -1 2 54.61914 54.64355 23208 16
--1 -1 44 54.95020 55.36719 23224 352
--1 -1 28 55.20410 55.44434 23576 224
--1 -1 16 54.10352 54.25781 23800 128
--1 -1 49 54.19336 55.31934 23928 392
--1 -1 10 55.13867 55.29688 24320 80
--1 -1 32 54.00000 54.38770 24400 256
--1 -1 18 54.00000 54.14551 24656 144
--1 -1 11 54.00000 54.08691 24800 88
--1 -1 3 54.11035 54.20508 24888 24
--1 -1 6 54.00000 54.11523 24912 48
--1 -1 47 54.00000 54.47852 24960 376
--1 -1 18 54.70801 55.26270 25336 144
--1 -1 23 55.31934 56.00000 25480 184
--1 -1 4 55.26270 55.31934 25664 32
--1 -1 18 54.35547 54.54590 25696 144
--1 -1 74 54.53125 55.07031 25840 592
--1 -1 145 54.03711 54.41797 26432 1160
--1 -1 95 52.00000 53.60742 27592 760
--1 -1 78 52.00000 53.26953 28352 624
+-1 -1 7 60.54750 60.65739 7128 56
+-1 -1 11 60.25529 60.54560 7184 88
+-1 -1 38 60.65739 61.73690 7272 304
+-1 -1 7 61.73690 62.00000 7576 56
+-1 -1 6 60.19310 62.00000 7632 48
+-1 -1 7 60.00000 60.35220 7680 56
+-1 -1 52 58.88390 59.89690 7736 416
+-1 -1 9 59.88610 60.00000 8152 72
+-1 -1 15 58.00000 58.08440 8224 120
+-1 -1 13 58.00000 58.07610 8344 104
+-1 -1 3 58.00000 58.00080 8448 24
+-1 -1 33 58.00970 59.15970 8472 264
+-1 -1 3 58.00000 58.00970 8736 24
+-1 -1 12 59.15970 59.30330 8760 96
+-1 -1 11 59.30280 59.35609 8856 88
+-1 -1 8 59.35250 59.47860 8944 64
+-1 -1 7 59.45230 60.00000 9008 56
+-1 -1 28 58.90720 59.66430 9064 224
+-1 -1 36 58.78011 59.80190 9288 288
+-1 -1 12 58.00000 58.78011 9576 96
+-1 -1 26 56.07809 56.39640 9672 208
+-1 -1 26 56.07809 56.39640 9880 208
+-1 -1 51 56.30580 56.42419 10088 408
+-1 -1 51 56.30580 56.42419 10496 408
+-1 -1 53 56.00000 56.45060 10904 424
+-1 -1 53 56.00000 56.45060 11328 424
+-1 -1 14 57.85500 58.00000 11752 112
+-1 -1 4 57.99250 58.00000 11864 32
+-1 -1 6 57.98000 58.00000 11896 48
+-1 -1 15 57.86890 58.00000 11944 120
+-1 -1 51 57.52220 57.85580 12064 408
+-1 -1 47 56.69431 57.53640 12472 376
+-1 -1 37 57.53580 58.00000 12848 296
+-1 -1 7 56.00000 56.12460 13144 56
+-1 -1 7 56.00000 56.12460 13200 56
+-1 -1 7 56.00000 56.03280 13256 56
+-1 -1 21 56.00000 56.14940 13312 168
+-1 -1 7 56.00000 56.03280 13480 56
+-1 -1 21 56.00000 56.14940 13536 168
+-1 -1 23 56.15110 56.69431 13704 184
+-1 -1 6 56.12460 56.16720 13888 48
+-1 -1 6 56.12460 56.16720 13936 48
+-1 -1 22 56.83810 58.00000 13984 176
+-1 -1 30 56.00000 56.83810 14160 240
+-1 -1 48 54.78290 55.08640 14400 384
+-1 -1 2 54.76580 54.78290 14784 16
+-1 -1 6 54.41949 54.47670 14800 48
+-1 -1 16 54.32581 54.41949 14848 128
+-1 -1 25 55.07780 55.28860 14976 200
+-1 -1 46 54.00000 54.40860 15176 368
+-1 -1 21 55.02750 55.08800 15544 168
+-1 -1 36 54.36501 55.07190 15712 288
+-1 -1 4 55.95880 56.00000 16000 32
+-1 -1 4 55.95880 56.00000 16032 32
+-1 -1 95 54.00000 54.95610 16064 760
+-1 -1 4 54.00000 54.00190 16824 32
+-1 -1 95 54.00000 54.95610 16856 760
+-1 -1 4 54.00000 54.00190 17616 32
+-1 -1 15 55.67530 55.95880 17648 120
+-1 -1 15 55.67530 55.95880 17768 120
+-1 -1 3 54.95120 54.97720 17888 24
+-1 -1 3 54.95120 54.97720 17912 24
+-1 -1 53 54.97720 55.67470 17936 424
+-1 -1 53 54.97720 55.67470 18360 424
+-1 -1 21 55.67500 55.84641 18784 168
+-1 -1 21 55.67500 55.84641 18952 168
+-1 -1 9 55.79190 56.00000 19120 72
+-1 -1 9 55.79190 56.00000 19192 72
+-1 -1 5 55.78889 55.82640 19264 40
+-1 -1 5 55.78889 55.82640 19304 40
+-1 -1 33 55.68890 56.00000 19344 264
+-1 -1 10 55.94220 56.00000 19608 80
+-1 -1 33 55.68890 56.00000 19688 264
+-1 -1 10 55.94220 56.00000 19952 80
+-1 -1 32 55.59360 55.86610 20032 256
+-1 -1 32 55.59360 55.86610 20288 256
+-1 -1 73 54.46080 55.60310 20544 584
+-1 -1 24 54.00220 54.46060 21128 192
+-1 -1 2 54.00000 54.00220 21320 16
+-1 -1 8 54.00000 54.06920 21336 64
+-1 -1 4 54.00000 54.00190 21400 32
+-1 -1 4 54.00000 54.00890 21432 32
+-1 -1 10 54.00000 54.04000 21464 80
+-1 -1 27 54.00000 54.18781 21544 216
+-1 -1 4 54.19780 54.22470 21760 32
+-1 -1 6 54.26490 54.31110 21792 48
+-1 -1 13 54.16970 54.25999 21840 104
+-1 -1 51 54.31250 54.71360 21944 408
+-1 -1 51 54.31250 54.71360 22352 408
+-1 -1 6 54.22470 54.26490 22760 48
+-1 -1 21 54.29810 54.39250 22808 168
+-1 -1 27 54.64500 54.98250 22976 216
+-1 -1 2 54.61950 54.64310 23192 16
+-1 -1 2 54.61950 54.64310 23208 16
+-1 -1 44 54.95030 55.36720 23224 352
+-1 -1 28 55.20420 55.44470 23576 224
+-1 -1 16 54.10330 54.25810 23800 128
+-1 -1 49 54.19310 55.31890 23928 392
+-1 -1 10 55.13890 55.29720 24320 80
+-1 -1 32 54.00000 54.38780 24400 256
+-1 -1 18 54.00000 54.14530 24656 144
+-1 -1 11 54.00000 54.08690 24800 88
+-1 -1 3 54.11030 54.20470 24888 24
+-1 -1 6 54.00000 54.11530 24912 48
+-1 -1 47 54.00000 54.47830 24960 376
+-1 -1 18 54.70780 55.26310 25336 144
+-1 -1 23 55.31931 56.00000 25480 184
+-1 -1 4 55.26310 55.31931 25664 32
+-1 -1 18 54.35580 54.54610 25696 144
+-1 -1 74 54.53080 55.07050 25840 592
+-1 -1 145 54.03700 54.41780 26432 1160
+-1 -1 95 52.00000 53.60750 27592 760
+-1 -1 78 52.00000 53.27000 28352 624
-1 -1 98 52.00000 54.00000 28976 784
--1 -1 19 53.90430 53.95605 29760 152
--1 -1 19 53.90430 53.95605 29912 152
--1 -1 7 53.96875 54.00000 30064 56
--1 -1 21 53.88867 54.00000 30120 168
--1 -1 7 53.96875 54.00000 30288 56
--1 -1 21 53.88867 54.00000 30344 168
--1 -1 11 52.03711 52.11133 30512 88
--1 -1 63 52.10840 53.12109 30600 504
--1 -1 23 53.09570 53.21875 31104 184
--1 -1 9 53.77734 53.80566 31288 72
--1 -1 29 52.00000 52.12012 31360 232
--1 -1 14 53.80371 54.00000 31592 112
--1 -1 76 52.04395 52.37988 31704 608
--1 -1 43 53.08691 53.43848 32312 344
--1 -1 41 53.43848 53.82031 32656 328
--1 -1 14 52.00000 52.22168 32984 112
--1 -1 2 52.00000 52.00098 33096 16
--1 -1 60 52.00000 53.02930 33112 480
--1 -1 92 53.14062 54.00000 33592 736
--1 -1 7 53.95508 54.00000 34328 56
--1 -1 5 53.98828 54.00000 34384 40
--1 -1 4 53.94141 54.00000 34424 32
--1 -1 2 52.00000 52.00098 34456 16
--1 -1 8 52.94727 53.14062 34472 64
--1 -1 3 53.93945 54.00000 34536 24
--1 -1 16 53.87988 54.00000 34560 128
--1 -1 15 53.90918 54.00000 34688 120
--1 -1 11 53.94824 54.00000 34808 88
--1 -1 17 53.43652 54.00000 34896 136
--1 -1 9 53.43652 53.65430 35032 72
--1 -1 24 53.47168 54.00000 35104 192
--1 -1 8 53.34570 54.00000 35296 64
--1 -1 4 53.17578 53.34570 35360 32
--1 -1 12 52.00000 53.17578 35392 96
--1 -1 18 52.00000 52.14355 35488 144
--1 -1 110 52.00000 53.42188 35632 880
--1 -1 66 53.41211 53.55469 36512 528
--1 -1 85 52.75977 53.41211 37040 680
--1 -1 6 52.57031 52...
[truncated message content] |
|
From: <js...@us...> - 2007-11-14 20:23:25
|
Revision: 4295
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4295&view=rev
Author: jswhit
Date: 2007-11-14 12:23:16 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
support for full-res coastlines.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/Changelog
Modified: trunk/toolkits/basemap-testing/Changelog
===================================================================
--- trunk/toolkits/basemap-testing/Changelog 2007-11-14 20:11:35 UTC (rev 4294)
+++ trunk/toolkits/basemap-testing/Changelog 2007-11-14 20:23:16 UTC (rev 4295)
@@ -1,4 +1,7 @@
version 0.9.7 (not yet released)
+ * added support for full-resolution boundaries (will be
+ a separate download).
+ * high-resolution boundaries now included.
* use a Pyrex/Cython interface to the GEOS library
(http://geos.refractions.net - LGPL license)
to find geometries that are within map projection region.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 20:11:49
|
Revision: 4294
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4294&view=rev
Author: jswhit
Date: 2007-11-14 12:11:35 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/toolkits/basemap-testing/Changelog
Modified: trunk/toolkits/basemap-testing/Changelog
===================================================================
--- trunk/toolkits/basemap-testing/Changelog 2007-11-14 19:48:38 UTC (rev 4293)
+++ trunk/toolkits/basemap-testing/Changelog 2007-11-14 20:11:35 UTC (rev 4294)
@@ -1,11 +1,11 @@
version 0.9.7 (not yet released)
- * use Shapely (http://trac.gispython.org/projects/PCL/wiki/Shapely)
+ * use a Pyrex/Cython interface to the GEOS library
+ (http://geos.refractions.net - LGPL license)
to find geometries that are within map projection region.
This speeds up instance creation for small map regions and
high resolution coastlines. Boundary datasets now in binary
- format (I/O handled by Shapely). Requires geos C++ lib
- (http://geos.refractions.net/) and Shapely, which is a ctypes
- interface to libgeos.
+ format (I/O is faster). Requires GEOS version 2.2.3, source
+ code included.
* remove all numerix imports.
* fix rotate_vector so it works in S. Hem and for non-orthogonal
grids. Support for masked velocity vectors also added. (EF)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 19:48:49
|
Revision: 4293
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4293&view=rev
Author: jswhit
Date: 2007-11-14 11:48:38 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
update install instructions, include GEOS source in MANIFEST
Modified Paths:
--------------
trunk/toolkits/basemap-testing/MANIFEST.in
trunk/toolkits/basemap-testing/README
Modified: trunk/toolkits/basemap-testing/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap-testing/MANIFEST.in 2007-11-14 19:46:37 UTC (rev 4292)
+++ trunk/toolkits/basemap-testing/MANIFEST.in 2007-11-14 19:48:38 UTC (rev 4293)
@@ -78,3 +78,4 @@
include lib/matplotlib/toolkits/basemap/data/*_l.dat
include lib/matplotlib/toolkits/basemap/data/*_i.dat
include lib/matplotlib/toolkits/basemap/data/*_h.dat
+recursive-include geos-2.2.3 *
Modified: trunk/toolkits/basemap-testing/README
===================================================================
--- trunk/toolkits/basemap-testing/README 2007-11-14 19:46:37 UTC (rev 4292)
+++ trunk/toolkits/basemap-testing/README 2007-11-14 19:48:38 UTC (rev 4293)
@@ -78,6 +78,7 @@
> 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.
+ > ./configure --prefix=$GEOS_DIR
> make; make install
3) cd back to the top level basemap directory (basemap-X.Y.Z) and
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-14 19:46:39
|
Revision: 4292
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4292&view=rev
Author: mdboom
Date: 2007-11-14 11:46:37 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Merged revisions 4244-4289 via svnmerge from
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib
........
r4248 | dsdale | 2007-11-13 11:39:12 -0500 (Tue, 13 Nov 2007) | 2 lines
modify formatting of comments in matplotlib.conf
........
r4249 | dsdale | 2007-11-13 13:10:32 -0500 (Tue, 13 Nov 2007) | 2 lines
fixed some formatting issues in tconfig
........
r4264 | efiring | 2007-11-14 02:45:12 -0500 (Wed, 14 Nov 2007) | 2 lines
A step towards a fast rectilinear pcolor version
........
r4267 | mdboom | 2007-11-14 08:58:08 -0500 (Wed, 14 Nov 2007) | 3 lines
Fix bug when clicking "Cancel" in the save dialog in TkAgg backend.
(Thanks Michael Zell).
........
r4268 | mdboom | 2007-11-14 09:00:56 -0500 (Wed, 14 Nov 2007) | 2 lines
Fix bug in specgram. (Thanks Glen W. Mabey!)
........
r4275 | jdh2358 | 2007-11-14 11:39:47 -0500 (Wed, 14 Nov 2007) | 2 lines
added glen's Fc specteal patch
........
r4278 | efiring | 2007-11-14 13:10:00 -0500 (Wed, 14 Nov 2007) | 2 lines
Use mpl standard import idiom in image.py
........
r4287 | mdboom | 2007-11-14 14:06:52 -0500 (Wed, 14 Nov 2007) | 2 lines
Fix placement of rotated text in Wx backend (thanks Michael Day).
........
r4288 | jdh2358 | 2007-11-14 14:11:54 -0500 (Wed, 14 Nov 2007) | 2 lines
fixed is_string_like and removed is_file_like
........
r4289 | mdboom | 2007-11-14 14:25:46 -0500 (Wed, 14 Nov 2007) | 2 lines
Refactored a bunch of places to use "is_writable_file_like".
........
Modified Paths:
--------------
branches/transforms/API_CHANGES
branches/transforms/lib/matplotlib/__init__.py
branches/transforms/lib/matplotlib/axes.py
branches/transforms/lib/matplotlib/backends/backend_agg.py
branches/transforms/lib/matplotlib/backends/backend_gtk.py
branches/transforms/lib/matplotlib/backends/backend_pdf.py
branches/transforms/lib/matplotlib/backends/backend_ps.py
branches/transforms/lib/matplotlib/backends/backend_svg.py
branches/transforms/lib/matplotlib/backends/backend_tkagg.py
branches/transforms/lib/matplotlib/backends/backend_wx.py
branches/transforms/lib/matplotlib/cbook.py
branches/transforms/lib/matplotlib/cm.py
branches/transforms/lib/matplotlib/collections.py
branches/transforms/lib/matplotlib/colorbar.py
branches/transforms/lib/matplotlib/config/matplotlib.conf.default
branches/transforms/lib/matplotlib/config/mplconfig.py
branches/transforms/lib/matplotlib/config/mpltraits.py
branches/transforms/lib/matplotlib/config/tconfig.py
branches/transforms/lib/matplotlib/image.py
branches/transforms/lib/matplotlib/lines.py
branches/transforms/lib/matplotlib/mlab.py
branches/transforms/lib/matplotlib/mpl-data/matplotlib.conf.template
branches/transforms/lib/matplotlib/numerix/__init__.py
branches/transforms/lib/matplotlib/pylab.py
branches/transforms/setup.py
branches/transforms/src/_image.cpp
branches/transforms/src/_image.h
Property Changed:
----------------
branches/transforms/
Property changes on: branches/transforms
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/matplotlib:1-4243
+ /trunk/matplotlib:1-4289
Modified: branches/transforms/API_CHANGES
===================================================================
--- branches/transforms/API_CHANGES 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/API_CHANGES 2007-11-14 19:46:37 UTC (rev 4292)
@@ -169,6 +169,9 @@
END OF TRANSFORMS REFACTORING
+ Changed cbook.is_file_like to cbook.is_writable_file_like and
+ corrected behavior.
+
Moved mlab.csv2rec -> recutils.csv2rec
Added ax kwarg to pyplot.colorbar and Figure.colorbar so that
Modified: branches/transforms/lib/matplotlib/__init__.py
===================================================================
--- branches/transforms/lib/matplotlib/__init__.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/__init__.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -118,8 +118,7 @@
def is_string_like(obj):
- if hasattr(obj, 'shape'): return 0 # this is a workaround
- # for a bug in numeric<23.1
+ if hasattr(obj, 'shape'): return 0
try: obj + ''
except (TypeError, ValueError): return 0
return 1
Modified: branches/transforms/lib/matplotlib/axes.py
===================================================================
--- branches/transforms/lib/matplotlib/axes.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/axes.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -4413,7 +4413,7 @@
origin=None, extent=None)
IMSHOW(I) - plot image I to current axes, resampling to scale to axes
- size (I may be numarray/Numeric array or PIL image)
+ size (I may be numpy array or PIL image)
IMSHOW(I, X, Y) - plot image I to current axes, with
nonuniform X and Y axes. (I, X and Y may be
@@ -4988,10 +4988,10 @@
return n, bins, cbook.silent_list('Patch', patches)
hist.__doc__ = cbook.dedent(hist.__doc__) % martist.kwdocd
- def psd(self, x, NFFT=256, Fs=2, detrend=mlab.detrend_none,
+ def psd(self, x, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
window=mlab.window_hanning, noverlap=0, **kwargs):
"""
- PSD(x, NFFT=256, Fs=2, detrend=mlab.detrend_none,
+ PSD(x, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
window=mlab.window_hanning, noverlap=0, **kwargs)
The power spectral density by Welches average periodogram method. The
@@ -5002,22 +5002,27 @@
with a scaling to correct for power loss due to windowing. Fs is the
sampling frequency.
- NFFT is the length of the fft segment; must be a power of 2
+ * NFFT is the length of the fft segment; must be a power of 2
- Fs is the sampling frequency.
+ * Fs is the sampling frequency.
- detrend - the function applied to each segment before fft-ing,
+ * Fc is the center frequency of x (defaults to 0), which offsets
+ the yextents of the image to reflect the frequency range used
+ when a signal is acquired and then filtered and downsampled to
+ baseband.
+
+ * detrend - the function applied to each segment before fft-ing,
designed to remove the mean or linear trend. Unlike in matlab,
where the detrend parameter is a vector, in matplotlib is it a
function. The mlab module defines detrend_none, detrend_mean,
detrend_linear, but you can use a custom function as well.
- window - the function used to window the segments. window is a
+ * window - the function used to window the segments. window is a
function, unlike in matlab(TM) where it is a vector. mlab defines
window_none, window_hanning, but you can use a custom function
as well.
- noverlap gives the length of the overlap between segments.
+ * noverlap gives the length of the overlap between segments.
Returns the tuple Pxx, freqs
@@ -5035,6 +5040,7 @@
if not self._hold: self.cla()
pxx, freqs = mlab.psd(x, NFFT, Fs, detrend, window, noverlap)
pxx.shape = len(freqs),
+ freqs += Fc
self.plot(freqs, 10*npy.log10(pxx), **kwargs)
self.set_xlabel('Frequency')
@@ -5052,10 +5058,10 @@
return pxx, freqs
psd.__doc__ = cbook.dedent(psd.__doc__) % martist.kwdocd
- def csd(self, x, y, NFFT=256, Fs=2, detrend=mlab.detrend_none,
+ def csd(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
window=mlab.window_hanning, noverlap=0, **kwargs):
"""
- CSD(x, y, NFFT=256, Fs=2, detrend=mlab.detrend_none,
+ CSD(x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
window=window_hanning, noverlap=0, **kwargs)
The cross spectral density Pxy by Welches average periodogram method.
@@ -5081,6 +5087,7 @@
pxy, freqs = mlab.csd(x, y, NFFT, Fs, detrend, window, noverlap)
pxy.shape = len(freqs),
# pxy is complex
+ freqs += Fc
self.plot(freqs, 10*npy.log10(npy.absolute(pxy)), **kwargs)
self.set_xlabel('Frequency')
@@ -5097,11 +5104,10 @@
return pxy, freqs
csd.__doc__ = cbook.dedent(csd.__doc__) % martist.kwdocd
- def cohere(self, x, y, NFFT=256, Fs=2, detrend=mlab.detrend_none,
+ def cohere(self, x, y, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
window=mlab.window_hanning, noverlap=0, **kwargs):
"""
- COHERE(x, y, NFFT=256, Fs=2,
- detrend = mlab.detrend_none,
+ COHERE(x, y, NFFT=256, Fs=2, Fc=0, detrend = mlab.detrend_none,
window = mlab.window_hanning, noverlap=0, **kwargs)
cohere the coherence between x and y. Coherence is the normalized
@@ -5126,6 +5132,7 @@
"""
if not self._hold: self.cla()
cxy, freqs = mlab.cohere(x, y, NFFT, Fs, detrend, window, noverlap)
+ freqs += Fc
self.plot(freqs, cxy, **kwargs)
self.set_xlabel('Frequency')
@@ -5135,11 +5142,11 @@
return cxy, freqs
cohere.__doc__ = cbook.dedent(cohere.__doc__) % martist.kwdocd
- def specgram(self, x, NFFT=256, Fs=2, detrend=mlab.detrend_none,
+ def specgram(self, x, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
window=mlab.window_hanning, noverlap=128,
cmap = None, xextent=None):
"""
- SPECGRAM(x, NFFT=256, Fs=2, detrend=mlab.detrend_none,
+ SPECGRAM(x, NFFT=256, Fs=2, Fc=0, detrend=mlab.detrend_none,
window = mlab.window_hanning, noverlap=128,
cmap=None, xextent=None)
@@ -5181,7 +5188,8 @@
if xextent is None: xextent = 0, npy.amax(bins)
xmin, xmax = xextent
- extent = xmin, xmax, npy.amin(freqs), npy.amax(freqs)
+ freqs += Fc
+ extent = xmin, xmax, freqs[0], freqs[-1]
im = self.imshow(Z, cmap, extent=extent)
self.axis('auto')
Modified: branches/transforms/lib/matplotlib/backends/backend_agg.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_agg.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/backends/backend_agg.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -19,8 +19,6 @@
* allow save to file handle
* integrate screen dpi w/ ppi and text
-
-INSTALLING
"""
from __future__ import division
import os, sys, weakref
Modified: branches/transforms/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_gtk.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/backends/backend_gtk.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -19,7 +19,7 @@
from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK
-from matplotlib.cbook import is_string_like, enumerate
+from matplotlib.cbook import is_string_like, is_writable_file_like, enumerate
from matplotlib.colors import colorConverter
from matplotlib.figure import Figure
from matplotlib.widgets import SubplotTool
@@ -370,7 +370,7 @@
pixbuf.save(filename, format)
except gobject.GError, exc:
error_msg_gtk('Save figure failure:\n%s' % (exc,), parent=self)
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
if hasattr(pixbuf, 'save_to_callback'):
def save_callback(buf, data=None):
data.write(buf)
Modified: branches/transforms/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_pdf.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/backends/backend_pdf.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -24,7 +24,8 @@
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import Bunch, enumerate, is_string_like, reverse_dict, get_realpath_and_stat
+from matplotlib.cbook import Bunch, enumerate, is_string_like, reverse_dict, \
+ get_realpath_and_stat, is_writable_file_like
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont, is_opentype_cff_font
from matplotlib.afm import AFM
@@ -333,7 +334,7 @@
self.passed_in_file_object = False
if is_string_like(filename):
fh = file(filename, 'wb')
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
fh = filename
self.passed_in_file_object = True
else:
Modified: branches/transforms/lib/matplotlib/backends/backend_ps.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_ps.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/backends/backend_ps.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -15,7 +15,8 @@
from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import is_string_like, izip, get_realpath_and_stat
+from matplotlib.cbook import is_string_like, izip, get_realpath_and_stat, \
+ is_writable_file_like
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont, is_opentype_cff_font
@@ -873,7 +874,7 @@
if is_string_like(outfile):
title = outfile
tmpfile = os.path.join(gettempdir(), md5.md5(outfile).hexdigest())
- elif hasattr(outfile, 'write') and callable(outfile.write):
+ elif is_writable_file_like(outfile):
title = None
tmpfile = os.path.join(gettempdir(), md5.md5(str(hash(outfile))).hexdigest())
passed_in_file_object = True
Modified: branches/transforms/lib/matplotlib/backends/backend_svg.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_svg.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/backends/backend_svg.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -5,7 +5,7 @@
from matplotlib import verbose, __version__, rcParams
from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import is_string_like
+from matplotlib.cbook import is_string_like, is_writable_file_like
from matplotlib.colors import rgb2hex
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont, FontProperties
@@ -503,7 +503,7 @@
def print_svg(self, filename, *args, **kwargs):
if is_string_like(filename):
fh_to_close = svgwriter = codecs.open(filename, 'w', 'utf-8')
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
svgwriter = codecs.EncodedFile(filename, 'utf-8')
fh_to_close = None
else:
@@ -514,7 +514,7 @@
if is_string_like(filename):
gzipwriter = gzip.GzipFile(filename, 'w')
fh_to_close = svgwriter = codecs.EncodedFile(gzipwriter, 'utf-8')
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
fh_to_close = gzipwriter = gzip.GzipFile(fileobj=filename, mode='w')
svgwriter = codecs.EncodedFile(gzipwriter, 'utf-8')
else:
Modified: branches/transforms/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_tkagg.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/backends/backend_tkagg.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -680,7 +680,7 @@
defaultextension = self.canvas.get_default_filetype()
)
- if fname == "" :
+ if fname == "" or fname == ():
return
else:
try:
Modified: branches/transforms/lib/matplotlib/backends/backend_wx.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_wx.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/backends/backend_wx.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -152,7 +152,7 @@
cursors
from matplotlib._pylab_helpers import Gcf
from matplotlib.artist import Artist
-from matplotlib.cbook import exception_to_str, is_string_like
+from matplotlib.cbook import exception_to_str, is_string_like, is_writable_file_like
from matplotlib.figure import Figure
from matplotlib.path import Path
from matplotlib.text import _process_text_args, Text
@@ -343,8 +343,10 @@
if angle == 0.0:
gfx_ctx.DrawText(s, x, y)
else:
- angle = angle * (math.pi / 180.0)
- gfx_ctx.DrawRotatedText(s, x, y, angle)
+ angle = angle / 180.0 * math.pi
+ xo = h * math.sin(rads)
+ yo = h * math.cos(rads)
+ gfx_ctx.DrawRotatedText(s, x - xo, y - yo, angle)
gc.unselect()
@@ -976,7 +978,7 @@
# the error on a call or print_figure may not work because
# printing can be qued and called from realize
raise RuntimeError('Could not save figure to %s\n' % (filename))
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
if not self.bitmap.ConvertToImage().SaveStream(filename, filetype):
DEBUG_MSG('print_figure() file save error', 4, self)
raise RuntimeError('Could not save figure to %s\n' % (filename))
Modified: branches/transforms/lib/matplotlib/cbook.py
===================================================================
--- branches/transforms/lib/matplotlib/cbook.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/cbook.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -209,20 +209,14 @@
def is_string_like(obj):
- if hasattr(obj, 'shape'): return 0 # this is a workaround
- # for a bug in numeric<23.1
+ if hasattr(obj, 'shape'): return 0
try: obj + ''
except (TypeError, ValueError): return 0
return 1
+def is_writable_file_like(obj):
+ return hasattr(filename, 'write') and callable(filename.write)
-def is_file_like(obj):
- if hasattr(obj, 'shape'): return 0 # this is a workaround
- # for a bug in numeric<23.1
- try: obj + ''
- except (TypeError, ValueError): return 0
- return 1
-
def is_scalar(obj):
return is_string_like(obj) or not iterable(obj)
Modified: branches/transforms/lib/matplotlib/cm.py
===================================================================
--- branches/transforms/lib/matplotlib/cm.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/cm.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -56,7 +56,7 @@
return x
def set_array(self, A):
- 'Set the image array from numeric/numarray A'
+ 'Set the image array from numpy array A'
self._A = A
def get_array(self):
Modified: branches/transforms/lib/matplotlib/collections.py
===================================================================
--- branches/transforms/lib/matplotlib/collections.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/collections.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -364,7 +364,7 @@
thus (meshWidth * meshHeight) quadrilaterals in the mesh.
The mesh need not be regular and the polygons need not be convex.
A quadrilateral mesh is represented by a
- (2 x ((meshWidth + 1) * (meshHeight + 1))) Numeric array
+ (2 x ((meshWidth + 1) * (meshHeight + 1))) numpy array
'coordinates' where each row is the X and Y coordinates of one
of the vertices.
To define the function that maps from a data point to
Modified: branches/transforms/lib/matplotlib/colorbar.py
===================================================================
--- branches/transforms/lib/matplotlib/colorbar.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/colorbar.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -508,7 +508,7 @@
N = len(b)
ii = npy.minimum(npy.searchsorted(b, xn), N-1)
i0 = npy.maximum(ii - 1, 0)
- #db = b[ii] - b[i0] (does not work with Numeric)
+ #db = b[ii] - b[i0]
db = npy.take(b, ii) - npy.take(b, i0)
db = npy.where(i0==ii, 1.0, db)
#dy = y[ii] - y[i0]
Modified: branches/transforms/lib/matplotlib/config/matplotlib.conf.default
===================================================================
--- branches/transforms/lib/matplotlib/config/matplotlib.conf.default 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/config/matplotlib.conf.default 2007-11-14 19:46:37 UTC (rev 4292)
@@ -1,7 +1,7 @@
# MPLConfig - plaintext (in .conf format)
# This is a sample matplotlib configuration file. It should be placed
-# in HOME/.matplotlib/matplotlibrc (unix/linux like systems) and
+# in HOME/.matplotlib (unix/linux like systems) and
# C:\Documents and Settings\yourname\.matplotlib (win32 systems)
#
# By default, the installer will overwrite the existing file in the install
Modified: branches/transforms/lib/matplotlib/config/mplconfig.py
===================================================================
--- branches/transforms/lib/matplotlib/config/mplconfig.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/config/mplconfig.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -23,7 +23,7 @@
class MPLConfig(TConfig):
"""
This is a sample matplotlib configuration file. It should be placed
- in HOME/.matplotlib/matplotlibrc (unix/linux like systems) and
+ in HOME/.matplotlib (unix/linux like systems) and
C:\Documents and Settings\yourname\.matplotlib (win32 systems)
By default, the installer will overwrite the existing file in the install
@@ -43,11 +43,11 @@
the default values listed herein.
Colors: for the color values below, you can either use
- - a matplotlib color string, such as r, k, or b
+ - a matplotlib color string, such as r | k | b
- an rgb tuple, such as (1.0, 0.5, 0.0)
- a hex string, such as #ff00ff or ff00ff
- a scalar grayscale intensity such as 0.75
- - a legal html color name, eg red, blue, darkslategray
+ - a legal html color name, eg red | blue | darkslategray
Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
@@ -63,8 +63,6 @@
units = T.false
class backend(TConfig):
- """Valid backends are: 'GTKAgg', 'GTKCairo', 'QtAgg', 'Qt4Agg',
- 'TkAgg', 'Agg', 'Cairo', 'PS', 'PDF', 'SVG'"""
use = T.Trait('Agg', mplT.BackendHandler())
class cairo(TConfig):
Modified: branches/transforms/lib/matplotlib/config/mpltraits.py
===================================================================
--- branches/transforms/lib/matplotlib/config/mpltraits.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/config/mpltraits.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -24,18 +24,22 @@
class BackendHandler(T.TraitHandler):
"""
"""
- backends = {'tkagg': 'TkAgg',
+ backends = {'agg': 'Agg',
+ 'cairo': 'Cairo',
+ 'cocoaagg': 'CocoaAgg',
+ 'fltkagg': 'FltkAgg',
+ 'gtk': 'GTK',
'gtkagg': 'GTKAgg',
'gtkcairo': 'GTKCairo',
+ 'pdf': 'Pdf',
+ 'ps': 'PS',
'qt4agg': 'Qt4Agg',
'qtagg': 'QtAgg',
- 'wxagg': 'WXAgg',
- 'agg': 'Agg',
- 'cairo': 'Cairo',
- 'ps': 'PS',
- 'pdf': 'Pdf',
'svg': 'SVG',
- 'template': 'Template' }
+ 'template': 'Template',
+ 'tkagg': 'TkAgg',
+ 'wx': 'WX',
+ 'wxagg': 'WXAgg'}
def validate(self, object, name, value):
try:
@@ -46,7 +50,7 @@
def info(self):
be = self.backends.keys()
be.sort
- return "one of %s"% ', '.join(['%s'%i for i in be])
+ return "one of: %s"% ' | '.join(['%s'%i for i in be])
class BoolHandler(T.TraitHandler):
@@ -73,7 +77,7 @@
return self.error(object, name, value)
def info(self):
- return "one of %s"% ', '.join(['%s'%i for i in self.bools.keys()])
+ return "one of: %s"% ' | '.join(['%s'%i for i in self.bools.keys()])
flexible_true = T.Trait(True, BoolHandler())
flexible_false = T.Trait(False, BoolHandler())
Modified: branches/transforms/lib/matplotlib/config/tconfig.py
===================================================================
--- branches/transforms/lib/matplotlib/config/tconfig.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/config/tconfig.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -76,6 +76,50 @@
# Utility functions
############################################################################
+def get_split_ind(seq, N):
+ """seq is a list of words. Return the index into seq such that
+ len(' '.join(seq[:ind])<=N
+ """
+
+ sLen = 0
+ # todo: use Alex's xrange pattern from the cbook for efficiency
+ for (word, ind) in zip(seq, range(len(seq))):
+ sLen += len(word) + 1 # +1 to account for the len(' ')
+ if sLen>=N: return ind
+ return len(seq)
+
+def wrap(prefix, text, cols, max_lines=6):
+ 'wrap text with prefix at length cols'
+ pad = ' '*len(prefix.expandtabs())
+ available = cols - len(pad)
+
+ seq = text.split(' ')
+ Nseq = len(seq)
+ ind = 0
+ lines = []
+ while ind<Nseq:
+ lastInd = ind
+ ind += get_split_ind(seq[ind:], available)
+ lines.append(seq[lastInd:ind])
+
+ num_lines = len(lines)
+ abbr_end = max_lines // 2
+ abbr_start = max_lines - abbr_end
+ lines_skipped = False
+ for i in range(num_lines):
+ if i == 0:
+ # add the prefix to the first line, pad with spaces otherwise
+ ret = prefix + ' '.join(lines[i]) + '\n'
+ elif i < abbr_start or i > num_lines-abbr_end-1:
+ ret += pad + ' '.join(lines[i]) + '\n'
+ else:
+ if not lines_skipped:
+ lines_skipped = True
+ ret += ' <...snipped %d lines...> \n' % (num_lines-max_lines)
+# for line in lines[1:]:
+# ret += pad + ' '.join(line) + '\n'
+ return ret[:-1]
+
def dedent(txt):
"""A modified version of textwrap.dedent, specialized for docstrings.
@@ -115,44 +159,6 @@
return ''.join(lines)
-def short_str(txt,line_length=80,max_lines=6):
- """Shorten a text input if necessary.
- """
-
- assert max_lines%2==0,"max_lines must be even"
-
- if txt.count('\n') <= 1:
- # Break up auto-generated text that can be *very* long but in just one
- # line.
- ltxt = len(txt)
- max_len = line_length*max_lines
- chunk = max_lines/2
-
- if ltxt > max_len:
- out = []
- for n in range(chunk):
- out.append(txt[line_length*n:line_length*(n+1)])
-
- out.append(' <...snipped %d chars...> ' % (ltxt-max_len))
-
- for n in range(-chunk-1,0,1):
- # Special-casing for the last step of the loop, courtesy of
- # Python's idiotic string slicign semantics when the second
- # argument is 0. Argh.
- end = line_length*(n+1)
- if end==0: end = None
- out.append(txt[line_length*n:end])
-
- txt = '\n'.join(out)
- else:
- nlines = ltxt/line_length
- out = [ txt[line_length*n:line_length*(n+1)]
- for n in range(nlines+1)]
- if out:
- txt = '\n'.join(out)
- return txt
-
-
def configObj2Str(cobj):
"""Dump a Configobj instance to a string."""
outstr = StringIO()
@@ -463,7 +469,7 @@
# Get a short version of info with lines of max. 78 chars, so
# that after commenting them out (with '# ') they are at most
# 80-chars long.
- out.append(comment(short_str(info,78-len(indent)),indent))
+ out.append(comment(wrap('',info.replace('\n', ' '),78-len(indent)),indent))
except (KeyError,AttributeError):
pass
out.append(indent+('%s = %r' % (s,v)))
Modified: branches/transforms/lib/matplotlib/image.py
===================================================================
--- branches/transforms/lib/matplotlib/image.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/image.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -7,18 +7,23 @@
import os
import numpy as npy
-from matplotlib.numerix import npyma as ma
+import matplotlib.numerix.npyma as ma
+
from matplotlib import rcParams
-from artist import Artist
-from colors import colorConverter
-import cm
-import _image
+from matplotlib import artist as martist
+from matplotlib import colors as mcolors
+from matplotlib import cm
+# For clarity, names from _image are given explicitly in this module:
+from matplotlib import _image
-from _image import *
-class AxesImage(Artist, cm.ScalarMappable):
+# For user convenience, the names from _image are also imported into
+# the image namespace:
+from matplotlib._image import *
+class AxesImage(martist.Artist, cm.ScalarMappable):
+
def __init__(self, ax,
cmap = None,
norm = None,
@@ -43,7 +48,7 @@
Additional kwargs are matplotlib.artist properties
"""
- Artist.__init__(self)
+ martist.Artist.__init__(self)
cm.ScalarMappable.__init__(self, norm, cmap)
if origin is None: origin = rcParams['image.origin']
@@ -99,7 +104,7 @@
ACCEPTS: float
"""
- Artist.set_alpha(self, alpha)
+ martist.Artist.set_alpha(self, alpha)
self._imcache = None
def changed(self):
@@ -133,7 +138,8 @@
else:
im = self._imcache
- bg = colorConverter.to_rgba(self.axes.get_frame().get_facecolor(), 0)
+ fc = self.axes.get_frame().get_facecolor()
+ bg = mcolors.colorConverter.to_rgba(fc, 0)
im.set_bg( *bg)
# image input dimensions
@@ -229,18 +235,18 @@
"""
retained for backwards compatibility - use set_data instead
- ACCEPTS: numeric/numarray/PIL Image A"""
+ ACCEPTS: numpy array A or PIL Image"""
# This also needs to be here to override the inherited
# cm.ScalarMappable.set_array method so it is not invoked
# by mistake.
self.set_data(A)
-
+
def set_extent(self, extent):
"""extent is data axes (left, right, bottom, top) for making image plots
"""
self._extent = extent
-
+
xmin, xmax, ymin, ymax = extent
corners = (xmin, ymin), (xmax, ymax)
self.axes.update_datalim(corners)
@@ -330,10 +336,9 @@
height *= magnification
im = _image.pcolor(self._Ax, self._Ay, self._A,
height, width,
- (x0, x0+v_width, y0, y0+v_height),
- )
-
- bg = colorConverter.to_rgba(self.axes.get_frame().get_facecolor(), 0)
+ (x0, x0+v_width, y0, y0+v_height))
+ fc = self.axes.get_frame().get_facecolor()
+ bg = mcolors.colorConverter.to_rgba(fc, 0)
im.set_bg(*bg)
return im
@@ -402,7 +407,7 @@
-class FigureImage(Artist, cm.ScalarMappable):
+class FigureImage(martist.Artist, cm.ScalarMappable):
def __init__(self, fig,
cmap = None,
norm = None,
@@ -416,7 +421,7 @@
norm is a colors.Normalize instance to map luminance to 0-1
"""
- Artist.__init__(self)
+ martist.Artist.__init__(self)
cm.ScalarMappable.__init__(self, norm, cmap)
if origin is None: origin = rcParams['image.origin']
self.origin = origin
@@ -464,7 +469,8 @@
x = self.to_rgba(self._A, self._alpha)
im = _image.fromarray(x, 1)
- im.set_bg( *colorConverter.to_rgba(self.figure.get_facecolor(), 0) )
+ fc = self.figure.get_facecolor()
+ im.set_bg( *mcolors.colorConverter.to_rgba(fc, 0) )
im.is_grayscale = (self.cmap.name == "gray" and
len(self._A.shape) == 2)
if self.origin=='upper':
Modified: branches/transforms/lib/matplotlib/lines.py
===================================================================
--- branches/transforms/lib/matplotlib/lines.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/lines.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -229,7 +229,7 @@
"""
Artist.__init__(self)
- #convert sequences to numeric arrays
+ #convert sequences to numpy arrays
if not iterable(xdata):
raise RuntimeError('xdata must be a sequence')
if not iterable(ydata):
Modified: branches/transforms/lib/matplotlib/mlab.py
===================================================================
--- branches/transforms/lib/matplotlib/mlab.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/mlab.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -353,7 +353,7 @@
# zero pad x up to NFFT if it is shorter than NFFT
if len(x)<NFFT:
n = len(x)
- x = resize(x, (NFFT,))
+ x = npy.resize(x, (NFFT,))
x[n:] = 0
@@ -533,7 +533,7 @@
Cxy, Phase, freqs = cohere_pairs( X, ij, ...)
Compute the coherence for all pairs in ij. X is a
- numSamples,numCols Numeric array. ij is a list of tuples (i,j).
+ numSamples,numCols numpy array. ij is a list of tuples (i,j).
Each tuple is a pair of indexes into the columns of X for which
you want to compute coherence. For example, if X has 64 columns,
and you want to compute all nonredundant pairs, define ij as
@@ -894,7 +894,7 @@
Example 1 :
## 2D system
- # Numeric solution
+
def derivs6(x,t):
d1 = x[0] + 2*x[1]
d2 = -3*x[0] + 4*x[1]
@@ -1480,8 +1480,7 @@
"""
A set of convenient utilities for numerical work.
-Most of this module requires Numerical Python or is meant to be used with it.
-See http://www.pfdubois.com/numpy for details.
+Most of this module requires numpy or is meant to be used with it.
Copyright (c) 2001-2004, Fernando Perez. <Fer...@co...>
All rights reserved.
@@ -1754,7 +1753,7 @@
#from numpy import fromfunction as fromfunction_kw
def fromfunction_kw(function, dimensions, **kwargs):
- """Drop-in replacement for fromfunction() from Numerical Python.
+ """Drop-in replacement for fromfunction() from numpy
Allows passing keyword arguments to the desired function.
@@ -1938,12 +1937,8 @@
### end mlab2 functions
-#Classes for manipulating and viewing numpy record arrays
+#helpers for loading, saving, manipulating and viewing numpy record arrays
-
-
-
-
def safe_isnan(x):
'isnan for arbitrary types'
try: b = npy.isnan(x)
@@ -2236,10 +2231,10 @@
# a series of classes for describing the format intentions of various rec views
class FormatObj:
def tostr(self, x):
- return str(self.toval(x))
+ return self.toval(x)
def toval(self, x):
- return x
+ return str(x)
class FormatString(FormatObj):
Modified: branches/transforms/lib/matplotlib/mpl-data/matplotlib.conf.template
===================================================================
--- branches/transforms/lib/matplotlib/mpl-data/matplotlib.conf.template 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/mpl-data/matplotlib.conf.template 2007-11-14 19:46:37 UTC (rev 4292)
@@ -21,11 +21,11 @@
# the default values listed herein.
#
# Colors: for the color values below, you can either use
-# - a matplotlib color string, such as r, k, or b
+# - a matplotlib color string, such as r | k | b
# - an rgb tuple, such as (1.0, 0.5, 0.0)
# - a hex string, such as #ff00ff or ff00ff
# - a scalar grayscale intensity such as 0.75
-# - a legal html color name, eg red, blue, darkslategray
+# - a legal html color name, eg red | blue | darkslategray
#
# Interactivity: see http://matplotlib.sourceforge.net/interactive.html.
#
@@ -33,20 +33,19 @@
# a value of type 'str'
datapath = '/usr/lib64/python2.5/site-packages/matplotlib/mpl-data'
-# one of 0, on, false, 1, no, n, y, off, yes, true
+# one of: 0 | on | false | 1 | no | n | y | off | yes | true
interactive = False
# a value of type 'bool'
maskedarray = False
# 'numpy' or 'numeric' or 'numarray'
numerix = 'numpy'
-# 'Africa/Abidjan' or 'Africa/Accra' or 'Africa/Addis_Ababa' or 'Africa/Algiers'
-# or 'Africa/Asmara' or 'Africa/Asmera' or 'Africa/Bamako' or 'Africa/Bangui' o
-# r 'Africa/Banjul' or 'Africa/Bissau' or 'Africa/Blantyre' or 'Africa/Brazzavil
-# <...snipped 10590 chars...>
-# or 'Turkey' or 'UCT' or 'US/Alaska' or 'US/Aleutian' or 'US/Arizona' or 'US/Ce
-# ntral' or 'US/East-Indiana' or 'US/Eastern' or 'US/Hawaii' or 'US/Indiana-Star
-# ke' or 'US/Michigan' or 'US/Mountain' or 'US/Pacific' or 'US/Pacific-New' or '
-# US/Samoa' or 'UTC' or 'Universal' or 'W-SU' or 'WET' or 'Zulu' or 'posixrules'
+# 'Africa/Abidjan' or 'Africa/Accra' or 'Africa/Addis_Ababa' or
+# 'Africa/Algiers' or 'Africa/Asmara' or 'Africa/Asmera' or 'Africa/Bamako' or
+# 'Africa/Bangui' or 'Africa/Banjul' or 'Africa/Bissau' or 'Africa/Blantyre'
+# <...snipped 156 lines...>
+# 'US/Michigan' or 'US/Mountain' or 'US/Pacific' or 'US/Pacific-New' or
+# 'US/Samoa' or 'UTC' or 'Universal' or 'W-SU' or 'WET' or 'Zulu' or
+# 'posixrules'
timezone = 'UTC'
# 'toolbar2' or None
toolbar = 'toolbar2'
@@ -64,23 +63,23 @@
# name like 'orange', a hex color like '#efefef', a grayscale intensity
# like '0.5', or an RGBA tuple (1,0,0,1)
facecolor = 'white'
- # one of 0, on, false, 1, no, n, y, off, yes, true
+ # one of: 0 | on | false | 1 | no | n | y | off | yes | true
grid = False
- # one of 0, on, false, 1, no, n, y, off, yes, true
+ # one of: 0 | on | false | 1 | no | n | y | off | yes | true
hold = True
# any valid matplotlib color, eg an abbreviation like 'r' for red, a full
# name like 'orange', a hex color like '#efefef', a grayscale intensity
# like '0.5', or an RGBA tuple (1,0,0,1)
labelcolor = 'black'
- # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or 'medium'
- # or 'large' or 'x-large' or 'xx-large'
+ # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or
+ # 'medium' or 'large' or 'x-large' or 'xx-large'
labelsize = 'medium'
# a value of type 'float'
linewidth = 1.0
- # one of 0, on, false, 1, no, n, y, off, yes, true
+ # one of: 0 | on | false | 1 | no | n | y | off | yes | true
polargrid = True
- # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or 'medium'
- # or 'large' or 'x-large' or 'xx-large'
+ # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or
+ # 'medium' or 'large' or 'x-large' or 'xx-large'
titlesize = 'large'
[[formatter]]
@@ -88,10 +87,8 @@
limits = [-7.0, 7.0]
[backend]
- # Valid backends are: 'GTKAgg', 'GTKCairo', 'QtAgg', 'Qt4Agg',
- # 'TkAgg', 'Agg', 'Cairo', 'PS', 'PDF', 'SVG'
- # one of ps, qt4agg, tkagg, gtkagg, agg, cairo, gtkcairo, wxagg, qtagg, temp
- # late, svg, pdf
+ # one of: ps | qt4agg | fltkagg | gtkagg | agg | cairo | gtk | gtkcairo |
+ # wxagg | tkagg | qtagg | template | svg | cocoaagg | pdf | wx
use = 'Agg'
[[cairo]]
@@ -111,10 +108,10 @@
[[ps]]
# 3 or 42
fonttype = 3
- # 'auto' or 'letter' or 'legal' or 'ledger' or 'A0' or 'A1' or 'A2' or '
- # A3' or 'A4' or 'A5' or 'A6' or 'A7' or 'A8' or 'A9' or 'A10' or 'B0' o
- # r 'B1' or 'B2' or 'B3' or 'B4' or 'B5' or 'B6' or 'B7' or 'B8' or 'B9'
- # or 'B10'
+ # 'auto' or 'letter' or 'legal' or 'ledger' or 'A0' or 'A1' or 'A2' or
+ # 'A3' or 'A4' or 'A5' or 'A6' or 'A7' or 'A8' or 'A9' or 'A10' or
+ # 'B0' or 'B1' or 'B2' or 'B3' or 'B4' or 'B5' or 'B6' or 'B7' or 'B8'
+ # or 'B9' or 'B10'
papersize = 'letter'
# a value of type 'bool'
useafm = False
@@ -191,16 +188,16 @@
serif = ['Bitstream Vera Serif', 'New Century Schoolbook', 'Century Schoolbook L', 'Utopia', 'ITC Bookman', 'Bookman', 'Nimbus Roman No9 L', 'Times New Roman', 'Times', 'Palatino', 'Charter', 'serif']
# a value of type 'float'
size = 12.0
- # 'ultra-condensed' or 'extra-condensed' or 'condensed' or 'semi-condensed'
- # or 'normal' or 'semi-expanded' or 'expanded' or 'extra-expanded' or 'ultra
- # -expanded' or 'wider' or 'narrower'
+ # 'ultra-condensed' or 'extra-condensed' or 'condensed' or
+ # 'semi-condensed' or 'normal' or 'semi-expanded' or 'expanded' or
+ # 'extra-expanded' or 'ultra-expanded' or 'wider' or 'narrower'
stretch = 'normal'
# 'normal' or 'italic' or 'oblique'
style = 'normal'
# 'normal' or 'small-caps'
variant = 'normal'
- # 'normal' or 'bold' or 'bolder' or 'lighter' or 100 or 200 or 300 or 400 or
- # 500 or 600 or 700 or 800 or 900
+ # 'normal' or 'bold' or 'bolder' or 'lighter' or 100 or 200 or 300 or 400
+ # or 500 or 600 or 700 or 800 or 900
weight = 'normal'
[grid]
@@ -216,18 +213,18 @@
[image]
# a value of type 'float' or 'equal' or 'auto'
aspect = 'equal'
- # 'Accent' or 'Accent_r' or 'Blues' or 'Blues_r' or 'BrBG' or 'BrBG_r' or 'B
- # uGn' or 'BuGn_r' or 'BuPu' or 'BuPu_r' or 'Dark2' or 'Dark2_r' or 'GnBu' o
- # r 'GnBu_r' or 'Greens' or 'Greens_r' or 'Greys' or 'Greys_r' or 'OrRd' or
- # <...snipped 1010 chars...>
- # ist_stern' or 'gist_stern_r' or 'gist_yarg' or 'gist_yarg_r' or 'gray' or
- # 'gray_r' or 'hot' or 'hot_r' or 'hsv' or 'hsv_r' or 'jet' or 'jet_r' or 'p
- # ink' or 'pink_r' or 'prism' or 'prism_r' or 'spectral' or 'spectral_r' or
- # 'spring' or 'spring_r' or 'summer' or 'summer_r' or 'winter' or 'winter_r'
+ # 'Accent' or 'Accent_r' or 'Blues' or 'Blues_r' or 'BrBG' or 'BrBG_r' or
+ # 'BuGn' or 'BuGn_r' or 'BuPu' or 'BuPu_r' or 'Dark2' or 'Dark2_r' or
+ # 'GnBu' or 'GnBu_r' or 'Greens' or 'Greens_r' or 'Greys' or 'Greys_r' or
+ # <...snipped 16 lines...>
+ # 'pink_r' or 'prism' or 'prism_r' or 'spectral' or 'spectral_r' or
+ # 'spring' or 'spring_r' or 'summer' or 'summer_r' or 'winter' or
+ # 'winter_r'
cmap = 'jet'
- # 'bilinear' or 'nearest' or 'bicubic' or 'spline16' or 'spline36' or 'hanni
- # ng' or 'hamming' or 'hermite' or 'kaiser' or 'quadric' or 'catrom' or 'gau
- # ssian' or 'bessel' or 'mitchell' or 'sinc' or 'lanczos' or 'blackman'
+ # 'bilinear' or 'nearest' or 'bicubic' or 'spline16' or 'spline36' or
+ # 'hanning' or 'hamming' or 'hermite' or 'kaiser' or 'quadric' or 'catrom'
+ # or 'gaussian' or 'bessel' or 'mitchell' or 'sinc' or 'lanczos' or
+ # 'blackman'
interpolation = 'bilinear'
# a value of type 'int'
lut = 256
@@ -237,8 +234,8 @@
[legend]
# a value of type 'float'
axespad = 0.02
- # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or 'medium'
- # or 'large' or 'x-large' or 'xx-large'
+ # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or
+ # 'medium' or 'large' or 'x-large' or 'xx-large'
fontsize = 'medium'
# a value of type 'float'
handlelen = 0.050000000000000003
@@ -248,9 +245,9 @@
isaxes = True
# a value of type 'float'
labelsep = 0.01
- # 'best' or 'upper right' or 'upper left' or 'lower left' or 'lower right' o
- # r 'right' or 'center left' or 'center right' or 'lower center' or 'upper c
- # enter' or 'center'
+ # 'best' or 'upper right' or 'upper left' or 'lower left' or 'lower right'
+ # or 'right' or 'center left' or 'center right' or 'lower center' or
+ # 'upper center' or 'center'
loc = 'upper right'
# a value of type 'float'
markerscale = 1.0
@@ -276,9 +273,9 @@
linestyle = '-'
# a value of type 'float'
linewidth = 1.0
- # 'None' or 'o' or '.' or ',' or '^' or 'v' or '<' or '>' or 's' or '+' or '
- # x' or 'D' or 'd' or '1' or '2' or '3' or '4' or 'h' or 'H' or 'p' or '|' o
- # r '_'
+ # 'None' or 'o' or '.' or ',' or '^' or 'v' or '<' or '>' or 's' or '+' or
+ # 'x' or 'D' or 'd' or '1' or '2' or '3' or '4' or 'h' or 'H' or 'p' or
+ # '|' or '_'
marker = 'None'
# a value of type 'float'
markeredgewidth = 0.5
@@ -290,27 +287,27 @@
solid_joinstyle = 'miter'
[mathtext]
- # A fontconfig pattern. See the fontconfig user manual for more information
- # .
+ # A fontconfig pattern. See the fontconfig user manual for more
+ # information.
bf = 'serif:bold'
- # A fontconfig pattern. See the fontconfig user manual for more information
- # .
+ # A fontconfig pattern. See the fontconfig user manual for more
+ # information.
cal = 'cursive'
# a value of type 'bool'
fallback_to_cm = True
# 'cm' or 'stix' or 'stixsans' or 'custom'
fontset = 'cm'
- # A fontconfig pattern. See the fontconfig user manual for more information
- # .
+ # A fontconfig pattern. See the fontconfig user manual for more
+ # information.
it = 'serif:oblique'
- # A fontconfig pattern. See the fontconfig user manual for more information
- # .
+ # A fontconfig pattern. See the fontconfig user manual for more
+ # information.
rm = 'serif'
- # A fontconfig pattern. See the fontconfig user manual for more information
- # .
+ # A fontconfig pattern. See the fontconfig user manual for more
+ # information.
sf = 'sans'
- # A fontconfig pattern. See the fontconfig user manual for more information
- # .
+ # A fontconfig pattern. See the fontconfig user manual for more
+ # information.
tt = 'monospace'
[patch]
@@ -370,8 +367,8 @@
color = 'black'
# 'in' or 'out'
direction = 'in'
- # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or 'medium'
- # or 'large' or 'x-large' or 'xx-large'
+ # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or
+ # 'medium' or 'large' or 'x-large' or 'xx-large'
labelsize = 'small'
[[major]]
@@ -393,8 +390,8 @@
color = 'black'
# 'in' or 'out'
direction = 'in'
- # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or 'medium'
- # or 'large' or 'x-large' or 'xx-large'
+ # a value of type 'float' or 'xx-small' or 'x-small' or 'small' or
+ # 'medium' or 'large' or 'x-large' or 'xx-large'
labelsize = 'small'
[[major]]
Modified: branches/transforms/lib/matplotlib/numerix/__init__.py
===================================================================
--- branches/transforms/lib/matplotlib/numerix/__init__.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/numerix/__init__.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -35,8 +35,10 @@
use_maskedarray = True
if a == "--ma":
use_maskedarray = False
-del a
+try: del a
+except NameError: pass
+
if which[0] is None:
try: # In theory, rcParams always has *some* value for numerix.
which = rcParams['numerix'], "rc"
Modified: branches/transforms/lib/matplotlib/pylab.py
===================================================================
--- branches/transforms/lib/matplotlib/pylab.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/lib/matplotlib/pylab.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -191,11 +191,6 @@
__end
-Credits: The plotting commands were provided by
-John D. Hunter <jdh...@ac...>
-
-Most of the other commands are from Numeric, MLab and FFT, with the
-exception of those in mlab.py provided by matplotlib.
"""
import sys, warnings
Modified: branches/transforms/setup.py
===================================================================
--- branches/transforms/setup.py 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/setup.py 2007-11-14 19:46:37 UTC (rev 4292)
@@ -169,7 +169,6 @@
if options['build_gtk']:
if hasgtk or (options['build_gtk'] is True):
build_gdk(ext_modules, packages)
- rc['backend'] = 'GTK'
if options['build_gtkagg']:
if hasgtk or (options['build_gtkagg'] is True):
options['build_agg'] = 1
@@ -264,15 +263,16 @@
distrib = setup(name="matplotlib",
version= __version__,
- description = "Matlab(TM) style python plotting package",
+ description = "Python plotting package",
author = "John D. Hunter",
author_email="jd...@gm...",
url = "http://matplotlib.sourceforge.net",
long_description = """
matplotlib strives to produce publication quality 2D graphics
- using matlab plotting for inspiration. Although the main lib is
- object oriented, there is a functional interface "pylab"
- for people coming from Matlab.
+ for interactive graphing, scientific publishing, user interface
+ development and web application servers targeting multiple user
+ interfaces and hardcopy output formats. There is a 'pylab' mode
+ which emulates matlab graphics
""",
packages = packages,
platforms='any',
Modified: branches/transforms/src/_image.cpp
===================================================================
--- branches/transforms/src/_image.cpp 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/src/_image.cpp 2007-11-14 19:46:37 UTC (rev 4292)
@@ -1403,8 +1403,8 @@
// Create output
Image* imo = new Image;
imo->rowsIn = rows;
+ imo->colsIn = cols;
imo->rowsOut = rows;
- imo->colsIn = cols;
imo->colsOut = cols;
size_t NUMBYTES(rows * cols * 4);
agg::int8u *buffer = new agg::int8u[NUMBYTES];
@@ -1499,6 +1499,227 @@
return Py::asObject(imo);
}
+void _bin_indices(int *irows, int nrows, double *y, int ny,
+ double sc, double offs)
+{
+ int i;
+ if (sc*(y[ny-1] - y[0]) > 0)
+ {
+ int ii = 0;
+ int iilast = ny-1;
+ int iy0 = (int)floor(sc * (y[ii] - offs));
+ int iy1 = (int)floor(sc * (y[ii+1] - offs));
+ for (i=0; i<nrows && i<iy0; i++) {
+ irows[i] = -1;
+ }
+ for (; i<nrows; i++) {
+ while (i > iy1 && ii < iilast) {
+ ii++;
+ iy0 = iy1;
+ iy1 = (int)floor(sc * (y[ii+1] - offs));
+ }
+ if (i >= iy0 && i <= iy1) irows[i] = ii;
+ else break;
+ }
+ for (; i<nrows; i++) {
+ irows[i] = -1;
+ }
+ }
+ else
+ {
+ int iilast = ny-1;
+ int ii = iilast;
+ int iy0 = (int)floor(sc * (y[ii] - offs));
+ int iy1 = (int)floor(sc * (y[ii-1] - offs));
+ for (i=0; i<nrows && i<iy0; i++) {
+ irows[i] = -1;
+ }
+ for (; i<nrows; i++) {
+ while (i > iy1 && ii > 1) {
+ ii--;
+ iy0 = iy1;
+ iy1 = (int)floor(sc * (y[ii-1] - offs));
+ }
+ if (i >= iy0 && i <= iy1) irows[i] = ii-1;
+ else break;
+ }
+ for (; i<nrows; i++) {
+ irows[i] = -1;
+ }
+ }
+}
+
+char __image_module_pcolor2__doc__[] =
+"pcolor2(x, y, data, rows, cols, bounds, bg)\n"
+"\n"
+"Generate a pseudo-color image from data on a non-uniform grid\n"
+"specified by its cell boundaries.\n"
+"bounds = (x_left, x_right, y_bot, y_top)\n"
+"bg = ndarray of 4 uint8 representing background rgba\n"
+;
+Py::Object
+_image_module::pcolor2(const Py::Tuple& args) {
+ _VERBOSE("_image_module::pcolor2");
+
+ if (args.length() != 7)
+ throw Py::TypeError("Incorrect number of arguments (6 expected)");
+
+ Py::Object xp = args[0];
+ Py::Object yp = args[1];
+ Py::Object dp = args[2];
+ int rows = Py::Int(args[3]);
+ int cols = Py::Int(args[4]);
+ Py::Tuple bounds = args[5];
+ Py::Object bgp = args[6];
+
+ if (bounds.length() !=4)
+ throw Py::TypeError("Incorrect number of bounds (4 expected)");
+ double x_left = Py::Float(bounds[0]);
+ double x_right = Py::Float(bounds[1]);
+ double y_bot = Py::Float(bounds[2]);
+ double y_top = Py::Float(bounds[3]);
+
+ // Check we have something to output to
+ if (rows == 0 || cols ==0)
+ throw Py::ValueError("rows or cols is zero; there are no pixels");
+
+ // Get numpy arrays
+ PyArrayObject *x = (PyArrayObject *) PyArray_ContiguousFromObject(xp.ptr(),
+ PyArray_DOUBLE, 1, 1);
+ if (x == NULL)
+ throw Py::ValueError("x is of incorrect type (wanted 1D double)");
+ PyArrayObject *y = (PyArrayObject *) PyArray_ContiguousFromObject(yp.ptr(),
+ PyArray_DOUBLE, 1, 1);
+ if (y == NULL) {
+ Py_XDECREF(x);
+ throw Py::ValueError("y is of incorrect type (wanted 1D double)");
+ }
+ PyArrayObject *d = (PyArrayObject *) PyArray_ContiguousFromObject(dp.ptr(),
+ PyArray_UBYTE, 3, 3);
+ if (d == NULL) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ throw Py::ValueError("data is of incorrect type (wanted 3D uint8)");
+ }
+ if (d->dimensions[2] != 4) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ throw Py::ValueError("data must be in RGBA format");
+ }
+
+ // Check dimensions match
+ int nx = x->dimensions[0];
+ int ny = y->dimensions[0];
+ if (nx != d->dimensions[1]+1 || ny != d->dimensions[0]+1) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ throw Py::ValueError("data and axis bin boundary dimensions are incompatible");
+ }
+
+ PyArrayObject *bg = (PyArrayObject *) PyArray_ContiguousFromObject(bgp.ptr(),
+ PyArray_UBYTE, 1, 1);
+ if (bg == NULL) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ throw Py::ValueError("bg is of incorrect type (wanted 1D uint8)");
+ }
+ if (bg->dimensions[0] != 4) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ Py_XDECREF(bg);
+ throw Py::ValueError("bg must be in RGBA format");
+ }
+
+
+ // Allocate memory for pointer arrays
+ int * irows = reinterpret_cast<int*>(PyMem_Malloc(sizeof(int)*rows));
+ if (irows == NULL) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ Py_XDECREF(bg);
+ throw Py::MemoryError("Cannot allocate memory for lookup table");
+ }
+ int * jcols = reinterpret_cast<int*>(PyMem_Malloc(sizeof(int*)*cols));
+ if (jcols == NULL) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ Py_XDECREF(bg);
+ PyMem_Free(irows);
+ throw Py::MemoryError("Cannot allocate memory for lookup table");
+ }
+
+ // Create output
+ Image* imo = new Image;
+ imo->rowsIn = rows;
+ imo->rowsOut = rows;
+ imo->colsIn = cols;
+ imo->colsOut = cols;
+ size_t NUMBYTES(rows * cols * 4);
+ agg::int8u *buffer = new agg::int8u[NUMBYTES];
+ if (buffer == NULL) {
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ Py_XDECREF(bg);
+ PyMem_Free(irows);
+ PyMem_Free(jcols);
+ throw Py::MemoryError("Could not allocate memory for image");
+ }
+
+ // Calculate the pointer arrays to map input x to output x
+ int i, j;
+ double *x0 = reinterpret_cast<double*>(x->data);
+ double *y0 = reinterpret_cast<double*>(y->data);
+ double sx = cols/(x_right - x_left);
+ double sy = rows/(y_top - y_bot);
+ _bin_indices(jcols, cols, x0, nx, sx, x_left);
+ _bin_indices(irows, rows, y0, ny, sy, y_bot);
+
+ // Copy data to output buffer
+ agg::int8u * position = buffer;
+ unsigned char *start = reinterpret_cast<unsigned char*>(d->data);
+ unsigned char *bgptr = reinterpret_cast<unsigned char*>(bg->data);
+ int s0 = d->strides[0];
+ int s1 = d->strides[1];
+
+ for (i=0; i<rows; i++)
+ {
+ for (j=0; j<cols; j++)
+ {
+ if (irows[i] == -1 || jcols[j] == -1) {
+ memcpy(position, bgptr, 4*sizeof(agg::int8u));
+ }
+ else {
+ memcpy(position, (start + s0*irows[i] + s1*jcols[j]),
+ 4*sizeof(agg::int8u));
+ }
+ position += 4;
+ }
+ }
+
+ // Attach output buffer to output buffer
+ imo->rbufOut = new agg::rendering_buffer;
+ imo->bufferOut = buffer;
+ imo->rbufOut->attach(imo->bufferOut, imo->colsOut, imo->rowsOut, imo->colsOut * imo->BPP);
+
+ Py_XDECREF(x);
+ Py_XDECREF(y);
+ Py_XDECREF(d);
+ Py_XDECREF(bg);
+ PyMem_Free(irows);
+ PyMem_Free(jcols);
+
+ return Py::asObject(imo);
+}
+
+
+
#if defined(_MSC_VER)
DL_EXPORT(void)
#elif defined(__cplusplus)
@@ -1532,7 +1753,7 @@
d["SINC"] = Py::Int(Image::SINC);
d["LANCZOS"] = Py::Int(Image::LANCZOS);
d["BLACKMAN"] = Py::Int(Image::BLACKMAN);
-
+
d["ASPECT_FREE"] = Py::Int(Image::ASPECT_FREE);
d["ASPECT_PRESERVE"] = Py::Int(Image::ASPECT_PRESERVE);
Modified: branches/transforms/src/_image.h
===================================================================
--- branches/transforms/src/_image.h 2007-11-14 19:45:49 UTC (rev 4291)
+++ branches/transforms/src/_image.h 2007-11-14 19:46:37 UTC (rev 4292)
@@ -134,6 +134,8 @@
"from_images");
add_varargs_method("pcolor", &_image_module::pcolor,
"pcolor");
+ add_varargs_method("pcolor2", &_image_module::pcolor2,
+ "pcolor2");
initialize( "The _image module" );
}
@@ -145,11 +147,13 @@
Py::Object fromarray (const Py::Tuple &args);
Py::Object fromarray2 (const Py::Tuple &args);
Py::Object pcolor (const Py::Tuple &args);
+ Py::Object pcolor2 (const Py::Tuple &args);
Py::Object readpng (const Py::Tuple &args);
Py::Object from_images (const Py::Tuple &args);
static char _image_module_fromarray__doc__[];
static char _image_module_pcolor__doc__[];
+ static char _image_module_pcolor2__doc__[];
static char _image_module_fromarray2__doc__[];
static char _image_module_frombyte__doc__[];
static char _image_module_frombuffer__doc__[];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-14 19:45:52
|
Revision: 4291
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4291&view=rev
Author: jswhit
Date: 2007-11-14 11:45:49 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
include GEOS library source code
Modified Paths:
--------------
trunk/toolkits/basemap-testing/README
trunk/toolkits/basemap-testing/setup.py
Added Paths:
-----------
trunk/toolkits/basemap-testing/geos-2.2.3/
trunk/toolkits/basemap-testing/geos-2.2.3/AUTHORS
trunk/toolkits/basemap-testing/geos-2.2.3/COPYING
trunk/toolkits/basemap-testing/geos-2.2.3/ChangeLog
trunk/toolkits/basemap-testing/geos-2.2.3/INSTALL
trunk/toolkits/basemap-testing/geos-2.2.3/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/NEWS
trunk/toolkits/basemap-testing/geos-2.2.3/README
trunk/toolkits/basemap-testing/geos-2.2.3/TODO
trunk/toolkits/basemap-testing/geos-2.2.3/VisualStudio/
trunk/toolkits/basemap-testing/geos-2.2.3/VisualStudio/GEOS.sln
trunk/toolkits/basemap-testing/geos-2.2.3/VisualStudio/GEOS.vcproj
trunk/toolkits/basemap-testing/geos-2.2.3/VisualStudio/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/VisualStudio/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/aclocal.m4
trunk/toolkits/basemap-testing/geos-2.2.3/acsite.m4
trunk/toolkits/basemap-testing/geos-2.2.3/config.guess
trunk/toolkits/basemap-testing/geos-2.2.3/config.sub
trunk/toolkits/basemap-testing/geos-2.2.3/configure
trunk/toolkits/basemap-testing/geos-2.2.3/configure.in
trunk/toolkits/basemap-testing/geos-2.2.3/depcomp
trunk/toolkits/basemap-testing/geos-2.2.3/doc/
trunk/toolkits/basemap-testing/geos-2.2.3/doc/Doxyfile
trunk/toolkits/basemap-testing/geos-2.2.3/doc/Doxyfile.in
trunk/toolkits/basemap-testing/geos-2.2.3/doc/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/doc/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/doc/README
trunk/toolkits/basemap-testing/geos-2.2.3/doc/example.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/install-sh
trunk/toolkits/basemap-testing/geos-2.2.3/ltmain.sh
trunk/toolkits/basemap-testing/geos-2.2.3/macros/
trunk/toolkits/basemap-testing/geos-2.2.3/macros/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/macros/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/macros/geos.m4
trunk/toolkits/basemap-testing/geos-2.2.3/missing
trunk/toolkits/basemap-testing/geos-2.2.3/source/
trunk/toolkits/basemap-testing/geos-2.2.3/source/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/source/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/Makefile.vc
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/CGAlgorithms.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/CentroidArea.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/CentroidLine.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/CentroidPoint.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/ConvexHull.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/HCoordinate.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/InteriorPointArea.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/InteriorPointLine.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/InteriorPointPoint.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/LineIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/MCPointInRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/MinimumDiameter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/NonRobustCGAlgorithms.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/NonRobustLineIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/NotRepresentableException.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/PointLocator.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/RobustCGAlgorithms.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/RobustDeterminant.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/RobustLineIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/SIRtreePointInRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/SimplePointInAreaLocator.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/algorithm/SimplePointInRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/bigtest/
trunk/toolkits/basemap-testing/geos-2.2.3/source/bigtest/GeometryTestFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/bigtest/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/source/bigtest/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/bigtest/TestSweepLineSpeed.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/bigtest/bigtest.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/geos_c.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/geos_c.h.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/capi/geostest.c
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Coordinate.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/CoordinateSequence.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/CoordinateSequenceFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/DefaultCoordinateSequence.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/DefaultCoordinateSequenceFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Dimension.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Envelope.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Geometry.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/GeometryCollection.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/GeometryCollectionIterator.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/GeometryComponentFilter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/GeometryFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/IntersectionMatrix.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/LineSegment.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/LineString.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/LinearRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Location.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/MultiLineString.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/MultiPoint.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/MultiPolygon.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Point.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/PointCoordinateSequence.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/PointCoordinateSequenceFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Polygon.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/PrecisionModel.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/TopologyException.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/Triangle.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/util/
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/util/GeometryEditor.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/util/LinearComponentExtracter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/util/PointExtracter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geom/util/PolygonExtracter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/Depth.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/DirectedEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/DirectedEdgeStar.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/Edge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/EdgeEnd.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/EdgeEndStar.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/EdgeIntersection.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/EdgeIntersectionList.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/EdgeList.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/EdgeNodingValidator.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/EdgeRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/GeometryGraph.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/GraphComponent.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/Label.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/Node.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/NodeFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/NodeMap.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/PlanarGraph.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/Position.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/Quadrant.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/TopologyLocation.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/MonotoneChain.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/MonotoneChainEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/MonotoneChainIndexer.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/SegmentIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/SimpleEdgeSetIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/SimpleMCSweepLineIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/SimpleSweepLineIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/SweepLineEvent.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/geomgraph/index/SweepLineSegment.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/config.h.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/geom.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/geomUtil.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/geomgraph.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/geomgraphindex.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/geosAlgorithm.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/indexBintree.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/indexChain.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/indexQuadtree.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/indexStrtree.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/indexSweepline.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/io.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/noding.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/nodingSnapround.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/opBuffer.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/opDistance.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/opLinemerge.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/opOverlay.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/opPolygonize.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/opRelate.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/opValid.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/operation.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/planargraph.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/platform.h.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/platform.h.vc
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/precision.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/profiler.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/spatialIndex.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/timeval.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/unload.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/util.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos/version.h.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/headers/geos.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/bintree/
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/bintree/BinTreeInterval.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/bintree/BinTreeNode.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/bintree/Bintree.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/bintree/Key.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/bintree/NodeBase.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/bintree/Root.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/chain/
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/chain/MonotoneChainBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/chain/MonotoneChainOverlapAction.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/chain/MonotoneChainSelectAction.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/chain/indexMonotoneChain.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/DoubleBits.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/IntervalSize.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/QuadTreeKey.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/QuadTreeNode.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/QuadTreeNodeBase.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/QuadTreeRoot.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/quadtree/Quadtree.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/strtree/
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/strtree/AbstractNode.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/strtree/AbstractSTRtree.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/strtree/Interval.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/strtree/ItemBoundable.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/strtree/SIRtree.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/strtree/STRtree.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/sweepline/
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/sweepline/SweepLineIndex.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/sweepline/SweepLineInterval.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/index/sweepline/indexSweepLineEvent.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/ByteOrderValues.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/ParseException.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/StringTokenizer.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/Unload.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/WKBReader.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/WKBWriter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/WKTReader.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/WKTWriter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/Writer.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/markup/
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/markup/MarkupSTL.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/io/markup/MarkupSTL.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/IteratedNoder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/MCQuadtreeNoder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/Noder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/NodingValidator.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/SegmentNode.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/SegmentNodeList.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/SegmentString.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/SimpleNoder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/nodingSegmentIntersector.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/snapround/
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/snapround/SegmentSnapper.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/snapround/SimpleSegmentStringsSnapper.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/noding/snapround/SnapRounder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/GeometryGraphOperation.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/IsSimpleOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/BufferBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/BufferOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/BufferSubgraph.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/OffsetCurveBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/OffsetCurveSetBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/RightmostEdgeFinder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/buffer/SubgraphDepthLocater.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/distance/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/distance/ConnectedElementLocationFilter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/distance/ConnectedElementPointFilter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/distance/DistanceOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/distance/GeometryLocation.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/linemerge/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/linemerge/EdgeString.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/linemerge/LineMergeDirectedEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/linemerge/LineMergeEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/linemerge/LineMergeGraph.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/linemerge/LineMerger.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/EdgeSetNoder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/ElevationMatrix.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/ElevationMatrixCell.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/ElevationMatrixFilter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/LineBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/MaximalEdgeRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/MinimalEdgeRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/OverlayNodeFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/OverlayOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/PointBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/overlay/PolygonBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/polygonize/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/polygonize/PolygonizeDirectedEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/polygonize/PolygonizeEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/polygonize/PolygonizeGraph.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/polygonize/Polygonizer.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/polygonize/polygonizeEdgeRing.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/EdgeEndBuilder.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/EdgeEndBundle.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/EdgeEndBundleStar.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/RelateComputer.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/RelateNode.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/RelateNodeFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/RelateNodeGraph.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/relate/RelateOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/ConnectedInteriorTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/ConsistentAreaTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/IsValidOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/QuadtreeNestedRingTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/RepeatedPointTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/SimpleNestedRingTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/SweeplineNestedRingTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/operation/valid/TopologyValidationError.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/planarDirectedEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/planarDirectedEdgeStar.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/planarEdge.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/planarGraphComponent.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/planarNode.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/planarNodeMap.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/planargraph/planarPlanarGraph.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/precision/
trunk/toolkits/basemap-testing/geos-2.2.3/source/precision/CommonBits.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/precision/CommonBitsOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/precision/CommonBitsRemover.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/precision/EnhancedPrecisionOp.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/precision/SimpleGeometryPrecisionReducer.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/test/
trunk/toolkits/basemap-testing/geos-2.2.3/source/test/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/source/test/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/source/test/SimpleWKTTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/test/XMLTester.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/test/XMLTester.h
trunk/toolkits/basemap-testing/geos-2.2.3/source/test/test.xml
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/Assert.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/AssertionFailedException.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/CoordinateArrayFiter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/GEOSException.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/GeometricShapeFactory.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/IllegalArgumentException.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/Profiler.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/UniqueCoordinateArrayFilter.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/source/util/UnsupportedOperationException.cpp
trunk/toolkits/basemap-testing/geos-2.2.3/swig/
trunk/toolkits/basemap-testing/geos-2.2.3/swig/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/swig/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/swig/README.txt
trunk/toolkits/basemap-testing/geos-2.2.3/swig/geos.i
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/README.txt
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/setup.py
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/TESTING.txt
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/cases/
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/cases/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/cases/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/cases/__init__.py
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/cases/pointtest.py
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/cases/testing.py
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/cases/wkttest.py
trunk/toolkits/basemap-testing/geos-2.2.3/swig/python/tests/runtests.py
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/README.txt
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/ruby.i
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/example.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/geos_tests.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_combinations.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_envelope.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_factory_methods.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_geom.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_helper.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_io.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_operations.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_relations.rb
trunk/toolkits/basemap-testing/geos-2.2.3/swig/ruby/test/test_simple.rb
trunk/toolkits/basemap-testing/geos-2.2.3/tools/
trunk/toolkits/basemap-testing/geos-2.2.3/tools/Makefile.am
trunk/toolkits/basemap-testing/geos-2.2.3/tools/Makefile.in
trunk/toolkits/basemap-testing/geos-2.2.3/tools/geos-config.in
Modified: trunk/toolkits/basemap-testing/README
===================================================================
--- trunk/toolkits/basemap-testing/README 2007-11-14 19:43:31 UTC (rev 4290)
+++ trunk/toolkits/basemap-testing/README 2007-11-14 19:45:49 UTC (rev 4291)
@@ -9,13 +9,18 @@
numpy 1.0 (or higher)
-libgoes_c version 2.2.3, available from http://geos.refractions.net/.
+The GEOS (Geometry Engine - Open Source) library (version 2.2.3).
+Source code is included in the geos-2.2.3 directory.
**Copyright**
source code from proj.4 (http://proj.maptools.org) is included in the
-'src' directory (under the terms given in LICENSE_proj4).
+'src' directory under the terms given in LICENSE_proj4.
+source code for the GEOS library is
+included in the 'geos-2.2.3' directory under the terms given in
+geos-2.2.3/COPYING.
+
pyshapelib by Bernhard Herzog is included in the 'pyshapelib' directory
under the terms given in LICENSE_pyshapelib.
@@ -57,15 +62,27 @@
**Install**
-First, install pre-requisites (see **Requirements** above).
+0) Install pre-requisite python modules numpy and matplotlib.
-Then download basemap-X.Y.Z.tar.gz from
+1) Then download basemap-X.Y.Z.tar.gz from
the sourceforge download site, unpack and cd to basemap-X.Y.Z.
-Set the environment variable GEOS_DIR to point to the location
+
+2) Install the GEOS library. If you already have it on your
+system, just set the environment variable GEOS_DIR to point to the location
of libgeos_c and geos_c.h (if libgeos_c is in /usr/local/lib and
geos_c.h is in /usr/local/include, set GEOS_DIR to /usr/local).
-Then run 'python setup.py install'.
+Then go to step (3). If you don't have it, you can build it from
+the source code included with basemap by following these steps:
+ > cd geos-2.2.3
+ > 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.
+ > make; make install
+
+3) cd back to the top level basemap directory (basemap-X.Y.Z) and
+run the usual 'python setup.py install'.
+
**Contact**
Jeff Whitaker <jef...@no...>
Added: trunk/toolkits/basemap-testing/geos-2.2.3/AUTHORS
===================================================================
--- trunk/toolkits/basemap-testing/geos-2.2.3/AUTHORS (rev 0)
+++ trunk/toolkits/basemap-testing/geos-2.2.3/AUTHORS 2007-11-14 19:45:49 UTC (rev 4291)
@@ -0,0 +1,23 @@
+2003-11-06
+
+Development of GEOS was funded by:
+
+ Vivid Solutions Inc (www.vividsolutions.com)
+ Refractions Research Inc (www.refractions.net)
+ British Columbia Advanced Systems Institute (www.asi.bc.ca)
+
+GEOS is based on algorithms originally developed in Java
+by Martin Davis (mb...@vi...) in the
+JTS Topology Suite (www.vividsolutions.com/jts/jtshome.htm)
+
+Developers:
+
+ Yury Bychkov (me...@yu...) - Initial Porting
+ Sandro Santilli (st...@ke...) - Bug Fixing / Maintenance
+ Martin Davis (mb...@vi...) - Architecture
+ Dave Blasby (db...@re...) - PostGIS Connectivity
+ Norman Vine (nv...@ca...) - Porting / C++ Expertise
+ Fernando Villa (fv...@zo...) - GNU Build System
+ Paul Ramsey (pr...@re...) - Coordination / Build
+ Sean Gillies (sgi...@fr...) - Scripting Interface
+
Added: trunk/toolkits/basemap-testing/geos-2.2.3/COPYING
===================================================================
--- trunk/toolkits/basemap-testing/geos-2.2.3/COPYING (rev 0)
+++ trunk/toolkits/basemap-testing/geos-2.2.3/COPYING 2007-11-14 19:45:49 UTC (rev 4291)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Added: trunk/toolkits/basemap-testing/geos-2.2.3/ChangeLog
===================================================================
--- trunk/toolkits/basemap-testing/geos-2.2.3/ChangeLog (rev 0)
+++ trunk/toolkits/basemap-testing/geos-2.2.3/ChangeLog 2007-11-14 19:45:49 UTC (rev 4291)
@@ -0,0 +1,259 @@
+2006-05-17 10:07 strk
+
+ * NEWS: Added note about win32 SDK support
+
+2006-05-16 16:38 strk
+
+ * source/headers/geos/opValid.h: Gave error enum a name and renamed
+ ERROR to eError (to avoid clash with win32 headers)
+
+2006-05-02 16:44 hobu
+
+ * source/capi/geos_c.h.vc: use 1.1.0 as CAPI version
+
+2006-05-02 16:04 strk
+
+ * source/io/WKBReader.cpp: Use tabs for indenting
+
+2006-05-01 17:22 sgillies
+
+ * source/io/WKBReader.cpp: Fix for WKB parsing...
[truncated message content] |
|
From: <md...@us...> - 2007-11-14 19:43:34
|
Revision: 4290
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4290&view=rev
Author: mdboom
Date: 2007-11-14 11:43:31 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Fix flush callback in PNG file-like object writing.
Modified Paths:
--------------
trunk/matplotlib/src/_backend_agg.cpp
Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp 2007-11-14 19:25:46 UTC (rev 4289)
+++ trunk/matplotlib/src/_backend_agg.cpp 2007-11-14 19:43:31 UTC (rev 4290)
@@ -2266,7 +2266,7 @@
static void flush_png_data(png_structp png_ptr) {
PyObject* py_file_obj = (PyObject*)png_get_io_ptr(png_ptr);
- PyObject* flush_method = PyObject_GetAttrString(py_file_obj, "write");
+ PyObject* flush_method = PyObject_GetAttrString(py_file_obj, "flush");
if (flush_method) {
PyObject_CallFunction(flush_method, "");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-14 19:25:47
|
Revision: 4289
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4289&view=rev
Author: mdboom
Date: 2007-11-14 11:25:46 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Refactored a bunch of places to use "is_writable_file_like".
Modified Paths:
--------------
trunk/matplotlib/API_CHANGES
trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
trunk/matplotlib/lib/matplotlib/backends/backend_svg.py
trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
trunk/matplotlib/lib/matplotlib/cbook.py
Modified: trunk/matplotlib/API_CHANGES
===================================================================
--- trunk/matplotlib/API_CHANGES 2007-11-14 19:11:54 UTC (rev 4288)
+++ trunk/matplotlib/API_CHANGES 2007-11-14 19:25:46 UTC (rev 4289)
@@ -1,4 +1,5 @@
- removed cbook.is_file_like, which appears to be broken and unused.
+ Changed cbook.is_file_like to cbook.is_writable_file_like and
+ corrected behavior.
Added ax kwarg to pyplot.colorbar and Figure.colorbar so that
one can specify the axes object from which space for the colorbar
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2007-11-14 19:11:54 UTC (rev 4288)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py 2007-11-14 19:25:46 UTC (rev 4289)
@@ -19,7 +19,7 @@
from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK
-from matplotlib.cbook import is_string_like, enumerate
+from matplotlib.cbook import is_string_like, is_writable_file_like, enumerate
from matplotlib.colors import colorConverter
from matplotlib.figure import Figure
from matplotlib.widgets import SubplotTool
@@ -370,7 +370,7 @@
pixbuf.save(filename, format)
except gobject.GError, exc:
error_msg_gtk('Save figure failure:\n%s' % (exc,), parent=self)
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
if hasattr(pixbuf, 'save_to_callback'):
def save_callback(buf, data=None):
data.write(buf)
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py 2007-11-14 19:11:54 UTC (rev 4288)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py 2007-11-14 19:25:46 UTC (rev 4289)
@@ -24,7 +24,8 @@
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import Bunch, enumerate, is_string_like, reverse_dict, get_realpath_and_stat
+from matplotlib.cbook import Bunch, enumerate, is_string_like, reverse_dict, \
+ get_realpath_and_stat, is_writable_file_like
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont, is_opentype_cff_font
from matplotlib.afm import AFM
@@ -328,7 +329,7 @@
self.passed_in_file_object = False
if is_string_like(filename):
fh = file(filename, 'wb')
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
fh = filename
self.passed_in_file_object = True
else:
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2007-11-14 19:11:54 UTC (rev 4288)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_ps.py 2007-11-14 19:25:46 UTC (rev 4289)
@@ -15,7 +15,8 @@
from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import is_string_like, izip, get_realpath_and_stat
+from matplotlib.cbook import is_string_like, izip, get_realpath_and_stat, \
+ is_writable_file_like
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont, is_opentype_cff_font
@@ -1051,7 +1052,7 @@
if is_string_like(outfile):
title = outfile
tmpfile = os.path.join(gettempdir(), md5.md5(outfile).hexdigest())
- elif hasattr(outfile, 'write') and callable(outfile.write):
+ elif is_writable_file_like(outfile):
title = None
tmpfile = os.path.join(gettempdir(), md5.md5(str(hash(outfile))).hexdigest())
passed_in_file_object = True
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_svg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_svg.py 2007-11-14 19:11:54 UTC (rev 4288)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_svg.py 2007-11-14 19:25:46 UTC (rev 4289)
@@ -5,7 +5,7 @@
from matplotlib import verbose, __version__, rcParams
from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import is_string_like
+from matplotlib.cbook import is_string_like, is_writable_file_like
from matplotlib.colors import rgb2hex
from matplotlib.figure import Figure
from matplotlib.font_manager import findfont, FontProperties
@@ -461,7 +461,7 @@
def print_svg(self, filename, *args, **kwargs):
if is_string_like(filename):
fh_to_close = svgwriter = codecs.open(filename, 'w', 'utf-8')
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
svgwriter = codecs.EncodedFile(filename, 'utf-8')
fh_to_close = None
else:
@@ -472,7 +472,7 @@
if is_string_like(filename):
gzipwriter = gzip.GzipFile(filename, 'w')
fh_to_close = svgwriter = codecs.EncodedFile(gzipwriter, 'utf-8')
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
fh_to_close = gzipwriter = gzip.GzipFile(fileobj=filename, mode='w')
svgwriter = codecs.EncodedFile(gzipwriter, 'utf-8')
else:
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2007-11-14 19:11:54 UTC (rev 4288)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2007-11-14 19:25:46 UTC (rev 4289)
@@ -152,7 +152,7 @@
cursors
from matplotlib._pylab_helpers import Gcf
from matplotlib.artist import Artist
-from matplotlib.cbook import exception_to_str, is_string_like
+from matplotlib.cbook import exception_to_str, is_string_like, is_writable_file_like
from matplotlib.figure import Figure
from matplotlib.text import _process_text_args, Text
from matplotlib.widgets import SubplotTool
@@ -1042,7 +1042,7 @@
# the error on a call or print_figure may not work because
# printing can be qued and called from realize
raise RuntimeError('Could not save figure to %s\n' % (filename))
- elif hasattr(filename, 'write') and callable(filename.write):
+ elif is_writable_file_like(filename):
if not self.bitmap.ConvertToImage().SaveStream(filename, filetype):
DEBUG_MSG('print_figure() file save error', 4, self)
raise RuntimeError('Could not save figure to %s\n' % (filename))
Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py 2007-11-14 19:11:54 UTC (rev 4288)
+++ trunk/matplotlib/lib/matplotlib/cbook.py 2007-11-14 19:25:46 UTC (rev 4289)
@@ -213,6 +213,9 @@
except (TypeError, ValueError): return 0
return 1
+def is_writable_file_like(obj):
+ return hasattr(filename, 'write') and callable(filename.write)
+
def is_scalar(obj):
return is_string_like(obj) or not iterable(obj)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2007-11-14 19:11:57
|
Revision: 4288
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4288&view=rev
Author: jdh2358
Date: 2007-11-14 11:11:54 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
fixed is_string_like and removed is_file_like
Modified Paths:
--------------
trunk/matplotlib/API_CHANGES
trunk/matplotlib/lib/matplotlib/__init__.py
trunk/matplotlib/lib/matplotlib/cbook.py
Modified: trunk/matplotlib/API_CHANGES
===================================================================
--- trunk/matplotlib/API_CHANGES 2007-11-14 19:06:52 UTC (rev 4287)
+++ trunk/matplotlib/API_CHANGES 2007-11-14 19:11:54 UTC (rev 4288)
@@ -1,4 +1,5 @@
-
+ removed cbook.is_file_like, which appears to be broken and unused.
+
Added ax kwarg to pyplot.colorbar and Figure.colorbar so that
one can specify the axes object from which space for the colorbar
is to be taken, if one does not want to make the colorbar axes
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py 2007-11-14 19:06:52 UTC (rev 4287)
+++ trunk/matplotlib/lib/matplotlib/__init__.py 2007-11-14 19:11:54 UTC (rev 4288)
@@ -118,6 +118,7 @@
def is_string_like(obj):
+ if hasattr(obj, 'shape'): return 0
try: obj + ''
except (TypeError, ValueError): return 0
return 1
Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py 2007-11-14 19:06:52 UTC (rev 4287)
+++ trunk/matplotlib/lib/matplotlib/cbook.py 2007-11-14 19:11:54 UTC (rev 4288)
@@ -208,16 +208,11 @@
def is_string_like(obj):
+ if hasattr(obj, 'shape'): return 0
try: obj + ''
except (TypeError, ValueError): return 0
return 1
-
-def is_file_like(obj):
- try: obj + ''
- except (TypeError, ValueError): return 0
- return 1
-
def is_scalar(obj):
return is_string_like(obj) or not iterable(obj)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-14 19:07:01
|
Revision: 4287
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4287&view=rev
Author: mdboom
Date: 2007-11-14 11:06:52 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
Fix placement of rotated text in Wx backend (thanks Michael Day).
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2007-11-14 18:44:39 UTC (rev 4286)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2007-11-14 19:06:52 UTC (rev 4287)
@@ -381,7 +381,12 @@
y = int(y-h)
if angle!=0:
- try: gc.DrawRotatedText(s, x, y, angle)
+ # Correct for the fact that text if rotated around the upper-left corner,
+ # rather than the lower-left corner as we expect.
+ rads = angle / 180.0 * math.pi
+ xo = h * math.sin(rads)
+ yo = h * math.cos(rads)
+ try: gc.DrawRotatedText(s, x - xo, y - yo, angle)
except:
verbose.print_error(exception_to_str('WX rotated text failed'))
else:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
