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: <js...@us...> - 2007-11-10 18:24:30
|
Revision: 4211
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4211&view=rev
Author: jswhit
Date: 2007-11-10 10:24:23 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
fix boundary file glob
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-10 18:19:02 UTC (rev 4210)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-10 18:24:23 UTC (rev 4211)
@@ -71,11 +71,9 @@
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
-boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_c.dat')
-boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_l.dat')
-boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_i.dat')
-boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_h.dat')
-boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
+boundaryfiles = []
+for resolution in ['c','l','i','h']:
+ boundaryfiles = boundaryfiles + glob.glob("lib/matplotlib/toolkits/basemap/data/*_"+resolution+".dat")
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
setup(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 18:19:10
|
Revision: 4210
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4210&view=rev
Author: jswhit
Date: 2007-11-10 10:19:02 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
fix boundaryfiles
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-10 17:52:19 UTC (rev 4209)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-10 18:19:02 UTC (rev 4210)
@@ -71,7 +71,10 @@
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
-boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_{c,l,i,h}.dat')
+boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_c.dat')
+boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_l.dat')
+boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_i.dat')
+boundaryfiles = boundaryfiles + glob.glob('lib/matplotlib/toolkits/basemap/data/*_h.dat')
boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 17:52:20
|
Revision: 4209
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4209&view=rev
Author: jswhit
Date: 2007-11-10 09:52:19 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
update install instructions
Modified Paths:
--------------
trunk/toolkits/basemap-testing/README
Modified: trunk/toolkits/basemap-testing/README
===================================================================
--- trunk/toolkits/basemap-testing/README 2007-11-10 17:25:15 UTC (rev 4208)
+++ trunk/toolkits/basemap-testing/README 2007-11-10 17:52:19 UTC (rev 4209)
@@ -67,18 +67,6 @@
the sourceforge download site, unpack,
cd to basemap-X.Y.Z and run 'python setup.py install'.
-The crude ('c'), low ('l') and intermediate ('i') resolution
-boundary data files, plus the 5-minute land/sea mask, are installed
-by default. If you need the high ('h') resolution boundary dataset
-you can download the files from the sourceforge download site
-(basemap-data-hires-X.Y.Z.tar.gz). To install them,
-untar the file in the top-level directory of the basemap source
-distribution (where this README file lives), then run
-'python setup.py install' again.
-
-Note: if you install from a subversion checkout, you will get the high
-resolution coastlines by default.
-
**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-10 17:25:19
|
Revision: 4208
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4208&view=rev
Author: jswhit
Date: 2007-11-10 09:25:15 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
updated data files from latest gshhs and GMT.
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/gshhsmeta_c.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhsmeta_h.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhsmeta_i.dat
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/gshhsmeta_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-10 17:18:22 UTC (rev 4207)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_c.dat 2007-11-10 17:25:15 UTC (rev 4208)
@@ -1,565 +1,563 @@
--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.63030 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.63030 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.94430 1112 16
--1 -1 2 55.07210 55.24880 1128 16
--1 -1 2 54.36500 55.07180 1144 16
--1 -1 2 58.00980 59.15970 1160 16
--1 -1 2 51.94430 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.00210 54.46020 1224 16
--1 -1 2 55.67510 55.82650 1240 16
--1 -1 2 55.67510 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.00210 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.25530 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.52830 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.52860 51.50670 1576 16
--1 -1 2 51.46430 51.50670 1592 16
--1 -1 2 51.08490 51.15600 1608 16
--1 -1 2 51.08460 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.47550 1832 32
--1 -1 2 54.39090 54.64300 1864 16
--1 -1 2 54.39090 54.64300 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.35230 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.93220 47.80700 2864 48
--1 -1 2 39.80700 39.84480 2912 16
--1 -1 3 41.85050 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.01240 48.14360 3296 16
--1 -1 2 42.46110 42.46230 3312 16
--1 -1 2 42.48650 42.66290 3328 16
--1 -1 2 41.34140 41.41070 3344 16
--1 -1 2 43.72950 43.75750 3360 16
--1 -1 2 47.69310 47.69310 3376 16
--1 -1 10 42.54600 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.21200 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.92660 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.90330 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.90420 4144 16
--1 -1 3 41.71250 42.08820 4160 24
--1 -1 2 33.37530 33.94480 4184 16
--1 -1 2 31.93850 32.23610 4200 16
--1 -1 3 47.83140 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.76650 4456 16
--1 -1 2 37.25170 37.50470 4472 16
--1 -1 2 38.11230 38.32440 4488 16
--1 -1 2 39.38740 39.39860 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.25440 40.40360 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 14 30.00000 39.64860 4704 112
--1 -1 2 36.83360 37.32160 4816 16
--1 -1 7 36.95200 38.28200 4832 56
--1 -1 8 41.26270 42.79770 4888 64
--1 -1 5 39.63270 41.58310 4952 40
--1 -1 6 38.44530 39.71970 4992 48
--1 -1 3 49.94200 50.00000 5040 24
--1 -1 5 38.87800 41.29870 5064 40
--1 -1 5 36.97060 37.38480 5104 40
--1 -1 4 41.89680 42.89910 5144 32
--1 -1 4 41.89680 42.89910 5176 32
--1 -1 4 41.89680 42.89910 5208 32
--1 -1 6 46.34550 48.24860 5240 48
--1 -1 4 41.28680 42.33720 5288 32
--1 -1 2 49.60510 49.62310 5320 16
--1 -1 3 42.89910 43.54570 5336 24
--1 -1 3 42.89910 43.54570 5360 24
--1 -1 3 41.05000 41.89590 5384 24
--1 -1 3 41.19620 41.89720 5408 24
--1 -1 4 33.94480 37.06190 5432 32
--1 -1 3 30.00000 31.93850 5464 24
--1 -1 3 38.84200 39.70570 5488 24
--1 -1 3 48.24860 50.00000 5512 24
--1 -1 2 49.06550 49.18390 5536 16
--1 -1 3 30.00000 30.01530 5552 24
--1 -1 2 41.11070 41.29780 5576 16
--1 -1 2 41.11070 41.29780 5592 16
--1 -1 2 41.32620 45.00300 5608 16
--1 -1 3 45.00240 45.57120 5624 24
--1 -1 2 37.05970 37.31980 5648 16
--1 -1 2 49.18390 49.60050 5664 16
--1 -1 2 40.66480 40.66510 5680 16
--1 -1 2 30.00000 30.00790 5696 16
--1 -1 2 41.00420 41.00570 5712 16
--1 -1 17 33.40760 41.93130 5728 136
--1 -1 3 44.86230 44.92970 5864 24
--1 -1 23 30.00000 38.47210 5888 184
--1 -1 12 30.00000 37.02560 6072 96
--1 -1 7 30.86490 33.40520 6168 56
--1 -1 3 30.00000 31.59640 6224 24
--1 -1 4 35.60520 36.95200 6248 32
--1 -1 4 41.23430 42.22400 6280 32
--1 -1 7 32.30320 35.50030 6312 56
--1 -1 3 37.36550 40.03100 6368 24
--1 -1 3 37.36550 40.03100 6392 24
--1 -1 6 41.00420 42.25270 6416 48
--1 -1 4 40.14570 41.00600 6464 32
--1 -1 6 42.25330 43.26860 6496 48
--1 -1 3 42.33050 42.80630 6544 24
--1 -1 4 39.50760 40.24490 6568 32
--1 -1 5 40.60750 42.25270 6600 40
--1 -1 4 39.19200 39.62020 6640 32
--1 -1 4 37.18580 39.29430 6672 32
--1 -1 5 40.22450 41.05030 6704 40
--1 -1 4 39.29370 40.14910 6744 32
--1 -1 3 40.03070 41.23550 6776 24
--1 -1 5 42.42420 43.73770 6800 40
--1 -1 5 42.42420 43.73770 6840 40
--1 -1 2 31.59910 32.30410 6880 16
--1 -1 2 42.80630 43.26860 6896 16
--1 -1 3 39.89330 40.16310 6912 24
--1 -1 2 43.48620 44.60530 6936 16
--1 -1 4 41.14370 42.42390 6952 32
--1 -1 2 41.14340 41.19430 6984 16
--1 -1 2 39.88750 39.88820 7000 16
--1 -1 2 40.42980 40.72470 7016 16
--1 -1 2 40.18480 40.22450 7032 16
--1 -1 2 41.05150 41.19430 7048 16
--1 -1 2 40.99930 41.00110 7064 16
--1 -1 2 40.14180 40.14910 7080 16
--1 -1 6 41.93130 44.86230 7096 48
--1 -1 19 42.68790 49.17300 7144 152
--1 -1 2 49.17050 50.00000 7296 16
--1 -1 3 49.73450 50.00000 7312 24
--1 -1 3 30.00000 30.86490 7336 24
--1 -1 5 49.09210 50.00000 7360 40
--1 -1 2 42.19650 42.33050 7400 16
--1 -1 3 30.00000 30.34210 7416 24
--1 -1 19 41.58130 50.00000 7440 152
--1 -1 5 49.14210 50.00000 7592 40
--1 -1 2 49.94350 50.00000 7632 16
--1 -1 2 49.99050 50.00000 7648 16
--1 -1 3 49.50770 49.98930 7664 24
--1 -1 8 40.09290 43.00560 7688 64
--1 -1 8 42.29540 48.26750 7752 64
--1 -1 6 47.68550 50.00000 7816 48
--1 -1 2 38.22490 38.30640 7864 16
--1 -1 2 38.30640 38.62100 7880 16
--1 -1 2 39.82930 40.09600 7896 16
--1 -1 2 38.00060 38.22490 7912 16
--1 -1 2 37.69540 37.83280 7928 16
--1 -1 2 37.83220 38.00060 7944 16
--1 -1 2 37.75860 38.02500 7960 16
--1 -1 2 37.75860 37.99660 7976 16
--1 -1 2 37.65700 37.66430 7992 16
--1 -1 2 37.99660 38.02500 8008 16
--1 -1 4 48.27820 48.99960 8024 32
--1 -1 9 30.00000 32.71820 8056 72
--1 -1 3 48.99960 48.99960 8128 24
--1 -1 5 48.09600 49.37650 8152 40
--1 -1 4 41.67560 42.54990 8192 32
--1 -1 8 43.01630 48.31240 8224 64
--1 -1 2 42.55420 43.01320 8288 16
--1 -1 8 42.48280 46.12240 8304 64
--1 -1 5 45.59320 47.36450 8368 40
--1 -1 3 46.11960 47.47130 8408 24
--1 -1 2 45.18390 45.59470 8432 16
--1 -1 7 30.00000 35.08580 8448 56
--1 -1 8 37.18820 41.99850 8504 64
--1 -1 2 42.70980 43.39710 8568 16
--1 -1 2 35.27350 35.32910 8584 16
--1 -1 2 35.84180 35.91590 8600 16
--1 -1 2 36.15150 36.15150 8616 16
--1 -1 13 10.00000 13.89040 8632 104
--1 -1 11 21.49830 30.00000 8736 88
--1 -1 7 15.35710 21.81540 8824 56
--1 -1 2 10.00000 10.27340 8880 16
--1 -1 4 10.00000 12.39350 8896 32
--1 -1 6 13.71710 23.00100 8928 48
--1 -1 4 10.00000 12.82960 8976 32
--1 -1 3 10.00000 10.99580 9008 24
--1 -1 7 11.89520 15.00190 9032 56
--1 -1 4 11.02480 11.67850 9088 32
--1 -1 2 20.84640 23.52160 9120 16
--1 -1 3 11.67910 12.39600 9136 24
--1 -1 2 14.99180 15.35930 9160 16
--1 -1 3 11.69380 13.89200 9176 24
--1 -1 3 19.14660 20.85220 9200 24
--1 -1 2 10.27340 10.60490 9224 16
--1 -1 2 12.82780 13.08170 9240 16
--1 -1 2 10.96410 11.09680 9256 16
--1 -1 2 10.00000 10.92160 9272 16
--1 -1 10 10.00000 17.99270 9288 80
--1 -1 4 29.18880 30.00000 9368 32
--1 -1 6 19.50030 30.00000 9400 48
--1 -1 8 10.00000 19.49970 9448 64
--1 -1 2 29.48550 30.00000 9512 16
--1 -1 5 21.99850 22.23220 9528 40
--1 -1 2 29.55110 30.00000 9568 16
--1 -1 3 21.76810 23.12610 9584 24
--1 -1 2 29.54620 29.57610 9608 16
--1 -1 3 10.00000 11.47710 9624 24
--1 -1 2 29.85320 30.00000 9648 16
--1 -1 8 12.69110 15.10570 9664 64
--1 -1 5 22.69980 24.97950 9728 40
--1 -1 4 28.54520 29.47450 9768 32
--1 -1 4 16.37740 17.45710 9800 32
--1 -1 3 29.45950 30.00000 9832 24
--1 -1 5 10.98210 12.70880 9856 40
--1 -1 3 25.77510 26.72600 9896 24
--1 -1 2 29.10430 30.00000 9920 16
--1 -1 2 27.17740 28.69840 9936 16
--1 -1 2 27.17740 28.69840 9952 16
--1 -1 3 28.77470 29.20530 9968 24
--1 -1 3 16.63100 18.99890 9992 24
--1 -1 9 15.61680 25.47910 10016 72
--1 -1 9 15.61680 25.47910 10088 72
--1 -1 2 25.63620 26.06560 10160 16
--1 -1 2 25.63620 26.06560 10176 16
--1 -1 2 25.63780 25.79000 10192 16
--1 -1 2 29.90110 30.00000 10208 16
--1 -1 2 24.55590 24.62030 10224 16
--1 -1 9 25.19310 30.00000 10240 72
--1 -1 4 29.38840 30.00000 10312 32
--1 -1 11 24.26900 30.00000 10344 88
--1 -1 3 23.64830 24.32120 10432 24
--1 -1 19 21.14090 26.63200 10456 152
--1 -1 12 10.34490 20.38830 10608 96
--1 -1 7 26.53280 30.00000 10704 56
--1 -1 17 21.98230 29.46750 10760 136
--1 -1 14 22.04850 28.54920 10896 112
--1 -1 9 26.37260 28.32490 11008 72
--1 -1 4 27.76490 29.32710 11080 32
--1 -1 4 27.86430 30.00000 11112 32
--1 -1 2 21.96980 22.05040 11144 16
--1 -1 2 10.00000 10.35190 11160 16
--1 -1 14 21.14270 23.37790 11176 112
--1 -1 2 20.34620 20.35230 11288 16
--1 -1 10 13.92070 18.42110 11304 80
--1 -1 12 19.61200 22.39770 11384 96
--1 -1 4 11.63550 14.35070 11480 32
--1 -1 4 16.62730 19.69250 11512 32
--1 -1 5 17.52760 20.15520 11544 40
--1 -1 5 10.42240 11.66990 11584 40
--1 -1 5 14.70530 16.62850 11624 40
--1 -1 4 20.15760 21.68290 11664 32
--1 -1 3 11.86950 13.79610 11696 24
--1 -1 4 17.53030 18.21420 11720 32
--1 -1 3 14.32410 14.70680 11752 24
--1 -1 4 10.03200 10.42390 11776 32
--1 -1 5 22.14370 22.60940 11808 40
--1 -1 2 13.92980 14.70800 11848 16
--1 -1 2 21.43270 21.96980 11864 16
--1 -1 2 21.43480 21.68540 11880 16
--1 -1 2 22.20330 22.20390 11896 16
--1 -1 2 21.44910 21.66740 11912 16
--1 -1 2 11.66480 11.87080 11928 16
--1 -1 2 13.79580 13.93350 11944 16
--1 -1 6 28.14420 30.00000 11960 48
--1 -1 10 14.54840 17.81990 12008 80
--1 -1 4 25.96640 28.14420 12088 32
--1 -1 8 12.99990 14.99310 12120 64
--1 -1 3 10.70830 11.06290 12184 24
--1 -1 3 13.81870 14.43150 12208 24
--1 -1 2 14.27440 15.07360 12232 16
--1 -1 3 17.81900 18.48770 12248 24
--1 -1 2 13.74610 14.22740 12272 16
--1 -1 2 15.07360 15.72460 12288 16
--1 -1 2 13.40520 13.81810 12304 16
--1 -1 2 12.98680 12.99990 12320 16
--1 -1 3 10.00000 11.85310 12336 24
--1 -1 2 18.04210 19.70600 12360 16
--1 -1 9 20.76490 30.00000 12376 72
--1 -1 7 10.00000 13.50410 12448 56
--1 -1 4 14.72480 16.63860 12504 32
--1 -1 5 12.32330 13.70790 12536 40
--1 -1 6 10.00000 12.00810 12576 48
--1 -1 6 13.06100 13.82640 12624 48
--1 -1 7 14.72600 15.70470 12672 56
--1 -1 6 15.49840 27.29030 12728 48
--1 -1 2 10.00000 11.00400 12776 16
--1 -1 4 10.95800 12.15520 12792 32
--1 -1 4 10.15110 10.66470 12824 32
--1 -1 6 13.27640 15.09010 12856 48
--1 -1 3 11.89580 12.25190 12904 24
--1 -1 4 11.89390 12.40790 12928 32
--1 -1 2 11.00130 11.10930 12960 16
--1 -1 2 21.82510 25.00020 12976 16
--1 -1 2 13.70890 14.76420 12992 16
--1 -1 3 10.25700 10.72140 13008 24
--1 -1 2 12.00810 12.50340 13032 16
--1 -1 2 10.25820 10.43370 13048 16
--1 -1 2 27.66660 27.66690 13064 16
--1 -1 2 12.15400 12.29340 13080 16
--1 -1 2 12.25010 12.50430 13096 16
--1 -1 2 12.29400 12.67580 13112 16
--1 -1 2 10.60820 10.91800 13128 16
--1 -1 2 11.09860 11.13920 13144 16
--1 -1 2 10.92840 10.96070 13160 16
--1 -1 7 -8.09812 -5.85657 13176 56
--1 -1 7 4.68162 10.00000 13232 56
--1 -1 18 -3.92325 2.26642 13288 144
--1 -1 5 7.98520 9.08598 13432 40
--1 -1 4 3.47890 5.13542 13472 32
--1 -1 9 -5.01427 2.42390 13504 72
--1 -1 7 1.72198 7.52956 13576 56
--1 -1 4 6.58839 10.00000 13632 32
--1 -1 7 7.52682 9.98993 13664 56
--1 -1 4 7.89364 10.00000 13720 32
--1 -1 4 2.22156 3.64187 13752 32
--1 -1 2 9.99237 10.00000 13784 16
--1 -1 4 0.97551 2.34485 13800 32
--1 -1 4 6.28077 10.00000 13832 32
--1 -1 4 -5.77966 -4.63371 13864 32
--1 -1 2 6.36469 7.89548 13896 16
--1 -1 2 7.54574 7.98672 13912 16
--1 -1 2 -6.05249 -5.85626 13928 16
--1 -1 2 2.42725 3.07424 13944 16
--1 -1 2 6.10040 6.59236 13960 16
--1 -1 2 6.21820 6.28016 13976 16
--1 -1 3 -10.00000 -8.48142 13992 24
--1 -1 4 -10.00000 -7.05531 14016 32
--1 -1 23 -4.67094 10.00000 14048 184
--1 -1 13 3.40658 10.00000 14232 104
--1 -1 4 -10.00000 -9.39605 14336 32
--1 -1 3 9.08598 10.00000 14368 24
--1 -1 9 4.12680 5.38140 14392 72
--1 -1 10 -4.46098 -2.30945 14464 80
--1 -1 4 -8.47929 -4.44938 14544 32
--1 -1 6 3.49111 4.61936 14576 48
--1 -1 4 1.11254 4.22263 14624 32
--1 -1 2 -9.40612 -8.19303 14656 16
--1 -1 3 -2.39796 -1.06126 14672 24
--1 -1 3 4.60105 5.02373 14696 24
--1 -1 2 -2.73854 -1.69268 14720 16
--1 -1 2 0.23484 1.11376 14736 16
--1 -1 2 -1.00114 0.23667 14752 16
--1 -1 2 -1.69268 -1.38445 14768 16
--1 -1 9 3.72335 10.00000 14784 72
--1 -1 3 -1.67224 2.82094 14856 24
--1 -1 2 2.83284 3.99008 14880 16
--1 -1 2 6.41993 6.42145 14896 16
--1 -1 2 9.52819 10.00000 14912 16
--1 -1 9 0.85374 4.36118 14928 72
--1 -1 7 5.63104 6.71107 15000 56
--1 -1 3 4.01877 4.89586 15056 24
--1 -1 3 4.31418 4.90257 15080 24
--1 -1 2 1.27825 1.31121 15104 16
--1 -1 2 -9.10155 -2.60548 15120 16
--1 -1 2 -4.37064 -4.28275 15136 16
--1 -1 3 8.02914 9.56847 15152 24
--1 -1 4 -4.42802 -3.36934 15176 32
--1 -1 13 -4.22416 1.43786 15208 104
--1 -1 4 -10.00000 -9.69207 15312 32
--1 -1 9 -10.00000 -4.14603 15344 72
--1 -1 4 -10.00000 -9.42992 15416 32
--1 -1 3 4.38285 5.23217 15448 24
--1 -1 9 6.11872 10.00000 15472 72
--1 -1 8 -4.99565 -0.10788 15544 64
--1 -1 8 0.64958 4.22202 15608 64
--1 -1 6 3.56039 5.20592 15672 48
--1 -1 5 7.22896 8.67491 15720 40
--1 -1 7 5.20348 7.84665 15760 56
--1 -1 4 2.79225 6.19318 15816 32
--1 -1 6 1.22484 2.14374 15848 48
--1 -1 3 1.22210 2.79011 15896 24
--1 -1 4 0.61875 1.71374 15920 32
--1 -1 2 7.84543 8.11643 15952 16
--1 -1 11 1.18547 5.48547 15968 88
--1 -1 8 1.89319 4.03494 16056 64
--1 -1 4 2.32959 5.76501 16120 32
--1 -1 3 8.11643 8.53513 16152 24
--1 -1 4 9.48180 10.00000 16176 32
--1 -1 4 8.37827 10.00000 16208 32
--1 -1 5 4.35355 7.56008 16240 40
--1 -1 5 8.27543 9.99756 16280 40
--1 -1 7 7.19387 8.44663 16320 56
--1 -1 3 7.41817 8.56840 16376 24
--1 -1 2 8.78080 10.00000 16400 16
--1 -1 2 6.92653 8.48814 16416 16
--1 -1 4 5.59014 8.77989 16432 32
--1 -1 2 5.10033 5.58862 16464 16
--1 -1 2 5.08598 5.11406 16480 16
--1 -1 6 -17.90330 -16.96880 16496 48
--1 -1 3 -23.97570 -22.00120 16544 24
--1 -1 6 -28.96090 -28.02850 16568 48
--1 -1 2 -28.42560 -26.45530 16616 16
--1 -1 3 -23.23960 -22.68510 16632 24
--1 -1 17 -13.45400 -10.00000 16656 136
--1 -1 20 -17.13540 -10.00000 16792 160
--1 -1 2 -11.56500 -10.00000 16952 16
--1 -1 8 -17.95940 -14.01250 16968 64
--1 -1 2 -18.01430 -17.90330 17032 16
--1 -1 5 -26.89570 -25.29960 17048 40
--1 -1 5 -17.62550 -10.87130 17088 40
--1 -1 4 -22.00120 -17.99880 17128 32
--1 -1 4 -26.89660 -23.97570 17160 32
--1 -1 4 -20.51010 -17.47840 17192 32
--1 -1 3 -24.63190 -22.19230 17224 24
--1 -1 4 -30.00000 -28.61330 17248 32
--1 -1 10 -27.31620 -22.41810 17280 80
--1 -1 5 -21.34510 -18.40470 17360 40
--1 -1 4 -17.34600 -15.63360 17400 32
--1 -1 3 -18.48520 -17.79770 17432 24
--1 -1 3 -22.06560 -20.50740 17456 24
--1 -1 3 -22.41600 -21.34720 17480 24
--1 -1 2 -11.41600 -10.68970 17504 16
--1 -1 3 -29.64170 -28.61420 17520 24
--1 -1 2 -26.45530 -24.76620 17544 16
--1 -1 2 -18.41140 -17.35760 17560 16
--1 -1 2 -18.01620 -17.47940 17576 16
--1 -1 2 -30.00000 -29.64290 17592 16
--1 -1 2 -25.62430 -24.73960 17608 16
--1 -1 2 -26.83960 -25.95760 17624 16
--1 -1 2 -24.74450 -24.63070 17640 16
--1 -1 2 -22.19200 -22.06320 17656 16
--1 -1 2 -10.68970 -10.47940 17672 16
--1 -1 13 -30.00000 -17.50530 17688 104
--1 -1 2 -10.69180 -10.00000 17792 16
--1 -1 10 -16.26440 -10.00000 17808 80
--1 -1 3 -10.00400 -10.00000 17888 24
--1 -1 4 -11.13470 -10.00000 17912 32
--1 -1 7 -18.34790 -10.95120 17944 56
--1 -1 8 -24.16620 -21.78760 18000 64
--1 -1 3 -22.23930 -19.29880 18064 24
--1 -1 5 -20.16860 -16.26440 18088 40
--1 -1 3 -30.00000 -27.17160 18128 24
--1 -1 6 -27.43400 -22.08550 18152 48
--1 -1 2 -24.34870 -24.16620 18200 16
--1 -1 3 -27.29490 -24.24860 18216 24
--1 -1 5 -22.08970 -19.29700 18240 40
--1 -1 3 -27.17160 -25.57370 18280 24
--1 -1 2 -27.43250 -27.29640 18304 16
--1 -1 2 -22.08910 -22.08240 18320 16
--1 -1 4 -30.65890 -30.00000 18336 32
--1 -1 2 -30.31770 -30.00000 18368 16
--1 -1 2 -30.40440 -30.31710 18384 16
--1 -1 21 -50.00000 -30.00000 18400 168
--1 -1 3 -32.45000 -30.00000 18568 24
--1 -1 8 -33.74580 -30.10990 18592 64
--1 -1 2 -34.17360 -32.45400 18656 16
--1 -1 5 -51.99770 -50.00000 18672 40
--1 -1 2 -54.88590 -52.64350 18712 16
--1 -1 2 -52.37800 -51.99560 18728 16
+-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
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-10 17:18:22 UTC (rev 4207)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/countriesmeta_h.dat 2007-11-10 17:25:15 UTC (rev 4208)
@@ -1,2009 +1,1991 @@
--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 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 3 66.00000 68.00000 4648 24
--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 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 4 64.00000 66.00000 6000 32
--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.74790 6248 24
--1 -1 10 63.74790 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 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 62.00000 64.00000 6744 24
-1 -1 45 60.00000 62.00000 6768 360
--1 -1 7 60.54750 60.65740 7128 56
--1 -1 11 60.25530 60.54560 7184 88
--1 -1 38 60.65740 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.35610 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.78010 59.80190 9288 288
--1 -1 12 58.00000 58.78010 9576 96
--1 -1 26 56.07810 56.39640 9672 208
--1 -1 26 56.07810 56.39640 9880 208
--1 -1 51 56.30580 56.42420 10088 408
--1 -1 51 56.30580 56.42420 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.69430 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.69430 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.41950 54.47670 14800 48
--1 -1 16 54.32580 54.41950 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.36500 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.84640 18784 168
--1 -1 21 55.67500 55.84640 18952 168
--1 -1 9 55.79190 56.00000 19120 72
--1 -1 9 55.79190 56.00000 19192 72
--1 -1 5 55.78890 55.82640 19264 40
--1 -1 5 55.78890 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.18780 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.26000 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.31930 56.00000 25480 184
--1 -1 4 55.26310 55.31930 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 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 98 52.00000 54.00000 28976 784
--1 -1 19 53.90470 53.95580 29760 152
--1 -1 19 53.90470 53.95580 29912 152
--1 -1 7 53.96860 54.00000 30064 56
--1 -1 21 53.88860 54.00000 30120 168
--1 -1 7 53.96860 54.00000 30288 56
--1 -1 21 53.88860 54.00000 30344 168
--1 -1 11 52.03670 52.11140 30512 88
--1 -1 63 52.10810 53.12110 30600 504
--1 -1 23 53.09560 53.21830 31104 184
--1 -1 9 53.77750 53.80530 31288 72
--1 -1 29 52.00000 52.12000 31360 232
--1 -1 14 53.80330 54.00000 31592 112
--1 -1 76 52.04390 52.37970 31704 608
--1 -1 43 53.08720 53.43890 32312 344
--1 -1 41 53.43860 53.82000 32656 328
--1 -1 14 52.00000 52.22160 32984 112
--1 -1 2 52.00000 52.00080 33096 16
--1 -1 60 52.00000 53.02970 33112 480
--1 -1 92 53.14090 54.00000 33592 736
--1 -1 7 53.95530 54.00000 34328 56
--1 -1 5 53.98810 54.00000 34384 40
--1 -1 4 53.94150 54.00000 34424 32
--1 -1 2 52.00000 52.00080 34456 16
--1 -1 8 52.94740 53.14090 34472 64
--1 -1 3 53.93970 54.00000 34536 24
--1 -1 16 53.87940 54.00000 34560 128
--1 -1 15 53.90890 54.00000 34688 120
--1 -1 11 53.94860 54.00000 34808 88
--1 -1...
[truncated message content] |
|
From: <js...@us...> - 2007-11-10 17:18:26
|
Revision: 4207
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4207&view=rev
Author: jswhit
Date: 2007-11-10 09:18:22 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/toolkits/basemap-testing/setup.py
Modified: trunk/toolkits/basemap-testing/setup.py
===================================================================
--- trunk/toolkits/basemap-testing/setup.py 2007-11-10 16:26:53 UTC (rev 4206)
+++ trunk/toolkits/basemap-testing/setup.py 2007-11-10 17:18:22 UTC (rev 4207)
@@ -71,9 +71,8 @@
# Specify all the required mpl data
pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world']
-boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*dat')
+boundaryfiles = glob.glob('lib/matplotlib/toolkits/basemap/data/*_{c,l,i,h}.dat')
boundaryfiles = [os.path.join('data',os.path.basename(bfile)) for bfile in boundaryfiles]
-boundaryfiles.remove('data/proj_def.dat')
basemap_datafiles = boundaryfiles + ['data/5minmask.bin']
package_data = {'matplotlib.toolkits.basemap':pyproj_datafiles+basemap_datafiles}
setup(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 16:26:59
|
Revision: 4206
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4206&view=rev
Author: jswhit
Date: 2007-11-10 08:26:53 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
updated instructions
Modified Paths:
--------------
trunk/toolkits/basemap-testing/utils/README
Modified: trunk/toolkits/basemap-testing/utils/README
===================================================================
--- trunk/toolkits/basemap-testing/utils/README 2007-11-10 16:18:56 UTC (rev 4205)
+++ trunk/toolkits/basemap-testing/utils/README 2007-11-10 16:26:53 UTC (rev 4206)
@@ -1,3 +1,6 @@
-1) run dumpcoast.sh and dumpbounds.sh to dump GMT boundaries into text files.
-2) run readboundaries.py to process into binary files, with metadata in
-text files.
+1) install GMT, download gshhs boundary data and source code
+from ftp://ftp.soest.hawaii.edu/pwessel/gshhs/.
+2) compile gshhs.c, use to create gshhs_{c,l,i,h}.txt files.
+3) run dumpbounds.sh to create states, countries, rivers text files.
+4) run readboundaries.py to process into binary files, with metadata in
+separate text files.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 16:19:05
|
Revision: 4205
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4205&view=rev
Author: jswhit
Date: 2007-11-10 08:18:56 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
fix typo
Modified Paths:
--------------
trunk/toolkits/basemap-testing/utils/readboundaries.py
Modified: trunk/toolkits/basemap-testing/utils/readboundaries.py
===================================================================
--- trunk/toolkits/basemap-testing/utils/readboundaries.py 2007-11-10 16:10:28 UTC (rev 4204)
+++ trunk/toolkits/basemap-testing/utils/readboundaries.py 2007-11-10 16:18:56 UTC (rev 4205)
@@ -43,8 +43,8 @@
polybounds.append(b)
lats = []; lons = []
continue
- lon = float(line[0:10])
- lat = float(line[11:20])
+ lon = float(line[1:10])
+ lat = float(line[10:20])
lons.append(lon); lats.append(lat)
#lons.append(lons[0]); lats.append(lats[0])
b = numpy.empty((len(lons),2),numpy.float32)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 16:10:30
|
Revision: 4204
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4204&view=rev
Author: jswhit
Date: 2007-11-10 08:10:28 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
fixes for new gshhs data
Modified Paths:
--------------
trunk/toolkits/basemap-testing/utils/readboundaries.py
Modified: trunk/toolkits/basemap-testing/utils/readboundaries.py
===================================================================
--- trunk/toolkits/basemap-testing/utils/readboundaries.py 2007-11-10 14:10:32 UTC (rev 4203)
+++ trunk/toolkits/basemap-testing/utils/readboundaries.py 2007-11-10 16:10:28 UTC (rev 4204)
@@ -23,30 +23,29 @@
scale = pow(2.,bits)
return numpy.around(scale*data)/scale
-def get_coast_polygons(coastfile,area_thresh=-1.,latmin=-91.,latmax=91.):
+def get_coast_polygons(coastfile):
polymeta = []; polybounds = []
lats = []; lons = []
for line in open(coastfile):
+ if line.startswith('#'): continue
linesplit = line.split()
if line.startswith('P'):
area = float(linesplit[5])
west,east,south,north = float(linesplit[6]),float(linesplit[7]),float(linesplit[8]),float(linesplit[9])
typ = int(linesplit[3])
- useit = latmax>=south and latmin<=north and area>area_thresh
- if useit:
- polymeta.append((typ,area,south,north))
- if lons:
- #lons.append(lons[0]); lats.append(lats[0])
- b = numpy.empty((len(lons),2),numpy.float32)
- b[:,0] = lons; b[:,1] = lats
- if lsd is not None:
- b = quantize(b,lsd)
- polybounds.append(b)
- lats = []; lons = []
+ polymeta.append((typ,area,south,north))
+ if lons:
+ #lons.append(lons[0]); lats.append(lats[0])
+ b = numpy.empty((len(lons),2),numpy.float32)
+ b[:,0] = lons; b[:,1] = lats
+ if lsd is not None:
+ b = quantize(b,lsd)
+ polybounds.append(b)
+ lats = []; lons = []
continue
- if useit:
- lon, lat = [float(val) for val in linesplit]
- lons.append(lon); lats.append(lat)
+ lon = float(line[0:10])
+ lat = float(line[11:20])
+ lons.append(lon); lats.append(lat)
#lons.append(lons[0]); lats.append(lats[0])
b = numpy.empty((len(lons),2),numpy.float32)
b[:,0] = lons; b[:,1] = lats
@@ -59,45 +58,41 @@
polymeta2.append(meta+(npts,))
return polybounds, polymeta2
-def get_boundary_lines(bdatfile,latmin=-91.,latmax=91.):
- polymeta = []; polybounds = []
- lons = []; lats = []
+def get_boundary_lines(bdatfile):
+ lons = []; lats = []; polybounds = []
for line in open(bdatfile):
+ if line.startswith('#'): continue
linesplit = line.split()
if line.startswith('>'):
- west,east,south,north = float(linesplit[7]),float(linesplit[8]),float(linesplit[9]),float(linesplit[10])
- useit = latmax>=south and latmin<=north
- if useit:
- polymeta.append((south,north))
- if lons:
- b = numpy.empty((len(lons),2),numpy.float32)
- b[:,0] = lons; b[:,1] = lats
- if lsd is not None:
- b = quantize(b,lsd)
- polybounds.append(b)
- lons = []; lats = []
- continue
- if useit:
- lon, lat = [float(val) for val in linesplit]
- lats.append(lat); lons.append(lon)
+ if lons:
+ b = numpy.empty((len(lons),2),numpy.float32)
+ b[:,0] = lons; b[:,1] = lats
+ if lsd is not None:
+ b = quantize(b,lsd)
+ polybounds.append(b)
+ lons = []; lats = []
+ continue
+ lon, lat = [float(val) for val in linesplit]
+ lats.append(lat); lons.append(lon)
b = numpy.empty((len(lons),2),numpy.float32)
b[:,0] = lons; b[:,1] = lats
if lsd is not None:
b = quantize(b,lsd)
polybounds.append(b)
- polymeta2 = []
+ polymeta = []
polybounds2 = []
- for meta,bounds in zip(polymeta,polybounds):
+ for bounds in polybounds:
npts = bounds.shape[0]
if npts == 2 and\
bounds[0,0] == bounds[1,0] and\
bounds[0,1] == bounds[1,1]: continue
polybounds2.append(bounds)
- polymeta2.append(meta+(npts,))
- return polybounds2, polymeta2
+ south = bounds[:,1].min()
+ north = bounds[:,1].max()
+ polymeta.append((south,north,npts))
+ return polybounds2, polymeta
# read in coastline data (only those polygons whose area > area_thresh).
-#resolution = sys.argv[1]
for resolution in ['c','l','i','h']:
coastlons = []; coastlats = []; coastsegind = []; coastsegtype = []
coastfile = 'gshhs_'+resolution+'.txt'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-10 14:10:36
|
Revision: 4203
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4203&view=rev
Author: jswhit
Date: 2007-11-10 06:10:32 -0800 (Sat, 10 Nov 2007)
Log Message:
-----------
add utilities for processing GMT boundaries
Added Paths:
-----------
trunk/toolkits/basemap-testing/utils/
trunk/toolkits/basemap-testing/utils/README
trunk/toolkits/basemap-testing/utils/dumpbounds.sh
trunk/toolkits/basemap-testing/utils/dumpcoast.sh
trunk/toolkits/basemap-testing/utils/readboundaries.py
Added: trunk/toolkits/basemap-testing/utils/README
===================================================================
--- trunk/toolkits/basemap-testing/utils/README (rev 0)
+++ trunk/toolkits/basemap-testing/utils/README 2007-11-10 14:10:32 UTC (rev 4203)
@@ -0,0 +1,3 @@
+1) run dumpcoast.sh and dumpbounds.sh to dump GMT boundaries into text files.
+2) run readboundaries.py to process into binary files, with metadata in
+text files.
Added: trunk/toolkits/basemap-testing/utils/dumpbounds.sh
===================================================================
--- trunk/toolkits/basemap-testing/utils/dumpbounds.sh (rev 0)
+++ trunk/toolkits/basemap-testing/utils/dumpbounds.sh 2007-11-10 14:10:32 UTC (rev 4203)
@@ -0,0 +1,16 @@
+#!/bin/sh
+area=10000000000000000000000000000000
+pscoast -M -Dc -R0/360/-90/90 -N1 -JQ180/4.5i -W -A${area} > countries_c.txt
+pscoast -M -Dc -R0/360/-90/90 -N2 -JQ180/4.5i -W -A${area} > states_c.txt
+pscoast -M -Dl -R0/360/-90/90 -N1 -JQ180/4.5i -W -A${area} > countries_l.txt
+pscoast -M -Dl -R0/360/-90/90 -N2 -JQ180/4.5i -W -A${area} > states_l.txt
+pscoast -M -Di -R0/360/-90/90 -N1 -JQ180/4.5i -W -A${area} > countries_i.txt
+pscoast -M -Di -R0/360/-90/90 -N2 -JQ180/4.5i -W -A${area} > states_i.txt
+pscoast -M -Dh -R0/360/-90/90 -N1 -JQ180/4.5i -W -A${area} > countries_h.txt
+pscoast -M -Dh -R0/360/-90/90 -N2 -JQ180/4.5i -W -A${area} > states_h.txt
+pscoast -M -Df -R0/360/-90/90 -N1 -JQ180/4.5i -W -A${area} > countries_f.txt
+pscoast -M -Df -R0/360/-90/90 -N2 -JQ180/4.5i -W -A${area} > states_f.txt
+pscoast -M -Dc -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_c.txt
+pscoast -M -Dl -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_l.txt
+pscoast -M -Di -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_i.txt
+pscoast -M -Dh -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_h.txt
Added: trunk/toolkits/basemap-testing/utils/dumpcoast.sh
===================================================================
--- trunk/toolkits/basemap-testing/utils/dumpcoast.sh (rev 0)
+++ trunk/toolkits/basemap-testing/utils/dumpcoast.sh 2007-11-10 14:10:32 UTC (rev 4203)
@@ -0,0 +1,2 @@
+#!/bin/csh
+pscoast -M -Dl -R0.001/360/-90/90 -JQ180/4.5i -A5000 -W >! GMT_coastlines.txt
Added: trunk/toolkits/basemap-testing/utils/readboundaries.py
===================================================================
--- trunk/toolkits/basemap-testing/utils/readboundaries.py (rev 0)
+++ trunk/toolkits/basemap-testing/utils/readboundaries.py 2007-11-10 14:10:32 UTC (rev 4203)
@@ -0,0 +1,158 @@
+import numpy, sys
+
+lsd = 3
+
+def quantize(data,least_significant_digit):
+ """
+
+quantize data to improve compression. data is quantized using
+around(scale*data)/scale, where scale is 2**bits, and bits is determined
+from the least_significant_digit. For example, if
+least_significant_digit=1, bits will be 4.
+
+This function is pure python.
+
+ """
+ precision = pow(10.,-least_significant_digit)
+ exp = numpy.log10(precision)
+ if exp < 0:
+ exp = int(numpy.floor(exp))
+ else:
+ exp = int(numpy.ceil(exp))
+ bits = numpy.ceil(numpy.log2(pow(10.,-exp)))
+ scale = pow(2.,bits)
+ return numpy.around(scale*data)/scale
+
+def get_coast_polygons(coastfile,area_thresh=-1.,latmin=-91.,latmax=91.):
+ polymeta = []; polybounds = []
+ lats = []; lons = []
+ for line in open(coastfile):
+ linesplit = line.split()
+ if line.startswith('P'):
+ area = float(linesplit[5])
+ west,east,south,north = float(linesplit[6]),float(linesplit[7]),float(linesplit[8]),float(linesplit[9])
+ typ = int(linesplit[3])
+ useit = latmax>=south and latmin<=north and area>area_thresh
+ if useit:
+ polymeta.append((typ,area,south,north))
+ if lons:
+ #lons.append(lons[0]); lats.append(lats[0])
+ b = numpy.empty((len(lons),2),numpy.float32)
+ b[:,0] = lons; b[:,1] = lats
+ if lsd is not None:
+ b = quantize(b,lsd)
+ polybounds.append(b)
+ lats = []; lons = []
+ continue
+ if useit:
+ lon, lat = [float(val) for val in linesplit]
+ lons.append(lon); lats.append(lat)
+ #lons.append(lons[0]); lats.append(lats[0])
+ b = numpy.empty((len(lons),2),numpy.float32)
+ b[:,0] = lons; b[:,1] = lats
+ if lsd is not None:
+ b = quantize(b,lsd)
+ polybounds.append(b)
+ polymeta2 = []
+ for meta,bounds in zip(polymeta,polybounds):
+ npts = bounds.shape[0]
+ polymeta2.append(meta+(npts,))
+ return polybounds, polymeta2
+
+def get_boundary_lines(bdatfile,latmin=-91.,latmax=91.):
+ polymeta = []; polybounds = []
+ lons = []; lats = []
+ for line in open(bdatfile):
+ linesplit = line.split()
+ if line.startswith('>'):
+ west,east,south,north = float(linesplit[7]),float(linesplit[8]),float(linesplit[9]),float(linesplit[10])
+ useit = latmax>=south and latmin<=north
+ if useit:
+ polymeta.append((south,north))
+ if lons:
+ b = numpy.empty((len(lons),2),numpy.float32)
+ b[:,0] = lons; b[:,1] = lats
+ if lsd is not None:
+ b = quantize(b,lsd)
+ polybounds.append(b)
+ lons = []; lats = []
+ continue
+ if useit:
+ lon, lat = [float(val) for val in linesplit]
+ lats.append(lat); lons.append(lon)
+ b = numpy.empty((len(lons),2),numpy.float32)
+ b[:,0] = lons; b[:,1] = lats
+ if lsd is not None:
+ b = quantize(b,lsd)
+ polybounds.append(b)
+ polymeta2 = []
+ polybounds2 = []
+ for meta,bounds in zip(polymeta,polybounds):
+ npts = bounds.shape[0]
+ if npts == 2 and\
+ bounds[0,0] == bounds[1,0] and\
+ bounds[0,1] == bounds[1,1]: continue
+ polybounds2.append(bounds)
+ polymeta2.append(meta+(npts,))
+ return polybounds2, polymeta2
+
+# read in coastline data (only those polygons whose area > area_thresh).
+#resolution = sys.argv[1]
+for resolution in ['c','l','i','h']:
+ coastlons = []; coastlats = []; coastsegind = []; coastsegtype = []
+ coastfile = 'gshhs_'+resolution+'.txt'
+ countryfile = 'countries_'+resolution+'.txt'
+ statefile = 'states_'+resolution+'.txt'
+ riverfile = 'rivers_'+resolution+'.txt'
+
+ poly, polymeta = get_coast_polygons(coastfile)
+ f = open('../lib/matplotlib/toolkits/basemap/data/gshhs_'+resolution+'.dat','wb')
+ f2 = open('../lib/matplotlib/toolkits/basemap/data/gshhsmeta_'+resolution+'.dat','w')
+ offset = 0
+ for p,pm in zip(poly,polymeta):
+ bstring = p.tostring()
+ f.write(bstring)
+ typ = pm[0]; area = pm[1]; south = pm[2]; north = pm[3]; npts = pm[4]
+ f2.write('%s %s %s %9.5f %9.5f %s %s\n' % (typ, area, npts, south, north, offset, len(bstring)))
+ offset = offset + len(bstring)
+ f.close()
+ f2.close()
+
+ poly, polymeta = get_boundary_lines(countryfile)
+ f = open('../lib/matplotlib/toolkits/basemap/data/countries_'+resolution+'.dat','wb')
+ f2 = open('../lib/matplotlib/toolkits/basemap/data/countriesmeta_'+resolution+'.dat','w')
+ offset = 0
+ for p,pm in zip(poly,polymeta):
+ bstring = p.tostring()
+ f.write(bstring)
+ south,north,npts = pm[:]
+ f2.write('%s %s %s %9.5f %9.5f %s %s\n' % (-1,-1,npts, south, north, offset, len(bstring)))
+ offset = offset + len(bstring)
+ f.close()
+ f2.close()
+
+ poly, polymeta = get_boundary_lines(statefile)
+ f = open('../lib/matplotlib/toolkits/basemap/data/states_'+resolution+'.dat','wb')
+ f2 = open('../lib/matplotlib/toolkits/basemap/data/statesmeta_'+resolution+'.dat','w')
+ offset = 0
+ for p,pm in zip(poly,polymeta):
+ bstring = p.tostring()
+ f.write(bstring)
+ south,north,npts = pm[:]
+ f2.write('%s %s %s %9.5f %9.5f %s %s\n' % (-1,-1,npts, south, north, offset, len(bstring)))
+ offset = offset + len(bstring)
+ f.close()
+ f2.close()
+
+ poly, polymeta = get_boundary_lines(riverfile)
+ f = open('../lib/matplotlib/toolkits/basemap/data/rivers_'+resolution+'.dat','wb')
+ f2 = open('../lib/matplotlib/toolkits/basemap/data/riversmeta_'+resolution+'.dat','w')
+ offset = 0
+ for p,pm in zip(poly,polymeta):
+ bstring = p.tostring()
+ f.write(bstring)
+ south,north,npts = pm[:]
+ f2.write('%s %s %s %9.5f %9.5f %s %s\n' % (-1,-1,npts, south, north, offset, len(bstring)))
+ offset = offset + len(bstring)
+ f.close()
+ f2.close()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-09 22:29:50
|
Revision: 4202
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4202&view=rev
Author: jswhit
Date: 2007-11-09 14:29:49 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
back off last commit, doesn't do the right thing in all cases.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-09 22:11:14 UTC (rev 4201)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-09 22:29:49 UTC (rev 4202)
@@ -775,15 +775,6 @@
b = npy.asarray(self._boundarypolyll.boundary)
blons = b[:,0]; blats = b[:,1]
boundarypolyxy = PolygonShape(zip(*maptran(blons,blats)))
- # for map regions that don't contain Pole, see if Greenwich
- # meridian is contained.
- if not containsPole:
- lon_0,lat_0 = self(self.xmin+0.5*(self.xmax-self.xmin),\
- self.ymin+0.5*(self.ymax-self.ymin),inverse=True)
- GM0 = PointShape((0,lat_0))
- GM360 = PointShape((360,lat_0))
- hasGM0 = GM0.within(boundarypolyll)
- hasGM360 = GM360.within(boundarypolyll)
for line in bdatmetafile:
linesplit = line.split()
area = float(linesplit[1])
@@ -839,16 +830,11 @@
# (so as to properly treat polygons that cross
# Greenwich meridian).
if not antart:
- if hasGM0:
- blons = b[:,0]-360
- poly1 = Shape(zip(blons,blats))
- polys = [poly1,poly]
- elif hasGM360:
- blons = b[:,0]+360
- poly2 = Shape(zip(blons,blats))
- polys = [poly,poly2]
- else:
- polys = [poly]
+ blons = b[:,0]-360
+ poly1 = Shape(zip(blons,blats))
+ blons = b[:,0]+360
+ poly2 = Shape(zip(blons,blats))
+ polys = [poly1,poly,poly2]
else: # Antartica already extends from -360 to +720.
polys = [poly]
for poly in polys:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-09 22:11:18
|
Revision: 4201
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4201&view=rev
Author: jswhit
Date: 2007-11-09 14:11:14 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
check to see if Greenwich meridian is in map region. If not, some
speedups can be had.
Modified Paths:
--------------
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-09 21:28:58 UTC (rev 4200)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-09 22:11:14 UTC (rev 4201)
@@ -775,6 +775,15 @@
b = npy.asarray(self._boundarypolyll.boundary)
blons = b[:,0]; blats = b[:,1]
boundarypolyxy = PolygonShape(zip(*maptran(blons,blats)))
+ # for map regions that don't contain Pole, see if Greenwich
+ # meridian is contained.
+ if not containsPole:
+ lon_0,lat_0 = self(self.xmin+0.5*(self.xmax-self.xmin),\
+ self.ymin+0.5*(self.ymax-self.ymin),inverse=True)
+ GM0 = PointShape((0,lat_0))
+ GM360 = PointShape((360,lat_0))
+ hasGM0 = GM0.within(boundarypolyll)
+ hasGM360 = GM360.within(boundarypolyll)
for line in bdatmetafile:
linesplit = line.split()
area = float(linesplit[1])
@@ -830,11 +839,16 @@
# (so as to properly treat polygons that cross
# Greenwich meridian).
if not antart:
- blons = b[:,0]-360
- poly1 = Shape(zip(blons,blats))
- blons = b[:,0]+360
- poly2 = Shape(zip(blons,blats))
- polys = [poly1,poly,poly2]
+ if hasGM0:
+ blons = b[:,0]-360
+ poly1 = Shape(zip(blons,blats))
+ polys = [poly1,poly]
+ elif hasGM360:
+ blons = b[:,0]+360
+ poly2 = Shape(zip(blons,blats))
+ polys = [poly,poly2]
+ else:
+ polys = [poly]
else: # Antartica already extends from -360 to +720.
polys = [poly]
for poly in polys:
@@ -906,16 +920,6 @@
# if geometry instersects map projection
# region, and doesn't have any invalid points, process it.
if not badmask.any() and boundarypolyxy.intersects(poly):
- #if not poly.is_valid:
- # print poly.geom_type, poly.is_ring, boundarypolyll.is_valid
- # import pylab
- # a = npy.asarray(boundarypolyxy.boundary)
- # b = npy.asarray(poly.boundary)
- # poly2 = boundarypolyxy.intersection(poly)
- # c = npy.asarray(poly2.boundary)
- # pylab.plot(a[:,0],a[:,1],'b')
- # pylab.fill(c[:,0],c[:,1],'r')
- # pylab.show()
# if geometry intersection calculation fails,
# just move on.
try:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 21:29:01
|
Revision: 4200
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4200&view=rev
Author: mdboom
Date: 2007-11-09 13:28:58 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Oops in last commit.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2007-11-09 21:27:30 UTC (rev 4199)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2007-11-09 21:28:58 UTC (rev 4200)
@@ -1265,7 +1265,7 @@
converterseq = None
for i,line in enumerate(fh):
if i<skiprows: continue
- line = line.split(comments, 1).strip()
+ line = line.split(comments, 1)[0].strip()
if not len(line): continue
if converterseq is None:
converterseq = [converters.get(j,float)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 21:27:31
|
Revision: 4199
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4199&view=rev
Author: mdboom
Date: 2007-11-09 13:27:30 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Bugfix: [ 1732274 ] No antialiasing with pie on wxpython
Reducing the sampling of the curve on the wedge looks much better.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/patches.py
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py 2007-11-09 21:09:04 UTC (rev 4198)
+++ trunk/matplotlib/lib/matplotlib/patches.py 2007-11-09 21:27:30 UTC (rev 4199)
@@ -511,7 +511,7 @@
def __str__(self):
return "Wedge(%g,%g)"%self.xy[0]
def __init__(self, center, r, theta1, theta2,
- dtheta=0.1, **kwargs):
+ dtheta=5.0, **kwargs):
"""
Draw a wedge centered at x,y tuple center with radius r that
sweeps theta1 to theta2 (angles)
@@ -523,7 +523,11 @@
"""
xc, yc = center
- rads = (math.pi/180.)*npy.arange(theta1, theta2+0.1*dtheta, dtheta)
+ theta1 = float(theta1)
+ theta2 = float(theta2)
+ dtheta = float(dtheta)
+ num_points = abs(theta2 - theta1) / dtheta
+ rads = (npy.pi/180.) * npy.linspace(theta1, theta2, num_points, endpoint=True)
xs = r*npy.cos(rads)+xc
ys = r*npy.sin(rads)+yc
verts = [center]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 21:09:07
|
Revision: 4198
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4198&view=rev
Author: mdboom
Date: 2007-11-09 13:09:04 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Bugfix: [ 1745650 ] patch for mlab.py's comment handling
Comment handling had the potential to lose the last character of a
line. Slightly different from user submitted patch -- uses split()
instead of three lines of Python code.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2007-11-09 20:59:47 UTC (rev 4197)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2007-11-09 21:09:04 UTC (rev 4198)
@@ -1265,7 +1265,7 @@
converterseq = None
for i,line in enumerate(fh):
if i<skiprows: continue
- line = line[:line.find(comments)].strip()
+ line = line.split(comments, 1).strip()
if not len(line): continue
if converterseq is None:
converterseq = [converters.get(j,float)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 20:59:49
|
Revision: 4197
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4197&view=rev
Author: mdboom
Date: 2007-11-09 12:59:47 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Bugfix: [ 1757315 ] ValueError: Cannot set nonpositive limits with log
transform. The axes scales were not getting set back to "linear" when
cla() is called, so autoscale_limits gets confused on the next call to
plot().
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2007-11-09 20:37:57 UTC (rev 4196)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2007-11-09 20:59:47 UTC (rev 4197)
@@ -720,6 +720,8 @@
self.xaxis.cla()
self.yaxis.cla()
+ self.set_xscale('linear')
+ self.set_yscale('linear')
self.dataLim.ignore(1)
self.callbacks = cbook.CallbackRegistry(('xlim_changed', 'ylim_changed'))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ds...@us...> - 2007-11-09 20:38:12
|
Revision: 4196
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4196&view=rev
Author: dsdale
Date: 2007-11-09 12:37:57 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
minor formatting change to dependency report
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-11-09 20:15:52 UTC (rev 4195)
+++ trunk/matplotlib/setupext.py 2007-11-09 20:37:57 UTC (rev 4196)
@@ -299,7 +299,7 @@
print_status("Qt", "no")
return False
else:
- print_status("Qt", "Qt: %s, pyqt: %s" %
+ print_status("Qt", "Qt: %s, PyQt: %s" %
(convert_qt_version(pyqtconfig.Configuration().qt_version),
pyqtconfig.Configuration().pyqt_version_str))
return True
@@ -311,7 +311,7 @@
print_status("Qt4", "no")
return False
else:
- print_status("Qt4", "Qt: %s, pyqt: %s" %
+ print_status("Qt4", "Qt: %s, PyQt4: %s" %
(convert_qt_version(pyqtconfig.Configuration().qt_version),
pyqtconfig.Configuration().pyqt_version_str))
return True
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 20:15:53
|
Revision: 4195
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4195&view=rev
Author: mdboom
Date: 2007-11-09 12:15:52 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Bugfix: [ 1808189 ] lw kwarg broken in errorbar (Thanks Joe Monaco).
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/collections.py
Modified: trunk/matplotlib/lib/matplotlib/collections.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/collections.py 2007-11-09 20:14:29 UTC (rev 4194)
+++ trunk/matplotlib/lib/matplotlib/collections.py 2007-11-09 20:15:52 UTC (rev 4195)
@@ -217,10 +217,8 @@
ACCEPTS: float or sequence of floats
"""
self._linewidths = self._get_value(lw)
+ set_linewidths = set_lw = set_linewidth
- def set_linewidths(self, lw):
- self.set_linewidth(lw)
-
def set_color(self, c):
"""
Set both the edgecolor and the facecolor.
@@ -798,7 +796,8 @@
"""
self._lw = self._get_value(lw)
-
+ set_linewidths = set_lw = set_linewidth
+
def set_linestyle(self, ls):
"""
Set the linestyles(s) for the collection.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 20:14:52
|
Revision: 4194
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4194&view=rev
Author: mdboom
Date: 2007-11-09 12:14:29 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Fix exception plotting an errorbar graph with only two data points.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py 2007-11-09 20:00:39 UTC (rev 4193)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2007-11-09 20:14:29 UTC (rev 4194)
@@ -3717,7 +3717,7 @@
plot_kw['mew']=kwargs['mew']
if xerr is not None:
- if iterable(xerr) and len(xerr)==2:
+ if iterable(xerr) and len(xerr)==2 and iterable(xerr[0]) and iterable(xerr[1]):
# using list comps rather than arrays to preserve units
left = [thisx-thiserr for (thisx, thiserr) in cbook.safezip(x,xerr[0])]
right = [thisx+thiserr for (thisx, thiserr) in cbook.safezip(x,xerr[1])]
@@ -3751,7 +3751,7 @@
caplines.extend( self.plot(right, y, 'k|', **plot_kw) )
if yerr is not None:
- if iterable(yerr) and len(yerr)==2:
+ if iterable(yerr) and len(yerr)==2 and iterable(yerr[0]) and iterable(yerr[1]):
# using list comps rather than arrays to preserve units
lower = [thisy-thiserr for (thisy, thiserr) in cbook.safezip(y,yerr[0])]
upper = [thisy+thiserr for (thisy, thiserr) in cbook.safezip(y,yerr[1])]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2007-11-09 20:00:43
|
Revision: 4193
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4193&view=rev
Author: jswhit
Date: 2007-11-09 12:00:39 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
if poly intersection fails, attempt to use the polygon anyway
Modified Paths:
--------------
trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-09 19:48:42 UTC (rev 4192)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py 2007-11-09 20:00:39 UTC (rev 4193)
@@ -841,18 +841,12 @@
# if polygon instersects map projection
# region, process it.
if poly.intersects(boundarypolyll):
- #if not poly.is_valid:
- # print poly.geom_type, poly.is_ring, boundarypolyll.is_valid
- # import pylab
- # a = npy.asarray(boundarypolyll.boundary)
- # b = npy.asarray(poly.boundary)
- # pylab.plot(a[:,0],a[:,1],'b')
- # pylab.plot(b[:,0],b[:,1],'b')
- # pylab.show()
- if poly.is_valid:
+ # if geometry intersection calculation fails,
+ # just move on.
+ try:
poly = poly.intersection(boundarypolyll)
- #else:
- # print 'warning, invalid ',name,' geometry',poly.area
+ except:
+ pass
# create iterable object with geometries
# that intersect map region.
if hasattr(poly,'geoms'):
@@ -912,15 +906,22 @@
# if geometry instersects map projection
# region, and doesn't have any invalid points, process it.
if not badmask.any() and boundarypolyxy.intersects(poly):
+ #if not poly.is_valid:
+ # print poly.geom_type, poly.is_ring, boundarypolyll.is_valid
+ # import pylab
+ # a = npy.asarray(boundarypolyxy.boundary)
+ # b = npy.asarray(poly.boundary)
+ # poly2 = boundarypolyxy.intersection(poly)
+ # c = npy.asarray(poly2.boundary)
+ # pylab.plot(a[:,0],a[:,1],'b')
+ # pylab.fill(c[:,0],c[:,1],'r')
+ # pylab.show()
# if geometry intersection calculation fails,
- # just skip this polygon.
- #try:
- if poly.is_valid:
+ # just move on.
+ try:
poly = boundarypolyxy.intersection(poly)
- #else:
- # print 'warning, invalid ',name,' geometry',poly.area
- #except:
- # continue
+ except:
+ pass
# create iterable object with geometries
# that intersect map region.
if hasattr(poly,'geoms'):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 19:48:58
|
Revision: 4192
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4192&view=rev
Author: mdboom
Date: 2007-11-09 11:48:42 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Merged revisions 4135-4190 via svnmerge from
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib
........
r4155 | dsdale | 2007-11-07 19:09:17 -0500 (Wed, 07 Nov 2007) | 2 lines
move configobj.py to lib/, install in site-packages only if required
........
r4156 | dsdale | 2007-11-07 19:24:57 -0500 (Wed, 07 Nov 2007) | 3 lines
update enthought package to version 2.6b1, stripped of setuptools
installed in site-packages, if not already present
........
r4160 | mdboom | 2007-11-08 09:31:15 -0500 (Thu, 08 Nov 2007) | 2 lines
Throw in dummy characters for symbols not in the Bakoma fonts.
........
r4167 | dsdale | 2007-11-08 18:25:44 -0500 (Thu, 08 Nov 2007) | 3 lines
move pyparsing from lib/matplotlib/ to lib/
install pyparsing only if not already available
........
r4168 | jdh2358 | 2007-11-08 18:29:46 -0500 (Thu, 08 Nov 2007) | 2 lines
added recarray utils module
........
r4169 | dsdale | 2007-11-08 19:19:45 -0500 (Thu, 08 Nov 2007) | 2 lines
updated pyparsing to version 1.4.8
........
r4170 | dsdale | 2007-11-08 19:22:03 -0500 (Thu, 08 Nov 2007) | 3 lines
added checks that also print version numbers for
pyparsing, pytz, dateutil, configobj
........
r4171 | dsdale | 2007-11-08 19:31:48 -0500 (Thu, 08 Nov 2007) | 2 lines
note pyparsing change to API_CHANGES
........
r4172 | dsdale | 2007-11-08 20:37:02 -0500 (Thu, 08 Nov 2007) | 2 lines
remove old version of pytz
........
r4173 | dsdale | 2007-11-08 20:40:54 -0500 (Thu, 08 Nov 2007) | 2 lines
added pytz-2007g
........
r4174 | dsdale | 2007-11-08 20:43:18 -0500 (Thu, 08 Nov 2007) | 2 lines
fixed bug in dateutil version check
........
r4175 | jdh2358 | 2007-11-08 21:55:47 -0500 (Thu, 08 Nov 2007) | 2 lines
reverted rec utils to mlab
........
r4176 | efiring | 2007-11-09 02:25:08 -0500 (Fri, 09 Nov 2007) | 2 lines
Pylab uses numpy instead of oldnumeric
........
r4177 | dsdale | 2007-11-09 08:08:48 -0500 (Fri, 09 Nov 2007) | 2 lines
move pyparsing back into mpl namespace
........
r4178 | mdboom | 2007-11-09 08:10:12 -0500 (Fri, 09 Nov 2007) | 3 lines
Avoid annoying Qt4 messages when mpl raises an exception. (Thanks to
Martin Teichmann in patch 1828813)
........
r4179 | mdboom | 2007-11-09 08:19:38 -0500 (Fri, 09 Nov 2007) | 2 lines
Fix font caching bug on OSX
........
r4180 | dsdale | 2007-11-09 08:20:10 -0500 (Fri, 09 Nov 2007) | 3 lines
committed Martin Teichmann's patch 1828813 to fix qt4 error messages
related to QPainter
........
r4181 | mdboom | 2007-11-09 08:47:40 -0500 (Fri, 09 Nov 2007) | 3 lines
Remove duplicate line caused by myself and Darren committing the same
patch and virtually the same time.
........
r4182 | dsdale | 2007-11-09 08:49:54 -0500 (Fri, 09 Nov 2007) | 2 lines
updated CHANGELOG and API_CHANGES
........
r4183 | dsdale | 2007-11-09 09:24:41 -0500 (Fri, 09 Nov 2007) | 2 lines
updated dependency report during build process
........
r4187 | jdh2358 | 2007-11-09 11:42:55 -0500 (Fri, 09 Nov 2007) | 2 lines
added face and edge color = 'None' support to patches
........
r4188 | jdh2358 | 2007-11-09 11:43:38 -0500 (Fri, 09 Nov 2007) | 2 lines
removed unneeded draw command from tkagg
........
Modified Paths:
--------------
branches/transforms/API_CHANGES
branches/transforms/CHANGELOG
branches/transforms/examples/image_demo2.py
branches/transforms/examples/loadrec.py
branches/transforms/examples/mathtext_demo.py
branches/transforms/examples/mathtext_examples.py
branches/transforms/examples/mri_with_eeg.py
branches/transforms/examples/rc_traits.py
branches/transforms/lib/dateutil/__init__.py
branches/transforms/lib/matplotlib/__init__.py
branches/transforms/lib/matplotlib/axes.py
branches/transforms/lib/matplotlib/backend_bases.py
branches/transforms/lib/matplotlib/backends/backend_qt4agg.py
branches/transforms/lib/matplotlib/cbook.py
branches/transforms/lib/matplotlib/config/checkdep.py
branches/transforms/lib/matplotlib/font_manager.py
branches/transforms/lib/matplotlib/mathtext.py
branches/transforms/lib/matplotlib/mlab.py
branches/transforms/lib/matplotlib/patches.py
branches/transforms/lib/matplotlib/pylab.py
branches/transforms/lib/matplotlib/pyparsing.py
branches/transforms/setup.py
branches/transforms/setupext.py
Added Paths:
-----------
branches/transforms/lib/configobj.py
branches/transforms/lib/pytz/
branches/transforms/lib/pytz/CHANGES.txt
branches/transforms/lib/pytz/LICENSE.txt
branches/transforms/lib/pytz/README.txt
branches/transforms/lib/pytz/__init__.py
branches/transforms/lib/pytz/reference.py
branches/transforms/lib/pytz/tzfile.py
branches/transforms/lib/pytz/tzinfo.py
branches/transforms/lib/pytz/zoneinfo/
branches/transforms/lib/pytz/zoneinfo/Africa/
branches/transforms/lib/pytz/zoneinfo/Africa/Abidjan
branches/transforms/lib/pytz/zoneinfo/Africa/Accra
branches/transforms/lib/pytz/zoneinfo/Africa/Addis_Ababa
branches/transforms/lib/pytz/zoneinfo/Africa/Algiers
branches/transforms/lib/pytz/zoneinfo/Africa/Asmara
branches/transforms/lib/pytz/zoneinfo/Africa/Asmera
branches/transforms/lib/pytz/zoneinfo/Africa/Bamako
branches/transforms/lib/pytz/zoneinfo/Africa/Bangui
branches/transforms/lib/pytz/zoneinfo/Africa/Banjul
branches/transforms/lib/pytz/zoneinfo/Africa/Bissau
branches/transforms/lib/pytz/zoneinfo/Africa/Blantyre
branches/transforms/lib/pytz/zoneinfo/Africa/Brazzaville
branches/transforms/lib/pytz/zoneinfo/Africa/Bujumbura
branches/transforms/lib/pytz/zoneinfo/Africa/Cairo
branches/transforms/lib/pytz/zoneinfo/Africa/Casablanca
branches/transforms/lib/pytz/zoneinfo/Africa/Ceuta
branches/transforms/lib/pytz/zoneinfo/Africa/Conakry
branches/transforms/lib/pytz/zoneinfo/Africa/Dakar
branches/transforms/lib/pytz/zoneinfo/Africa/Dar_es_Salaam
branches/transforms/lib/pytz/zoneinfo/Africa/Djibouti
branches/transforms/lib/pytz/zoneinfo/Africa/Douala
branches/transforms/lib/pytz/zoneinfo/Africa/El_Aaiun
branches/transforms/lib/pytz/zoneinfo/Africa/Freetown
branches/transforms/lib/pytz/zoneinfo/Africa/Gaborone
branches/transforms/lib/pytz/zoneinfo/Africa/Harare
branches/transforms/lib/pytz/zoneinfo/Africa/Johannesburg
branches/transforms/lib/pytz/zoneinfo/Africa/Kampala
branches/transforms/lib/pytz/zoneinfo/Africa/Khartoum
branches/transforms/lib/pytz/zoneinfo/Africa/Kigali
branches/transforms/lib/pytz/zoneinfo/Africa/Kinshasa
branches/transforms/lib/pytz/zoneinfo/Africa/Lagos
branches/transforms/lib/pytz/zoneinfo/Africa/Libreville
branches/transforms/lib/pytz/zoneinfo/Africa/Lome
branches/transforms/lib/pytz/zoneinfo/Africa/Luanda
branches/transforms/lib/pytz/zoneinfo/Africa/Lubumbashi
branches/transforms/lib/pytz/zoneinfo/Africa/Lusaka
branches/transforms/lib/pytz/zoneinfo/Africa/Malabo
branches/transforms/lib/pytz/zoneinfo/Africa/Maputo
branches/transforms/lib/pytz/zoneinfo/Africa/Maseru
branches/transforms/lib/pytz/zoneinfo/Africa/Mbabane
branches/transforms/lib/pytz/zoneinfo/Africa/Mogadishu
branches/transforms/lib/pytz/zoneinfo/Africa/Monrovia
branches/transforms/lib/pytz/zoneinfo/Africa/Nairobi
branches/transforms/lib/pytz/zoneinfo/Africa/Ndjamena
branches/transforms/lib/pytz/zoneinfo/Africa/Niamey
branches/transforms/lib/pytz/zoneinfo/Africa/Nouakchott
branches/transforms/lib/pytz/zoneinfo/Africa/Ouagadougou
branches/transforms/lib/pytz/zoneinfo/Africa/Porto-Novo
branches/transforms/lib/pytz/zoneinfo/Africa/Sao_Tome
branches/transforms/lib/pytz/zoneinfo/Africa/Timbuktu
branches/transforms/lib/pytz/zoneinfo/Africa/Tripoli
branches/transforms/lib/pytz/zoneinfo/Africa/Tunis
branches/transforms/lib/pytz/zoneinfo/Africa/Windhoek
branches/transforms/lib/pytz/zoneinfo/America/
branches/transforms/lib/pytz/zoneinfo/America/Adak
branches/transforms/lib/pytz/zoneinfo/America/Anchorage
branches/transforms/lib/pytz/zoneinfo/America/Anguilla
branches/transforms/lib/pytz/zoneinfo/America/Antigua
branches/transforms/lib/pytz/zoneinfo/America/Araguaina
branches/transforms/lib/pytz/zoneinfo/America/Argentina/
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Catamarca
branches/transforms/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Cordoba
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Jujuy
branches/transforms/lib/pytz/zoneinfo/America/Argentina/La_Rioja
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Mendoza
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos
branches/transforms/lib/pytz/zoneinfo/America/Argentina/San_Juan
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Tucuman
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Ushuaia
branches/transforms/lib/pytz/zoneinfo/America/Aruba
branches/transforms/lib/pytz/zoneinfo/America/Asuncion
branches/transforms/lib/pytz/zoneinfo/America/Atikokan
branches/transforms/lib/pytz/zoneinfo/America/Atka
branches/transforms/lib/pytz/zoneinfo/America/Bahia
branches/transforms/lib/pytz/zoneinfo/America/Barbados
branches/transforms/lib/pytz/zoneinfo/America/Belem
branches/transforms/lib/pytz/zoneinfo/America/Belize
branches/transforms/lib/pytz/zoneinfo/America/Blanc-Sablon
branches/transforms/lib/pytz/zoneinfo/America/Boa_Vista
branches/transforms/lib/pytz/zoneinfo/America/Bogota
branches/transforms/lib/pytz/zoneinfo/America/Boise
branches/transforms/lib/pytz/zoneinfo/America/Buenos_Aires
branches/transforms/lib/pytz/zoneinfo/America/Cambridge_Bay
branches/transforms/lib/pytz/zoneinfo/America/Campo_Grande
branches/transforms/lib/pytz/zoneinfo/America/Cancun
branches/transforms/lib/pytz/zoneinfo/America/Caracas
branches/transforms/lib/pytz/zoneinfo/America/Catamarca
branches/transforms/lib/pytz/zoneinfo/America/Cayenne
branches/transforms/lib/pytz/zoneinfo/America/Cayman
branches/transforms/lib/pytz/zoneinfo/America/Chicago
branches/transforms/lib/pytz/zoneinfo/America/Chihuahua
branches/transforms/lib/pytz/zoneinfo/America/Coral_Harbour
branches/transforms/lib/pytz/zoneinfo/America/Cordoba
branches/transforms/lib/pytz/zoneinfo/America/Costa_Rica
branches/transforms/lib/pytz/zoneinfo/America/Cuiaba
branches/transforms/lib/pytz/zoneinfo/America/Curacao
branches/transforms/lib/pytz/zoneinfo/America/Danmarkshavn
branches/transforms/lib/pytz/zoneinfo/America/Dawson
branches/transforms/lib/pytz/zoneinfo/America/Dawson_Creek
branches/transforms/lib/pytz/zoneinfo/America/Denver
branches/transforms/lib/pytz/zoneinfo/America/Detroit
branches/transforms/lib/pytz/zoneinfo/America/Dominica
branches/transforms/lib/pytz/zoneinfo/America/Edmonton
branches/transforms/lib/pytz/zoneinfo/America/Eirunepe
branches/transforms/lib/pytz/zoneinfo/America/El_Salvador
branches/transforms/lib/pytz/zoneinfo/America/Ensenada
branches/transforms/lib/pytz/zoneinfo/America/Fort_Wayne
branches/transforms/lib/pytz/zoneinfo/America/Fortaleza
branches/transforms/lib/pytz/zoneinfo/America/Glace_Bay
branches/transforms/lib/pytz/zoneinfo/America/Godthab
branches/transforms/lib/pytz/zoneinfo/America/Goose_Bay
branches/transforms/lib/pytz/zoneinfo/America/Grand_Turk
branches/transforms/lib/pytz/zoneinfo/America/Grenada
branches/transforms/lib/pytz/zoneinfo/America/Guadeloupe
branches/transforms/lib/pytz/zoneinfo/America/Guatemala
branches/transforms/lib/pytz/zoneinfo/America/Guayaquil
branches/transforms/lib/pytz/zoneinfo/America/Guyana
branches/transforms/lib/pytz/zoneinfo/America/Halifax
branches/transforms/lib/pytz/zoneinfo/America/Havana
branches/transforms/lib/pytz/zoneinfo/America/Hermosillo
branches/transforms/lib/pytz/zoneinfo/America/Indiana/
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Indianapolis
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Knox
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Marengo
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Petersburg
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Tell_City
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Vevay
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Vincennes
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Winamac
branches/transforms/lib/pytz/zoneinfo/America/Indianapolis
branches/transforms/lib/pytz/zoneinfo/America/Inuvik
branches/transforms/lib/pytz/zoneinfo/America/Iqaluit
branches/transforms/lib/pytz/zoneinfo/America/Jamaica
branches/transforms/lib/pytz/zoneinfo/America/Jujuy
branches/transforms/lib/pytz/zoneinfo/America/Juneau
branches/transforms/lib/pytz/zoneinfo/America/Kentucky/
branches/transforms/lib/pytz/zoneinfo/America/Kentucky/Louisville
branches/transforms/lib/pytz/zoneinfo/America/Kentucky/Monticello
branches/transforms/lib/pytz/zoneinfo/America/Knox_IN
branches/transforms/lib/pytz/zoneinfo/America/La_Paz
branches/transforms/lib/pytz/zoneinfo/America/Lima
branches/transforms/lib/pytz/zoneinfo/America/Los_Angeles
branches/transforms/lib/pytz/zoneinfo/America/Louisville
branches/transforms/lib/pytz/zoneinfo/America/Maceio
branches/transforms/lib/pytz/zoneinfo/America/Managua
branches/transforms/lib/pytz/zoneinfo/America/Manaus
branches/transforms/lib/pytz/zoneinfo/America/Martinique
branches/transforms/lib/pytz/zoneinfo/America/Mazatlan
branches/transforms/lib/pytz/zoneinfo/America/Mendoza
branches/transforms/lib/pytz/zoneinfo/America/Menominee
branches/transforms/lib/pytz/zoneinfo/America/Merida
branches/transforms/lib/pytz/zoneinfo/America/Mexico_City
branches/transforms/lib/pytz/zoneinfo/America/Miquelon
branches/transforms/lib/pytz/zoneinfo/America/Moncton
branches/transforms/lib/pytz/zoneinfo/America/Monterrey
branches/transforms/lib/pytz/zoneinfo/America/Montevideo
branches/transforms/lib/pytz/zoneinfo/America/Montreal
branches/transforms/lib/pytz/zoneinfo/America/Montserrat
branches/transforms/lib/pytz/zoneinfo/America/Nassau
branches/transforms/lib/pytz/zoneinfo/America/New_York
branches/transforms/lib/pytz/zoneinfo/America/Nipigon
branches/transforms/lib/pytz/zoneinfo/America/Nome
branches/transforms/lib/pytz/zoneinfo/America/Noronha
branches/transforms/lib/pytz/zoneinfo/America/North_Dakota/
branches/transforms/lib/pytz/zoneinfo/America/North_Dakota/Center
branches/transforms/lib/pytz/zoneinfo/America/North_Dakota/New_Salem
branches/transforms/lib/pytz/zoneinfo/America/Panama
branches/transforms/lib/pytz/zoneinfo/America/Pangnirtung
branches/transforms/lib/pytz/zoneinfo/America/Paramaribo
branches/transforms/lib/pytz/zoneinfo/America/Phoenix
branches/transforms/lib/pytz/zoneinfo/America/Port-au-Prince
branches/transforms/lib/pytz/zoneinfo/America/Port_of_Spain
branches/transforms/lib/pytz/zoneinfo/America/Porto_Acre
branches/transforms/lib/pytz/zoneinfo/America/Porto_Velho
branches/transforms/lib/pytz/zoneinfo/America/Puerto_Rico
branches/transforms/lib/pytz/zoneinfo/America/Rainy_River
branches/transforms/lib/pytz/zoneinfo/America/Rankin_Inlet
branches/transforms/lib/pytz/zoneinfo/America/Recife
branches/transforms/lib/pytz/zoneinfo/America/Regina
branches/transforms/lib/pytz/zoneinfo/America/Resolute
branches/transforms/lib/pytz/zoneinfo/America/Rio_Branco
branches/transforms/lib/pytz/zoneinfo/America/Rosario
branches/transforms/lib/pytz/zoneinfo/America/Santiago
branches/transforms/lib/pytz/zoneinfo/America/Santo_Domingo
branches/transforms/lib/pytz/zoneinfo/America/Sao_Paulo
branches/transforms/lib/pytz/zoneinfo/America/Scoresbysund
branches/transforms/lib/pytz/zoneinfo/America/Shiprock
branches/transforms/lib/pytz/zoneinfo/America/St_Johns
branches/transforms/lib/pytz/zoneinfo/America/St_Kitts
branches/transforms/lib/pytz/zoneinfo/America/St_Lucia
branches/transforms/lib/pytz/zoneinfo/America/St_Thomas
branches/transforms/lib/pytz/zoneinfo/America/St_Vincent
branches/transforms/lib/pytz/zoneinfo/America/Swift_Current
branches/transforms/lib/pytz/zoneinfo/America/Tegucigalpa
branches/transforms/lib/pytz/zoneinfo/America/Thule
branches/transforms/lib/pytz/zoneinfo/America/Thunder_Bay
branches/transforms/lib/pytz/zoneinfo/America/Tijuana
branches/transforms/lib/pytz/zoneinfo/America/Toronto
branches/transforms/lib/pytz/zoneinfo/America/Tortola
branches/transforms/lib/pytz/zoneinfo/America/Vancouver
branches/transforms/lib/pytz/zoneinfo/America/Virgin
branches/transforms/lib/pytz/zoneinfo/America/Whitehorse
branches/transforms/lib/pytz/zoneinfo/America/Winnipeg
branches/transforms/lib/pytz/zoneinfo/America/Yakutat
branches/transforms/lib/pytz/zoneinfo/America/Yellowknife
branches/transforms/lib/pytz/zoneinfo/Antarctica/
branches/transforms/lib/pytz/zoneinfo/Antarctica/Casey
branches/transforms/lib/pytz/zoneinfo/Antarctica/Davis
branches/transforms/lib/pytz/zoneinfo/Antarctica/DumontDUrville
branches/transforms/lib/pytz/zoneinfo/Antarctica/Mawson
branches/transforms/lib/pytz/zoneinfo/Antarctica/McMurdo
branches/transforms/lib/pytz/zoneinfo/Antarctica/Palmer
branches/transforms/lib/pytz/zoneinfo/Antarctica/Rothera
branches/transforms/lib/pytz/zoneinfo/Antarctica/South_Pole
branches/transforms/lib/pytz/zoneinfo/Antarctica/Syowa
branches/transforms/lib/pytz/zoneinfo/Antarctica/Vostok
branches/transforms/lib/pytz/zoneinfo/Arctic/
branches/transforms/lib/pytz/zoneinfo/Arctic/Longyearbyen
branches/transforms/lib/pytz/zoneinfo/Asia/
branches/transforms/lib/pytz/zoneinfo/Asia/Aden
branches/transforms/lib/pytz/zoneinfo/Asia/Almaty
branches/transforms/lib/pytz/zoneinfo/Asia/Amman
branches/transforms/lib/pytz/zoneinfo/Asia/Anadyr
branches/transforms/lib/pytz/zoneinfo/Asia/Aqtau
branches/transforms/lib/pytz/zoneinfo/Asia/Aqtobe
branches/transforms/lib/pytz/zoneinfo/Asia/Ashgabat
branches/transforms/lib/pytz/zoneinfo/Asia/Ashkhabad
branches/transforms/lib/pytz/zoneinfo/Asia/Baghdad
branches/transforms/lib/pytz/zoneinfo/Asia/Bahrain
branches/transforms/lib/pytz/zoneinfo/Asia/Baku
branches/transforms/lib/pytz/zoneinfo/Asia/Bangkok
branches/transforms/lib/pytz/zoneinfo/Asia/Beirut
branches/transforms/lib/pytz/zoneinfo/Asia/Bishkek
branches/transforms/lib/pytz/zoneinfo/Asia/Brunei
branches/transforms/lib/pytz/zoneinfo/Asia/Calcutta
branches/transforms/lib/pytz/zoneinfo/Asia/Choibalsan
branches/transforms/lib/pytz/zoneinfo/Asia/Chongqing
branches/transforms/lib/pytz/zoneinfo/Asia/Chungking
branches/transforms/lib/pytz/zoneinfo/Asia/Colombo
branches/transforms/lib/pytz/zoneinfo/Asia/Dacca
branches/transforms/lib/pytz/zoneinfo/Asia/Damascus
branches/transforms/lib/pytz/zoneinfo/Asia/Dhaka
branches/transforms/lib/pytz/zoneinfo/Asia/Dili
branches/transforms/lib/pytz/zoneinfo/Asia/Dubai
branches/transforms/lib/pytz/zoneinfo/Asia/Dushanbe
branches/transforms/lib/pytz/zoneinfo/Asia/Gaza
branches/transforms/lib/pytz/zoneinfo/Asia/Harbin
branches/transforms/lib/pytz/zoneinfo/Asia/Hong_Kong
branches/transforms/lib/pytz/zoneinfo/Asia/Hovd
branches/transforms/lib/pytz/zoneinfo/Asia/Irkutsk
branches/transforms/lib/pytz/zoneinfo/Asia/Istanbul
branches/transforms/lib/pytz/zoneinfo/Asia/Jakarta
branches/transforms/lib/pytz/zoneinfo/Asia/Jayapura
branches/transforms/lib/pytz/zoneinfo/Asia/Jerusalem
branches/transforms/lib/pytz/zoneinfo/Asia/Kabul
branches/transforms/lib/pytz/zoneinfo/Asia/Kamchatka
branches/transforms/lib/pytz/zoneinfo/Asia/Karachi
branches/transforms/lib/pytz/zoneinfo/Asia/Kashgar
branches/transforms/lib/pytz/zoneinfo/Asia/Katmandu
branches/transforms/lib/pytz/zoneinfo/Asia/Krasnoyarsk
branches/transforms/lib/pytz/zoneinfo/Asia/Kuala_Lumpur
branches/transforms/lib/pytz/zoneinfo/Asia/Kuching
branches/transforms/lib/pytz/zoneinfo/Asia/Kuwait
branches/transforms/lib/pytz/zoneinfo/Asia/Macao
branches/transforms/lib/pytz/zoneinfo/Asia/Macau
branches/transforms/lib/pytz/zoneinfo/Asia/Magadan
branches/transforms/lib/pytz/zoneinfo/Asia/Makassar
branches/transforms/lib/pytz/zoneinfo/Asia/Manila
branches/transforms/lib/pytz/zoneinfo/Asia/Muscat
branches/transforms/lib/pytz/zoneinfo/Asia/Nicosia
branches/transforms/lib/pytz/zoneinfo/Asia/Novosibirsk
branches/transforms/lib/pytz/zoneinfo/Asia/Omsk
branches/transforms/lib/pytz/zoneinfo/Asia/Oral
branches/transforms/lib/pytz/zoneinfo/Asia/Phnom_Penh
branches/transforms/lib/pytz/zoneinfo/Asia/Pontianak
branches/transforms/lib/pytz/zoneinfo/Asia/Pyongyang
branches/transforms/lib/pytz/zoneinfo/Asia/Qatar
branches/transforms/lib/pytz/zoneinfo/Asia/Qyzylorda
branches/transforms/lib/pytz/zoneinfo/Asia/Rangoon
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh87
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh88
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh89
branches/transforms/lib/pytz/zoneinfo/Asia/Saigon
branches/transforms/lib/pytz/zoneinfo/Asia/Sakhalin
branches/transforms/lib/pytz/zoneinfo/Asia/Samarkand
branches/transforms/lib/pytz/zoneinfo/Asia/Seoul
branches/transforms/lib/pytz/zoneinfo/Asia/Shanghai
branches/transforms/lib/pytz/zoneinfo/Asia/Singapore
branches/transforms/lib/pytz/zoneinfo/Asia/Taipei
branches/transforms/lib/pytz/zoneinfo/Asia/Tashkent
branches/transforms/lib/pytz/zoneinfo/Asia/Tbilisi
branches/transforms/lib/pytz/zoneinfo/Asia/Tehran
branches/transforms/lib/pytz/zoneinfo/Asia/Tel_Aviv
branches/transforms/lib/pytz/zoneinfo/Asia/Thimbu
branches/transforms/lib/pytz/zoneinfo/Asia/Thimphu
branches/transforms/lib/pytz/zoneinfo/Asia/Tokyo
branches/transforms/lib/pytz/zoneinfo/Asia/Ujung_Pandang
branches/transforms/lib/pytz/zoneinfo/Asia/Ulaanbaatar
branches/transforms/lib/pytz/zoneinfo/Asia/Ulan_Bator
branches/transforms/lib/pytz/zoneinfo/Asia/Urumqi
branches/transforms/lib/pytz/zoneinfo/Asia/Vientiane
branches/transforms/lib/pytz/zoneinfo/Asia/Vladivostok
branches/transforms/lib/pytz/zoneinfo/Asia/Yakutsk
branches/transforms/lib/pytz/zoneinfo/Asia/Yekaterinburg
branches/transforms/lib/pytz/zoneinfo/Asia/Yerevan
branches/transforms/lib/pytz/zoneinfo/Atlantic/
branches/transforms/lib/pytz/zoneinfo/Atlantic/Azores
branches/transforms/lib/pytz/zoneinfo/Atlantic/Bermuda
branches/transforms/lib/pytz/zoneinfo/Atlantic/Canary
branches/transforms/lib/pytz/zoneinfo/Atlantic/Cape_Verde
branches/transforms/lib/pytz/zoneinfo/Atlantic/Faeroe
branches/transforms/lib/pytz/zoneinfo/Atlantic/Faroe
branches/transforms/lib/pytz/zoneinfo/Atlantic/Jan_Mayen
branches/transforms/lib/pytz/zoneinfo/Atlantic/Madeira
branches/transforms/lib/pytz/zoneinfo/Atlantic/Reykjavik
branches/transforms/lib/pytz/zoneinfo/Atlantic/South_Georgia
branches/transforms/lib/pytz/zoneinfo/Atlantic/St_Helena
branches/transforms/lib/pytz/zoneinfo/Atlantic/Stanley
branches/transforms/lib/pytz/zoneinfo/Australia/
branches/transforms/lib/pytz/zoneinfo/Australia/ACT
branches/transforms/lib/pytz/zoneinfo/Australia/Adelaide
branches/transforms/lib/pytz/zoneinfo/Australia/Brisbane
branches/transforms/lib/pytz/zoneinfo/Australia/Broken_Hill
branches/transforms/lib/pytz/zoneinfo/Australia/Canberra
branches/transforms/lib/pytz/zoneinfo/Australia/Currie
branches/transforms/lib/pytz/zoneinfo/Australia/Darwin
branches/transforms/lib/pytz/zoneinfo/Australia/Eucla
branches/transforms/lib/pytz/zoneinfo/Australia/Hobart
branches/transforms/lib/pytz/zoneinfo/Australia/LHI
branches/transforms/lib/pytz/zoneinfo/Australia/Lindeman
branches/transforms/lib/pytz/zoneinfo/Australia/Lord_Howe
branches/transforms/lib/pytz/zoneinfo/Australia/Melbourne
branches/transforms/lib/pytz/zoneinfo/Australia/NSW
branches/transforms/lib/pytz/zoneinfo/Australia/North
branches/transforms/lib/pytz/zoneinfo/Australia/Perth
branches/transforms/lib/pytz/zoneinfo/Australia/Queensland
branches/transforms/lib/pytz/zoneinfo/Australia/South
branches/transforms/lib/pytz/zoneinfo/Australia/Sydney
branches/transforms/lib/pytz/zoneinfo/Australia/Tasmania
branches/transforms/lib/pytz/zoneinfo/Australia/Victoria
branches/transforms/lib/pytz/zoneinfo/Australia/West
branches/transforms/lib/pytz/zoneinfo/Australia/Yancowinna
branches/transforms/lib/pytz/zoneinfo/Brazil/
branches/transforms/lib/pytz/zoneinfo/Brazil/Acre
branches/transforms/lib/pytz/zoneinfo/Brazil/DeNoronha
branches/transforms/lib/pytz/zoneinfo/Brazil/East
branches/transforms/lib/pytz/zoneinfo/Brazil/West
branches/transforms/lib/pytz/zoneinfo/CET
branches/transforms/lib/pytz/zoneinfo/CST6CDT
branches/transforms/lib/pytz/zoneinfo/Canada/
branches/transforms/lib/pytz/zoneinfo/Canada/Atlantic
branches/transforms/lib/pytz/zoneinfo/Canada/Central
branches/transforms/lib/pytz/zoneinfo/Canada/East-Saskatchewan
branches/transforms/lib/pytz/zoneinfo/Canada/Eastern
branches/transforms/lib/pytz/zoneinfo/Canada/Mountain
branches/transforms/lib/pytz/zoneinfo/Canada/Newfoundland
branches/transforms/lib/pytz/zoneinfo/Canada/Pacific
branches/transforms/lib/pytz/zoneinfo/Canada/Saskatchewan
branches/transforms/lib/pytz/zoneinfo/Canada/Yukon
branches/transforms/lib/pytz/zoneinfo/Chile/
branches/transforms/lib/pytz/zoneinfo/Chile/Continental
branches/transforms/lib/pytz/zoneinfo/Chile/EasterIsland
branches/transforms/lib/pytz/zoneinfo/Cuba
branches/transforms/lib/pytz/zoneinfo/EET
branches/transforms/lib/pytz/zoneinfo/EST
branches/transforms/lib/pytz/zoneinfo/EST5EDT
branches/transforms/lib/pytz/zoneinfo/Egypt
branches/transforms/lib/pytz/zoneinfo/Eire
branches/transforms/lib/pytz/zoneinfo/Etc/
branches/transforms/lib/pytz/zoneinfo/Etc/GMT
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+0
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+1
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+10
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+11
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+12
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+2
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+3
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+4
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+5
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+6
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+7
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+8
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+9
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-0
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-1
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-10
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-11
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-12
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-13
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-14
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-2
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-3
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-4
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-5
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-6
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-7
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-8
branches/transforms/lib/pytz/zoneinfo/Etc/GMT-9
branches/transforms/lib/pytz/zoneinfo/Etc/GMT0
branches/transforms/lib/pytz/zoneinfo/Etc/Greenwich
branches/transforms/lib/pytz/zoneinfo/Etc/UCT
branches/transforms/lib/pytz/zoneinfo/Etc/UTC
branches/transforms/lib/pytz/zoneinfo/Etc/Universal
branches/transforms/lib/pytz/zoneinfo/Etc/Zulu
branches/transforms/lib/pytz/zoneinfo/Europe/
branches/transforms/lib/pytz/zoneinfo/Europe/Amsterdam
branches/transforms/lib/pytz/zoneinfo/Europe/Andorra
branches/transforms/lib/pytz/zoneinfo/Europe/Athens
branches/transforms/lib/pytz/zoneinfo/Europe/Belfast
branches/transforms/lib/pytz/zoneinfo/Europe/Belgrade
branches/transforms/lib/pytz/zoneinfo/Europe/Berlin
branches/transforms/lib/pytz/zoneinfo/Europe/Bratislava
branches/transforms/lib/pytz/zoneinfo/Europe/Brussels
branches/transforms/lib/pytz/zoneinfo/Europe/Bucharest
branches/transforms/lib/pytz/zoneinfo/Europe/Budapest
branches/transforms/lib/pytz/zoneinfo/Europe/Chisinau
branches/transforms/lib/pytz/zoneinfo/Europe/Copenhagen
branches/transforms/lib/pytz/zoneinfo/Europe/Dublin
branches/transforms/lib/pytz/zoneinfo/Europe/Gibraltar
branches/transforms/lib/pytz/zoneinfo/Europe/Guernsey
branches/transforms/lib/pytz/zoneinfo/Europe/Helsinki
branches/transforms/lib/pytz/zoneinfo/Europe/Isle_of_Man
branches/transforms/lib/pytz/zoneinfo/Europe/Istanbul
branches/transforms/lib/pytz/zoneinfo/Europe/Jersey
branches/transforms/lib/pytz/zoneinfo/Europe/Kaliningrad
branches/transforms/lib/pytz/zoneinfo/Europe/Kiev
branches/transforms/lib/pytz/zoneinfo/Europe/Lisbon
branches/transforms/lib/pytz/zoneinfo/Europe/Ljubljana
branches/transforms/lib/pytz/zoneinfo/Europe/London
branches/transforms/lib/pytz/zoneinfo/Europe/Luxembourg
branches/transforms/lib/pytz/zoneinfo/Europe/Madrid
branches/transforms/lib/pytz/zoneinfo/Europe/Malta
branches/transforms/lib/pytz/zoneinfo/Europe/Mariehamn
branches/transforms/lib/pytz/zoneinfo/Europe/Minsk
branches/transforms/lib/pytz/zoneinfo/Europe/Monaco
branches/transforms/lib/pytz/zoneinfo/Europe/Moscow
branches/transforms/lib/pytz/zoneinfo/Europe/Nicosia
branches/transforms/lib/pytz/zoneinfo/Europe/Oslo
branches/transforms/lib/pytz/zoneinfo/Europe/Paris
branches/transforms/lib/pytz/zoneinfo/Europe/Podgorica
branches/transforms/lib/pytz/zoneinfo/Europe/Prague
branches/transforms/lib/pytz/zoneinfo/Europe/Riga
branches/transforms/lib/pytz/zoneinfo/Europe/Rome
branches/transforms/lib/pytz/zoneinfo/Europe/Samara
branches/transforms/lib/pytz/zoneinfo/Europe/San_Marino
branches/transforms/lib/pytz/zoneinfo/Europe/Sarajevo
branches/transforms/lib/pytz/zoneinfo/Europe/Simferopol
branches/transforms/lib/pytz/zoneinfo/Europe/Skopje
branches/transforms/lib/pytz/zoneinfo/Europe/Sofia
branches/transforms/lib/pytz/zoneinfo/Europe/Stockholm
branches/transforms/lib/pytz/zoneinfo/Europe/Tallinn
branches/transforms/lib/pytz/zoneinfo/Europe/Tirane
branches/transforms/lib/pytz/zoneinfo/Europe/Tiraspol
branches/transforms/lib/pytz/zoneinfo/Europe/Uzhgorod
branches/transforms/lib/pytz/zoneinfo/Europe/Vaduz
branches/transforms/lib/pytz/zoneinfo/Europe/Vatican
branches/transforms/lib/pytz/zoneinfo/Europe/Vienna
branches/transforms/lib/pytz/zoneinfo/Europe/Vilnius
branches/transforms/lib/pytz/zoneinfo/Europe/Volgograd
branches/transforms/lib/pytz/zoneinfo/Europe/Warsaw
branches/transforms/lib/pytz/zoneinfo/Europe/Zagreb
branches/transforms/lib/pytz/zoneinfo/Europe/Zaporozhye
branches/transforms/lib/pytz/zoneinfo/Europe/Zurich
branches/transforms/lib/pytz/zoneinfo/Factory
branches/transforms/lib/pytz/zoneinfo/GB
branches/transforms/lib/pytz/zoneinfo/GB-Eire
branches/transforms/lib/pytz/zoneinfo/GMT
branches/transforms/lib/pytz/zoneinfo/GMT+0
branches/transforms/lib/pytz/zoneinfo/GMT-0
branches/transforms/lib/pytz/zoneinfo/GMT0
branches/transforms/lib/pytz/zoneinfo/Greenwich
branches/transforms/lib/pytz/zoneinfo/HST
branches/transforms/lib/pytz/zoneinfo/Hongkong
branches/transforms/lib/pytz/zoneinfo/Iceland
branches/transforms/lib/pytz/zoneinfo/Indian/
branches/transforms/lib/pytz/zoneinfo/Indian/Antananarivo
branches/transforms/lib/pytz/zoneinfo/Indian/Chagos
branches/transforms/lib/pytz/zoneinfo/Indian/Christmas
branches/transforms/lib/pytz/zoneinfo/Indian/Cocos
branches/transforms/lib/pytz/zoneinfo/Indian/Comoro
branches/transforms/lib/pytz/zoneinfo/Indian/Kerguelen
branches/transforms/lib/pytz/zoneinfo/Indian/Mahe
branches/transforms/lib/pytz/zoneinfo/Indian/Maldives
branches/transforms/lib/pytz/zoneinfo/Indian/Mauritius
branches/transforms/lib/pytz/zoneinfo/Indian/Mayotte
branches/transforms/lib/pytz/zoneinfo/Indian/Reunion
branches/transforms/lib/pytz/zoneinfo/Iran
branches/transforms/lib/pytz/zoneinfo/Israel
branches/transforms/lib/pytz/zoneinfo/Jamaica
branches/transforms/lib/pytz/zoneinfo/Japan
branches/transforms/lib/pytz/zoneinfo/Kwajalein
branches/transforms/lib/pytz/zoneinfo/Libya
branches/transforms/lib/pytz/zoneinfo/MET
branches/transforms/lib/pytz/zoneinfo/MST
branches/transforms/lib/pytz/zoneinfo/MST7MDT
branches/transforms/lib/pytz/zoneinfo/Mexico/
branches/transforms/lib/pytz/zoneinfo/Mexico/BajaNorte
branches/transforms/lib/pytz/zoneinfo/Mexico/BajaSur
branches/transforms/lib/pytz/zoneinfo/Mexico/General
branches/transforms/lib/pytz/zoneinfo/Mideast/
branches/transforms/lib/pytz/zoneinfo/Mideast/Riyadh87
branches/transforms/lib/pytz/zoneinfo/Mideast/Riyadh88
branches/transforms/lib/pytz/zoneinfo/Mideast/Riyadh89
branches/transforms/lib/pytz/zoneinfo/NZ
branches/transforms/lib/pytz/zoneinfo/NZ-CHAT
branches/transforms/lib/pytz/zoneinfo/Navajo
branches/transforms/lib/pytz/zoneinfo/PRC
branches/transforms/lib/pytz/zoneinfo/PST8PDT
branches/transforms/lib/pytz/zoneinfo/Pacific/
branches/transforms/lib/pytz/zoneinfo/Pacific/Apia
branches/transforms/lib/pytz/zoneinfo/Pacific/Auckland
branches/transforms/lib/pytz/zoneinfo/Pacific/Chatham
branches/transforms/lib/pytz/zoneinfo/Pacific/Easter
branches/transforms/lib/pytz/zoneinfo/Pacific/Efate
branches/transforms/lib/pytz/zoneinfo/Pacific/Enderbury
branches/transforms/lib/pytz/zoneinfo/Pacific/Fakaofo
branches/transforms/lib/pytz/zoneinfo/Pacific/Fiji
branches/transforms/lib/pytz/zoneinfo/Pacific/Funafuti
branches/transforms/lib/pytz/zoneinfo/Pacific/Galapagos
branches/transforms/lib/pytz/zoneinfo/Pacific/Gambier
branches/transforms/lib/pytz/zoneinfo/Pacific/Guadalcanal
branches/transforms/lib/pytz/zoneinfo/Pacific/Guam
branches/transforms/lib/pytz/zoneinfo/Pacific/Honolulu
branches/transforms/lib/pytz/zoneinfo/Pacific/Johnston
branches/transforms/lib/pytz/zoneinfo/Pacific/Kiritimati
branches/transforms/lib/pytz/zoneinfo/Pacific/Kosrae
branches/transforms/lib/pytz/zoneinfo/Pacific/Kwajalein
branches/transforms/lib/pytz/zoneinfo/Pacific/Majuro
branches/transforms/lib/pytz/zoneinfo/Pacific/Marquesas
branches/transforms/lib/pytz/zoneinfo/Pacific/Midway
branches/transforms/lib/pytz/zoneinfo/Pacific/Nauru
branches/transforms/lib/pytz/zoneinfo/Pacific/Niue
branches/transforms/lib/pytz/zoneinfo/Pacific/Norfolk
branches/transforms/lib/pytz/zoneinfo/Pacific/Noumea
branches/transforms/lib/pytz/zoneinfo/Pacific/Pago_Pago
branches/transforms/lib/pytz/zoneinfo/Pacific/Palau
branches/transforms/lib/pytz/zoneinfo/Pacific/Pitcairn
branches/transforms/lib/pytz/zoneinfo/Pacific/Ponape
branches/transforms/lib/pytz/zoneinfo/Pacific/Port_Moresby
branches/transforms/lib/pytz/zoneinfo/Pacific/Rarotonga
branches/transforms/lib/pytz/zoneinfo/Pacific/Saipan
branches/transforms/lib/pytz/zoneinfo/Pacific/Samoa
branches/transforms/lib/pytz/zoneinfo/Pacific/Tahiti
branches/transforms/lib/pytz/zoneinfo/Pacific/Tarawa
branches/transforms/lib/pytz/zoneinfo/Pacific/Tongatapu
branches/transforms/lib/pytz/zoneinfo/Pacific/Truk
branches/transforms/lib/pytz/zoneinfo/Pacific/Wake
branches/transforms/lib/pytz/zoneinfo/Pacific/Wallis
branches/transforms/lib/pytz/zoneinfo/Pacific/Yap
branches/transforms/lib/pytz/zoneinfo/Poland
branches/transforms/lib/pytz/zoneinfo/Portugal
branches/transforms/lib/pytz/zoneinfo/ROC
branches/transforms/lib/pytz/zoneinfo/ROK
branches/transforms/lib/pytz/zoneinfo/Singapore
branches/transforms/lib/pytz/zoneinfo/Turkey
branches/transforms/lib/pytz/zoneinfo/UCT
branches/transforms/lib/pytz/zoneinfo/US/
branches/transforms/lib/pytz/zoneinfo/US/Alaska
branches/transforms/lib/pytz/zoneinfo/US/Aleutian
branches/transforms/lib/pytz/zoneinfo/US/Arizona
branches/transforms/lib/pytz/zoneinfo/US/Central
branches/transforms/lib/pytz/zoneinfo/US/East-Indiana
branches/transforms/lib/pytz/zoneinfo/US/Eastern
branches/transforms/lib/pytz/zoneinfo/US/Hawaii
branches/transforms/lib/pytz/zoneinfo/US/Indiana-Starke
branches/transforms/lib/pytz/zoneinfo/US/Michigan
branches/transforms/lib/pytz/zoneinfo/US/Mountain
branches/transforms/lib/pytz/zoneinfo/US/Pacific
branches/transforms/lib/pytz/zoneinfo/US/Pacific-New
branches/transforms/lib/pytz/zoneinfo/US/Samoa
branches/transforms/lib/pytz/zoneinfo/UTC
branches/transforms/lib/pytz/zoneinfo/Universal
branches/transforms/lib/pytz/zoneinfo/W-SU
branches/transforms/lib/pytz/zoneinfo/WET
branches/transforms/lib/pytz/zoneinfo/Zulu
branches/transforms/lib/pytz/zoneinfo/iso3166.tab
branches/transforms/lib/pytz/zoneinfo/localtime
branches/transforms/lib/pytz/zoneinfo/posixrules
branches/transforms/lib/pytz/zoneinfo/zone.tab
Removed Paths:
-------------
branches/transforms/lib/enthought/traits/__init__.pyc
branches/transforms/lib/enthought/traits/ui/__init__.pyc
branches/transforms/lib/matplotlib/config/configobj.py
branches/transforms/lib/matplotlib/enthought/
branches/transforms/lib/pytz/CHANGES.txt
branches/transforms/lib/pytz/LICENSE.txt
branches/transforms/lib/pytz/README.txt
branches/transforms/lib/pytz/__init__.py
branches/transforms/lib/pytz/reference.py
branches/transforms/lib/pytz/tzfile.py
branches/transforms/lib/pytz/tzinfo.py
branches/transforms/lib/pytz/zoneinfo/
branches/transforms/lib/pytz/zoneinfo/Africa/
branches/transforms/lib/pytz/zoneinfo/Africa/Abidjan
branches/transforms/lib/pytz/zoneinfo/Africa/Accra
branches/transforms/lib/pytz/zoneinfo/Africa/Addis_Ababa
branches/transforms/lib/pytz/zoneinfo/Africa/Algiers
branches/transforms/lib/pytz/zoneinfo/Africa/Asmara
branches/transforms/lib/pytz/zoneinfo/Africa/Asmera
branches/transforms/lib/pytz/zoneinfo/Africa/Bamako
branches/transforms/lib/pytz/zoneinfo/Africa/Bangui
branches/transforms/lib/pytz/zoneinfo/Africa/Banjul
branches/transforms/lib/pytz/zoneinfo/Africa/Bissau
branches/transforms/lib/pytz/zoneinfo/Africa/Blantyre
branches/transforms/lib/pytz/zoneinfo/Africa/Brazzaville
branches/transforms/lib/pytz/zoneinfo/Africa/Bujumbura
branches/transforms/lib/pytz/zoneinfo/Africa/Cairo
branches/transforms/lib/pytz/zoneinfo/Africa/Casablanca
branches/transforms/lib/pytz/zoneinfo/Africa/Ceuta
branches/transforms/lib/pytz/zoneinfo/Africa/Conakry
branches/transforms/lib/pytz/zoneinfo/Africa/Dakar
branches/transforms/lib/pytz/zoneinfo/Africa/Dar_es_Salaam
branches/transforms/lib/pytz/zoneinfo/Africa/Djibouti
branches/transforms/lib/pytz/zoneinfo/Africa/Douala
branches/transforms/lib/pytz/zoneinfo/Africa/El_Aaiun
branches/transforms/lib/pytz/zoneinfo/Africa/Freetown
branches/transforms/lib/pytz/zoneinfo/Africa/Gaborone
branches/transforms/lib/pytz/zoneinfo/Africa/Harare
branches/transforms/lib/pytz/zoneinfo/Africa/Johannesburg
branches/transforms/lib/pytz/zoneinfo/Africa/Kampala
branches/transforms/lib/pytz/zoneinfo/Africa/Khartoum
branches/transforms/lib/pytz/zoneinfo/Africa/Kigali
branches/transforms/lib/pytz/zoneinfo/Africa/Kinshasa
branches/transforms/lib/pytz/zoneinfo/Africa/Lagos
branches/transforms/lib/pytz/zoneinfo/Africa/Libreville
branches/transforms/lib/pytz/zoneinfo/Africa/Lome
branches/transforms/lib/pytz/zoneinfo/Africa/Luanda
branches/transforms/lib/pytz/zoneinfo/Africa/Lubumbashi
branches/transforms/lib/pytz/zoneinfo/Africa/Lusaka
branches/transforms/lib/pytz/zoneinfo/Africa/Malabo
branches/transforms/lib/pytz/zoneinfo/Africa/Maputo
branches/transforms/lib/pytz/zoneinfo/Africa/Maseru
branches/transforms/lib/pytz/zoneinfo/Africa/Mbabane
branches/transforms/lib/pytz/zoneinfo/Africa/Mogadishu
branches/transforms/lib/pytz/zoneinfo/Africa/Monrovia
branches/transforms/lib/pytz/zoneinfo/Africa/Nairobi
branches/transforms/lib/pytz/zoneinfo/Africa/Ndjamena
branches/transforms/lib/pytz/zoneinfo/Africa/Niamey
branches/transforms/lib/pytz/zoneinfo/Africa/Nouakchott
branches/transforms/lib/pytz/zoneinfo/Africa/Ouagadougou
branches/transforms/lib/pytz/zoneinfo/Africa/Porto-Novo
branches/transforms/lib/pytz/zoneinfo/Africa/Sao_Tome
branches/transforms/lib/pytz/zoneinfo/Africa/Timbuktu
branches/transforms/lib/pytz/zoneinfo/Africa/Tripoli
branches/transforms/lib/pytz/zoneinfo/Africa/Tunis
branches/transforms/lib/pytz/zoneinfo/Africa/Windhoek
branches/transforms/lib/pytz/zoneinfo/America/
branches/transforms/lib/pytz/zoneinfo/America/Adak
branches/transforms/lib/pytz/zoneinfo/America/Anchorage
branches/transforms/lib/pytz/zoneinfo/America/Anguilla
branches/transforms/lib/pytz/zoneinfo/America/Antigua
branches/transforms/lib/pytz/zoneinfo/America/Araguaina
branches/transforms/lib/pytz/zoneinfo/America/Argentina/
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Catamarca
branches/transforms/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Cordoba
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Jujuy
branches/transforms/lib/pytz/zoneinfo/America/Argentina/La_Rioja
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Mendoza
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos
branches/transforms/lib/pytz/zoneinfo/America/Argentina/San_Juan
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Tucuman
branches/transforms/lib/pytz/zoneinfo/America/Argentina/Ushuaia
branches/transforms/lib/pytz/zoneinfo/America/Aruba
branches/transforms/lib/pytz/zoneinfo/America/Asuncion
branches/transforms/lib/pytz/zoneinfo/America/Atikokan
branches/transforms/lib/pytz/zoneinfo/America/Atka
branches/transforms/lib/pytz/zoneinfo/America/Bahia
branches/transforms/lib/pytz/zoneinfo/America/Barbados
branches/transforms/lib/pytz/zoneinfo/America/Belem
branches/transforms/lib/pytz/zoneinfo/America/Belize
branches/transforms/lib/pytz/zoneinfo/America/Blanc-Sablon
branches/transforms/lib/pytz/zoneinfo/America/Boa_Vista
branches/transforms/lib/pytz/zoneinfo/America/Bogota
branches/transforms/lib/pytz/zoneinfo/America/Boise
branches/transforms/lib/pytz/zoneinfo/America/Buenos_Aires
branches/transforms/lib/pytz/zoneinfo/America/Cambridge_Bay
branches/transforms/lib/pytz/zoneinfo/America/Campo_Grande
branches/transforms/lib/pytz/zoneinfo/America/Cancun
branches/transforms/lib/pytz/zoneinfo/America/Caracas
branches/transforms/lib/pytz/zoneinfo/America/Catamarca
branches/transforms/lib/pytz/zoneinfo/America/Cayenne
branches/transforms/lib/pytz/zoneinfo/America/Cayman
branches/transforms/lib/pytz/zoneinfo/America/Chicago
branches/transforms/lib/pytz/zoneinfo/America/Chihuahua
branches/transforms/lib/pytz/zoneinfo/America/Coral_Harbour
branches/transforms/lib/pytz/zoneinfo/America/Cordoba
branches/transforms/lib/pytz/zoneinfo/America/Costa_Rica
branches/transforms/lib/pytz/zoneinfo/America/Cuiaba
branches/transforms/lib/pytz/zoneinfo/America/Curacao
branches/transforms/lib/pytz/zoneinfo/America/Danmarkshavn
branches/transforms/lib/pytz/zoneinfo/America/Dawson
branches/transforms/lib/pytz/zoneinfo/America/Dawson_Creek
branches/transforms/lib/pytz/zoneinfo/America/Denver
branches/transforms/lib/pytz/zoneinfo/America/Detroit
branches/transforms/lib/pytz/zoneinfo/America/Dominica
branches/transforms/lib/pytz/zoneinfo/America/Edmonton
branches/transforms/lib/pytz/zoneinfo/America/Eirunepe
branches/transforms/lib/pytz/zoneinfo/America/El_Salvador
branches/transforms/lib/pytz/zoneinfo/America/Ensenada
branches/transforms/lib/pytz/zoneinfo/America/Fort_Wayne
branches/transforms/lib/pytz/zoneinfo/America/Fortaleza
branches/transforms/lib/pytz/zoneinfo/America/Glace_Bay
branches/transforms/lib/pytz/zoneinfo/America/Godthab
branches/transforms/lib/pytz/zoneinfo/America/Goose_Bay
branches/transforms/lib/pytz/zoneinfo/America/Grand_Turk
branches/transforms/lib/pytz/zoneinfo/America/Grenada
branches/transforms/lib/pytz/zoneinfo/America/Guadeloupe
branches/transforms/lib/pytz/zoneinfo/America/Guatemala
branches/transforms/lib/pytz/zoneinfo/America/Guayaquil
branches/transforms/lib/pytz/zoneinfo/America/Guyana
branches/transforms/lib/pytz/zoneinfo/America/Halifax
branches/transforms/lib/pytz/zoneinfo/America/Havana
branches/transforms/lib/pytz/zoneinfo/America/Hermosillo
branches/transforms/lib/pytz/zoneinfo/America/Indiana/
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Indianapolis
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Knox
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Marengo
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Petersburg
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Tell_City
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Vevay
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Vincennes
branches/transforms/lib/pytz/zoneinfo/America/Indiana/Winamac
branches/transforms/lib/pytz/zoneinfo/America/Indianapolis
branches/transforms/lib/pytz/zoneinfo/America/Inuvik
branches/transforms/lib/pytz/zoneinfo/America/Iqaluit
branches/transforms/lib/pytz/zoneinfo/America/Jamaica
branches/transforms/lib/pytz/zoneinfo/America/Jujuy
branches/transforms/lib/pytz/zoneinfo/America/Juneau
branches/transforms/lib/pytz/zoneinfo/America/Kentucky/
branches/transforms/lib/pytz/zoneinfo/America/Kentucky/Louisville
branches/transforms/lib/pytz/zoneinfo/America/Kentucky/Monticello
branches/transforms/lib/pytz/zoneinfo/America/Knox_IN
branches/transforms/lib/pytz/zoneinfo/America/La_Paz
branches/transforms/lib/pytz/zoneinfo/America/Lima
branches/transforms/lib/pytz/zoneinfo/America/Los_Angeles
branches/transforms/lib/pytz/zoneinfo/America/Louisville
branches/transforms/lib/pytz/zoneinfo/America/Maceio
branches/transforms/lib/pytz/zoneinfo/America/Managua
branches/transforms/lib/pytz/zoneinfo/America/Manaus
branches/transforms/lib/pytz/zoneinfo/America/Martinique
branches/transforms/lib/pytz/zoneinfo/America/Mazatlan
branches/transforms/lib/pytz/zoneinfo/America/Mendoza
branches/transforms/lib/pytz/zoneinfo/America/Menominee
branches/transforms/lib/pytz/zoneinfo/America/Merida
branches/transforms/lib/pytz/zoneinfo/America/Mexico_City
branches/transforms/lib/pytz/zoneinfo/America/Miquelon
branches/transforms/lib/pytz/zoneinfo/America/Moncton
branches/transforms/lib/pytz/zoneinfo/America/Monterrey
branches/transforms/lib/pytz/zoneinfo/America/Montevideo
branches/transforms/lib/pytz/zoneinfo/America/Montreal
branches/transforms/lib/pytz/zoneinfo/America/Montserrat
branches/transforms/lib/pytz/zoneinfo/America/Nassau
branches/transforms/lib/pytz/zoneinfo/America/New_York
branches/transforms/lib/pytz/zoneinfo/America/Nipigon
branches/transforms/lib/pytz/zoneinfo/America/Nome
branches/transforms/lib/pytz/zoneinfo/America/Noronha
branches/transforms/lib/pytz/zoneinfo/America/North_Dakota/
branches/transforms/lib/pytz/zoneinfo/America/North_Dakota/Center
branches/transforms/lib/pytz/zoneinfo/America/North_Dakota/New_Salem
branches/transforms/lib/pytz/zoneinfo/America/Panama
branches/transforms/lib/pytz/zoneinfo/America/Pangnirtung
branches/transforms/lib/pytz/zoneinfo/America/Paramaribo
branches/transforms/lib/pytz/zoneinfo/America/Phoenix
branches/transforms/lib/pytz/zoneinfo/America/Port-au-Prince
branches/transforms/lib/pytz/zoneinfo/America/Port_of_Spain
branches/transforms/lib/pytz/zoneinfo/America/Porto_Acre
branches/transforms/lib/pytz/zoneinfo/America/Porto_Velho
branches/transforms/lib/pytz/zoneinfo/America/Puerto_Rico
branches/transforms/lib/pytz/zoneinfo/America/Rainy_River
branches/transforms/lib/pytz/zoneinfo/America/Rankin_Inlet
branches/transforms/lib/pytz/zoneinfo/America/Recife
branches/transforms/lib/pytz/zoneinfo/America/Regina
branches/transforms/lib/pytz/zoneinfo/America/Resolute
branches/transforms/lib/pytz/zoneinfo/America/Rio_Branco
branches/transforms/lib/pytz/zoneinfo/America/Rosario
branches/transforms/lib/pytz/zoneinfo/America/Santiago
branches/transforms/lib/pytz/zoneinfo/America/Santo_Domingo
branches/transforms/lib/pytz/zoneinfo/America/Sao_Paulo
branches/transforms/lib/pytz/zoneinfo/America/Scoresbysund
branches/transforms/lib/pytz/zoneinfo/America/Shiprock
branches/transforms/lib/pytz/zoneinfo/America/St_Johns
branches/transforms/lib/pytz/zoneinfo/America/St_Kitts
branches/transforms/lib/pytz/zoneinfo/America/St_Lucia
branches/transforms/lib/pytz/zoneinfo/America/St_Thomas
branches/transforms/lib/pytz/zoneinfo/America/St_Vincent
branches/transforms/lib/pytz/zoneinfo/America/Swift_Current
branches/transforms/lib/pytz/zoneinfo/America/Tegucigalpa
branches/transforms/lib/pytz/zoneinfo/America/Thule
branches/transforms/lib/pytz/zoneinfo/America/Thunder_Bay
branches/transforms/lib/pytz/zoneinfo/America/Tijuana
branches/transforms/lib/pytz/zoneinfo/America/Toronto
branches/transforms/lib/pytz/zoneinfo/America/Tortola
branches/transforms/lib/pytz/zoneinfo/America/Vancouver
branches/transforms/lib/pytz/zoneinfo/America/Virgin
branches/transforms/lib/pytz/zoneinfo/America/Whitehorse
branches/transforms/lib/pytz/zoneinfo/America/Winnipeg
branches/transforms/lib/pytz/zoneinfo/America/Yakutat
branches/transforms/lib/pytz/zoneinfo/America/Yellowknife
branches/transforms/lib/pytz/zoneinfo/Antarctica/
branches/transforms/lib/pytz/zoneinfo/Antarctica/Casey
branches/transforms/lib/pytz/zoneinfo/Antarctica/Davis
branches/transforms/lib/pytz/zoneinfo/Antarctica/DumontDUrville
branches/transforms/lib/pytz/zoneinfo/Antarctica/Mawson
branches/transforms/lib/pytz/zoneinfo/Antarctica/McMurdo
branches/transforms/lib/pytz/zoneinfo/Antarctica/Palmer
branches/transforms/lib/pytz/zoneinfo/Antarctica/Rothera
branches/transforms/lib/pytz/zoneinfo/Antarctica/South_Pole
branches/transforms/lib/pytz/zoneinfo/Antarctica/Syowa
branches/transforms/lib/pytz/zoneinfo/Antarctica/Vostok
branches/transforms/lib/pytz/zoneinfo/Arctic/
branches/transforms/lib/pytz/zoneinfo/Arctic/Longyearbyen
branches/transforms/lib/pytz/zoneinfo/Asia/
branches/transforms/lib/pytz/zoneinfo/Asia/Aden
branches/transforms/lib/pytz/zoneinfo/Asia/Almaty
branches/transforms/lib/pytz/zoneinfo/Asia/Amman
branches/transforms/lib/pytz/zoneinfo/Asia/Anadyr
branches/transforms/lib/pytz/zoneinfo/Asia/Aqtau
branches/transforms/lib/pytz/zoneinfo/Asia/Aqtobe
branches/transforms/lib/pytz/zoneinfo/Asia/Ashgabat
branches/transforms/lib/pytz/zoneinfo/Asia/Ashkhabad
branches/transforms/lib/pytz/zoneinfo/Asia/Baghdad
branches/transforms/lib/pytz/zoneinfo/Asia/Bahrain
branches/transforms/lib/pytz/zoneinfo/Asia/Baku
branches/transforms/lib/pytz/zoneinfo/Asia/Bangkok
branches/transforms/lib/pytz/zoneinfo/Asia/Beirut
branches/transforms/lib/pytz/zoneinfo/Asia/Bishkek
branches/transforms/lib/pytz/zoneinfo/Asia/Brunei
branches/transforms/lib/pytz/zoneinfo/Asia/Calcutta
branches/transforms/lib/pytz/zoneinfo/Asia/Choibalsan
branches/transforms/lib/pytz/zoneinfo/Asia/Chongqing
branches/transforms/lib/pytz/zoneinfo/Asia/Chungking
branches/transforms/lib/pytz/zoneinfo/Asia/Colombo
branches/transforms/lib/pytz/zoneinfo/Asia/Dacca
branches/transforms/lib/pytz/zoneinfo/Asia/Damascus
branches/transforms/lib/pytz/zoneinfo/Asia/Dhaka
branches/transforms/lib/pytz/zoneinfo/Asia/Dili
branches/transforms/lib/pytz/zoneinfo/Asia/Dubai
branches/transforms/lib/pytz/zoneinfo/Asia/Dushanbe
branches/transforms/lib/pytz/zoneinfo/Asia/Gaza
branches/transforms/lib/pytz/zoneinfo/Asia/Harbin
branches/transforms/lib/pytz/zoneinfo/Asia/Hong_Kong
branches/transforms/lib/pytz/zoneinfo/Asia/Hovd
branches/transforms/lib/pytz/zoneinfo/Asia/Irkutsk
branches/transforms/lib/pytz/zoneinfo/Asia/Istanbul
branches/transforms/lib/pytz/zoneinfo/Asia/Jakarta
branches/transforms/lib/pytz/zoneinfo/Asia/Jayapura
branches/transforms/lib/pytz/zoneinfo/Asia/Jerusalem
branches/transforms/lib/pytz/zoneinfo/Asia/Kabul
branches/transforms/lib/pytz/zoneinfo/Asia/Kamchatka
branches/transforms/lib/pytz/zoneinfo/Asia/Karachi
branches/transforms/lib/pytz/zoneinfo/Asia/Kashgar
branches/transforms/lib/pytz/zoneinfo/Asia/Katmandu
branches/transforms/lib/pytz/zoneinfo/Asia/Krasnoyarsk
branches/transforms/lib/pytz/zoneinfo/Asia/Kuala_Lumpur
branches/transforms/lib/pytz/zoneinfo/Asia/Kuching
branches/transforms/lib/pytz/zoneinfo/Asia/Kuwait
branches/transforms/lib/pytz/zoneinfo/Asia/Macao
branches/transforms/lib/pytz/zoneinfo/Asia/Macau
branches/transforms/lib/pytz/zoneinfo/Asia/Magadan
branches/transforms/lib/pytz/zoneinfo/Asia/Makassar
branches/transforms/lib/pytz/zoneinfo/Asia/Manila
branches/transforms/lib/pytz/zoneinfo/Asia/Muscat
branches/transforms/lib/pytz/zoneinfo/Asia/Nicosia
branches/transforms/lib/pytz/zoneinfo/Asia/Novosibirsk
branches/transforms/lib/pytz/zoneinfo/Asia/Omsk
branches/transforms/lib/pytz/zoneinfo/Asia/Oral
branches/transforms/lib/pytz/zoneinfo/Asia/Phnom_Penh
branches/transforms/lib/pytz/zoneinfo/Asia/Pontianak
branches/transforms/lib/pytz/zoneinfo/Asia/Pyongyang
branches/transforms/lib/pytz/zoneinfo/Asia/Qatar
branches/transforms/lib/pytz/zoneinfo/Asia/Qyzylorda
branches/transforms/lib/pytz/zoneinfo/Asia/Rangoon
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh87
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh88
branches/transforms/lib/pytz/zoneinfo/Asia/Riyadh89
branches/transforms/lib/pytz/zoneinfo/Asia/Saigon
branches/transforms/lib/pytz/zoneinfo/Asia/Sakhalin
branches/transforms/lib/pytz/zoneinfo/Asia/Samarkand
branches/transforms/lib/pytz/zoneinfo/Asia/Seoul
branches/transforms/lib/pytz/zoneinfo/Asia/Shanghai
branches/transforms/lib/pytz/zoneinfo/Asia/Singapore
branches/transforms/lib/pytz/zoneinfo/Asia/Taipei
branches/transforms/lib/pytz/zoneinfo/Asia/Tashkent
branches/transforms/lib/pytz/zoneinfo/Asia/Tbilisi
branches/transforms/lib/pytz/zoneinfo/Asia/Tehran
branches/transforms/lib/pytz/zoneinfo/Asia/Tel_Aviv
branches/transforms/lib/pytz/zoneinfo/Asia/Thimbu
branches/transforms/lib/pytz/zoneinfo/Asia/Thimphu
branches/transforms/lib/pytz/zoneinfo/Asia/Tokyo
branches/transforms/lib/pytz/zoneinfo/Asia/Ujung_Pandang
branches/transforms/lib/pytz/zoneinfo/Asia/Ulaanbaatar
branches/transforms/lib/pytz/zoneinfo/Asia/Ulan_Bator
branches/transforms/lib/pytz/zoneinfo/Asia/Urumqi
branches/transforms/lib/pytz/zoneinfo/Asia/Vientiane
branches/transforms/lib/pytz/zoneinfo/Asia/Vladivostok
branches/transforms/lib/pytz/zoneinfo/Asia/Yakutsk
branches/transforms/lib/pytz/zoneinfo/Asia/Yekaterinburg
branches/transforms/lib/pytz/zoneinfo/Asia/Yerevan
branches/transforms/lib/pytz/zoneinfo/Atlantic/
branches/transforms/lib/pytz/zoneinfo/Atlantic/Azores
branches/transforms/lib/pytz/zoneinfo/Atlantic/Bermuda
branches/transforms/lib/pytz/zoneinfo/Atlantic/Canary
branches/transforms/lib/pytz/zoneinfo/Atlantic/Cape_Verde
branches/transforms/lib/pytz/zoneinfo/Atlantic/Faeroe
branches/transforms/lib/pytz/zoneinfo/Atlantic/Faroe
branches/transforms/lib/pytz/zoneinfo/Atlantic/Jan_Mayen
branches/transforms/lib/pytz/zoneinfo/Atlantic/Madeira
branches/transforms/lib/pytz/zoneinfo/Atlantic/Reykjavik
branches/transforms/lib/pytz/zoneinfo/Atlantic/South_Georgia
branches/transforms/lib/pytz/zoneinfo/Atlantic/St_Helena
branches/transforms/lib/pytz/zoneinfo/Atlantic/Stanley
branches/transforms/lib/pytz/zoneinfo/Australia/
branches/transforms/lib/pytz/zoneinfo/Australia/ACT
branches/transforms/lib/pytz/zoneinfo/Australia/Adelaide
branches/transforms/lib/pytz/zoneinfo/Australia/Brisbane
branches/transforms/lib/pytz/zoneinfo/Australia/Broken_Hill
branches/transforms/lib/pytz/zoneinfo/Australia/Canberra
branches/transforms/lib/pytz/zoneinfo/Australia/Currie
branches/transforms/lib/pytz/zoneinfo/Australia/Darwin
branches/transforms/lib/pytz/zoneinfo/Australia/Eucla
branches/transforms/lib/pytz/zoneinfo/Australia/Hobart
branches/transforms/lib/pytz/zoneinfo/Australia/LHI
branches/transforms/lib/pytz/zoneinfo/Australia/Lindeman
branches/transforms/lib/pytz/zoneinfo/Australia/Lord_Howe
branches/transforms/lib/pytz/zoneinfo/Australia/Melbourne
branches/transforms/lib/pytz/zoneinfo/Australia/NSW
branches/transforms/lib/pytz/zoneinfo/Australia/North
branches/transforms/lib/pytz/zoneinfo/Australia/Perth
branches/transforms/lib/pytz/zoneinfo/Australia/Queensland
branches/transforms/lib/pytz/zoneinfo/Australia/South
branches/transforms/lib/pytz/zoneinfo/Australia/Sydney
branches/transforms/lib/pytz/zoneinfo/Australia/Tasmania
branches/transforms/lib/pytz/zoneinfo/Australia/Victoria
branches/transforms/lib/pytz/zoneinfo/Australia/West
branches/transforms/lib/pytz/zoneinfo/Australia/Yancowinna
branches/transforms/lib/pytz/zoneinfo/Brazil/
branches/transforms/lib/pytz/zoneinfo/Brazil/Acre
branches/transforms/lib/pytz/zoneinfo/Brazil/DeNoronha
branches/transforms/lib/pytz/zoneinfo/Brazil/East
branches/transforms/lib/pytz/zoneinfo/Brazil/West
branches/transforms/lib/pytz/zoneinfo/CET
branches/transforms/lib/pytz/zoneinfo/CST6CDT
branches/transforms/lib/pytz/zoneinfo/Canada/
branches/transforms/lib/pytz/zoneinfo/Canada/Atlantic
branches/transforms/lib/pytz/zoneinfo/Canada/Central
branches/transforms/lib/pytz/zoneinfo/Canada/East-Saskatchewan
branches/transforms/lib/pytz/zoneinfo/Canada/Eastern
branches/transforms/lib/pytz/zoneinfo/Canada/Mountain
branches/transforms/lib/pytz/zoneinfo/Canada/Newfoundland
branches/transforms/lib/pytz/zoneinfo/Canada/Pacific
branches/transforms/lib/pytz/zoneinfo/Canada/Saskatchewan
branches/transforms/lib/pytz/zoneinfo/Canada/Yukon
branches/transforms/lib/pytz/zoneinfo/Chile/
branches/transforms/lib/pytz/zoneinfo/Chile/Continental
branches/transforms/lib/pytz/zoneinfo/Chile/EasterIsland
branches/transforms/lib/pytz/zoneinfo/Cuba
branches/transforms/lib/pytz/zoneinfo/EET
branches/transforms/lib/pytz/zoneinfo/EST
branches/transforms/lib/pytz/zoneinfo/EST5EDT
branches/transforms/lib/pytz/zoneinfo/Egypt
branches/transforms/lib/pytz/zoneinfo/Eire
branches/transforms/lib/pytz/zoneinfo/Etc/
branches/transforms/lib/pytz/zoneinfo/Etc/GMT
branches/transforms/lib/pytz/zoneinfo/Etc/GMT+0
branches/transforms/lib/pytz/zonei...
[truncated message content] |
|
From: <ef...@us...> - 2007-11-09 19:37:20
|
Revision: 4191
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4191&view=rev
Author: efiring
Date: 2007-11-09 11:37:15 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Remove numerix as nx from pylab
Modified Paths:
--------------
trunk/matplotlib/examples/animation_blit_fltk.py
trunk/matplotlib/examples/annotation_demo.py
trunk/matplotlib/examples/barcode_demo.py
trunk/matplotlib/examples/broken_barh.py
trunk/matplotlib/examples/clippath_test.py
trunk/matplotlib/examples/custom_figure_class.py
trunk/matplotlib/examples/date_demo_convert.py
trunk/matplotlib/examples/dynamic_collection.py
trunk/matplotlib/examples/fill_demo2.py
trunk/matplotlib/examples/gradient_bar.py
trunk/matplotlib/examples/interp_demo.py
trunk/matplotlib/examples/lasso_demo.py
trunk/matplotlib/examples/pick_event_demo.py
trunk/matplotlib/examples/scatter_custom_symbol.py
trunk/matplotlib/examples/scatter_star_poly.py
trunk/matplotlib/examples/spy_demos.py
trunk/matplotlib/examples/xcorr_demo.py
trunk/matplotlib/examples/zoom_window.py
trunk/matplotlib/lib/matplotlib/pylab.py
Modified: trunk/matplotlib/examples/animation_blit_fltk.py
===================================================================
--- trunk/matplotlib/examples/animation_blit_fltk.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/animation_blit_fltk.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -3,7 +3,7 @@
import matplotlib
matplotlib.use('FltkAgg')
import pylab as p
-import numpy as nx
+import numpy as npy
import time
@@ -29,7 +29,7 @@
self.background = self.canvas.copy_from_bbox(self.ax.bbox)
self.canvas.restore_region(self.background)
# update the data
- line.set_ydata(nx.sin(x+self.cnt/10.0))
+ line.set_ydata(npy.sin(x+self.cnt/10.0))
# just draw the animated artist
self.ax.draw_artist(line)
# just redraw the axes rectangle
@@ -45,8 +45,8 @@
p.subplots_adjust(left=0.3, bottom=0.3) # check for flipy bugs
p.grid() # to ensure proper background restore
# create the initial line
-x = nx.arange(0,2*nx.pi,0.01)
-line, = p.plot(x, nx.sin(x), animated=True)
+x = npy.arange(0,2*npy.pi,0.01)
+line, = p.plot(x, npy.sin(x), animated=True)
p.draw()
anim=animator(ax)
Modified: trunk/matplotlib/examples/annotation_demo.py
===================================================================
--- trunk/matplotlib/examples/annotation_demo.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/annotation_demo.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -32,17 +32,19 @@
"""
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
from matplotlib.patches import Ellipse
+import numpy as npy
+
if 1:
# if only one location is given, the text and xypoint being
# annotated are assumed to be the same
fig = figure()
ax = fig.add_subplot(111, autoscale_on=False, xlim=(-1,5), ylim=(-3,5))
- t = nx.arange(0.0, 5.0, 0.01)
- s = nx.cos(2*nx.pi*t)
+ t = npy.arange(0.0, 5.0, 0.01)
+ s = npy.cos(2*npy.pi*t)
line, = ax.plot(t, s, lw=3, color='purple')
ax.annotate('axes center', xy=(.5, .5), xycoords='axes fraction',
@@ -85,8 +87,8 @@
# respected
fig = figure()
ax = fig.add_subplot(111, polar=True)
- r = nx.arange(0,1,0.001)
- theta = 2*2*nx.pi*r
+ r = npy.arange(0,1,0.001)
+ theta = 2*2*npy.pi*r
line, = ax.plot(theta, r, color='#ee8d18', lw=3)
ind = 800
@@ -115,8 +117,8 @@
ax.add_artist(el)
el.set_clip_box(ax.bbox)
ax.annotate('the top',
- xy=(nx.pi/2., 10.), # theta, radius
- xytext=(nx.pi/3, 20.), # theta, radius
+ xy=(npy.pi/2., 10.), # theta, radius
+ xytext=(npy.pi/3, 20.), # theta, radius
xycoords='polar',
textcoords='polar',
arrowprops=dict(facecolor='black', shrink=0.05),
Modified: trunk/matplotlib/examples/barcode_demo.py
===================================================================
--- trunk/matplotlib/examples/barcode_demo.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/barcode_demo.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,14 +1,16 @@
-from pylab import figure, show, cm, nx
+from matplotlib.pyplot import figure, show, cm
+from numpy import where
+from numpy.random import rand
# the bar
-x = nx.where(nx.mlab.rand(500)>0.7, 1.0, 0.0)
+x = where(rand(500)>0.7, 1.0, 0.0)
axprops = dict(xticks=[], yticks=[])
barprops = dict(aspect='auto', cmap=cm.binary, interpolation='nearest')
fig = figure()
-# a vertical barcode
+# a vertical barcode -- this is broken at present
x.shape = len(x), 1
ax = fig.add_axes([0.1, 0.3, 0.1, 0.6], **axprops)
ax.imshow(x, **barprops)
Modified: trunk/matplotlib/examples/broken_barh.py
===================================================================
--- trunk/matplotlib/examples/broken_barh.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/broken_barh.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -2,7 +2,7 @@
"""
Make a "broken" horizontal bar plot, ie one with gaps
"""
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
fig = figure()
ax = fig.add_subplot(111)
Modified: trunk/matplotlib/examples/clippath_test.py
===================================================================
--- trunk/matplotlib/examples/clippath_test.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/clippath_test.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,9 +1,10 @@
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
import matplotlib.transforms as transforms
from matplotlib.patches import RegularPolygon
import matplotlib.agg as agg
+from numpy import arange, sin, pi
+from numpy.random import rand
-
class ClipWindow:
def __init__(self, ax, line):
self.ax = ax
@@ -58,9 +59,9 @@
fig = figure(figsize=(8,8))
ax = fig.add_subplot(111)
-t = nx.arange(0.0, 4.0, 0.01)
-s = 2*nx.sin(2*nx.pi*8*t)
+t = arange(0.0, 4.0, 0.01)
+s = 2*sin(2*pi*8*t)
-line, = ax.plot(t, 2*(nx.mlab.rand(len(t))-0.5), 'b-')
+line, = ax.plot(t, 2*(rand(len(t))-0.5), 'b-')
clipwin = ClipWindow(ax, line)
show()
Modified: trunk/matplotlib/examples/custom_figure_class.py
===================================================================
--- trunk/matplotlib/examples/custom_figure_class.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/custom_figure_class.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,7 +1,7 @@
"""
You can pass a custom Figure constructor to figure if youy want to derive from the default Figure. This simple example creates a figure with a figure title
"""
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
from matplotlib.figure import Figure
class MyFigure(Figure):
Modified: trunk/matplotlib/examples/date_demo_convert.py
===================================================================
--- trunk/matplotlib/examples/date_demo_convert.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/date_demo_convert.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,16 +1,16 @@
#!/usr/bin/env python
import datetime
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
from matplotlib.dates import DayLocator, HourLocator, DateFormatter, drange
+from numpy import arange
-
date1 = datetime.datetime( 2000, 3, 2)
date2 = datetime.datetime( 2000, 3, 6)
delta = datetime.timedelta(hours=6)
dates = drange(date1, date2, delta)
-y = nx.arange( len(dates)*1.0)
+y = arange( len(dates)*1.0)
fig = figure()
ax = fig.add_subplot(111)
@@ -25,7 +25,7 @@
# tick, not the base multiple
ax.xaxis.set_major_locator( DayLocator() )
-ax.xaxis.set_minor_locator( HourLocator(nx.arange(0,25,6)) )
+ax.xaxis.set_minor_locator( HourLocator(arange(0,25,6)) )
ax.xaxis.set_major_formatter( DateFormatter('%Y-%m-%d') )
ax.fmt_xdata = DateFormatter('%Y-%m-%d %H:%M:%S')
Modified: trunk/matplotlib/examples/dynamic_collection.py
===================================================================
--- trunk/matplotlib/examples/dynamic_collection.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/dynamic_collection.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,7 +1,8 @@
import random
from matplotlib.collections import RegularPolyCollection
import matplotlib.cm as cm
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
+from numpy.random import rand
fig = figure()
ax = fig.add_subplot(111, xlim=(0,1), ylim=(0,1), autoscale_on=False)
@@ -29,8 +30,8 @@
press 'a' to add a random point from the collection, 'd' to delete one
"""
if event.key=='a':
- x,y = nx.mlab.rand(2)
- color = cm.jet(nx.mlab.rand())
+ x,y = rand(2)
+ color = cm.jet(rand())
offsets.append((x,y))
facecolors.append(color)
fig.canvas.draw()
Modified: trunk/matplotlib/examples/fill_demo2.py
===================================================================
--- trunk/matplotlib/examples/fill_demo2.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/fill_demo2.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,8 +1,10 @@
-from pylab import figure, nx, show
+from matplotlib.pyplot import figure, show
+from numpy import arange, sin, pi
+
fig = figure()
ax = fig.add_subplot(111)
-t = nx.arange(0.0,3.01,0.01)
-s = nx.sin(2*nx.pi*t)
-c = nx.sin(4*nx.pi*t)
+t = arange(0.0,3.01,0.01)
+s = sin(2*pi*t)
+c = sin(4*pi*t)
ax.fill(t, s, 'b', t, c, 'g', alpha=0.2)
show()
Modified: trunk/matplotlib/examples/gradient_bar.py
===================================================================
--- trunk/matplotlib/examples/gradient_bar.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/gradient_bar.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,4 +1,6 @@
-from pylab import figure, show, nx, cm
+from matplotlib.pyplot import figure, show, cm
+from numpy import arange
+from numpy.random import rand
def gbar(ax, x, y, width=0.5, bottom=0):
X = [[.6, .6],[.7,.7]]
@@ -19,8 +21,8 @@
extent=(xmin, xmax, ymin, ymax), alpha=1)
N = 10
-x = nx.arange(N)+0.25
-y = nx.mlab.rand(N)
+x = arange(N)+0.25
+y = rand(N)
gbar(ax, x, y, width=0.7)
ax.set_aspect('normal')
show()
Modified: trunk/matplotlib/examples/interp_demo.py
===================================================================
--- trunk/matplotlib/examples/interp_demo.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/interp_demo.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,6 +1,9 @@
-from pylab import figure, show, nx, linspace, stineman_interp
-x = linspace(0,2*nx.pi,20);
-y = nx.sin(x); yp = None
+from matplotlib.pyplot import figure, show
+from numpy import pi, sin, linspace
+from matplotlib.mlab import stineman_interp
+
+x = linspace(0,2*pi,20);
+y = sin(x); yp = None
xi = linspace(x[0],x[-1],100);
yi = stineman_interp(xi,x,y,yp);
Modified: trunk/matplotlib/examples/lasso_demo.py
===================================================================
--- trunk/matplotlib/examples/lasso_demo.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/lasso_demo.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -13,7 +13,9 @@
from matplotlib.colors import colorConverter
from matplotlib.collections import RegularPolyCollection
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
+from numpy import nonzero
+from numpy.random import rand
class Datum:
colorin = colorConverter.to_rgba('red')
@@ -47,9 +49,7 @@
self.cid = self.canvas.mpl_connect('button_press_event', self.onpress)
def callback(self, verts):
- #print 'all done', verts
- #ind = matplotlib.mlab._inside_poly_deprecated(self.xys, verts)
- ind = nx.nonzero(points_inside_poly(self.xys, verts))
+ ind = nonzero(points_inside_poly(self.xys, verts))[0]
for i in range(self.Nxy):
if i in ind:
self.facecolors[i] = Datum.colorin
@@ -66,7 +66,7 @@
# acquire a lock on the widget drawing
self.canvas.widgetlock(self.lasso)
-data = [Datum(*xy) for xy in nx.mlab.rand(100, 2)]
+data = [Datum(*xy) for xy in rand(100, 2)]
fig = figure()
ax = fig.add_subplot(111, xlim=(0,1), ylim=(0,1), autoscale_on=False)
Modified: trunk/matplotlib/examples/pick_event_demo.py
===================================================================
--- trunk/matplotlib/examples/pick_event_demo.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/pick_event_demo.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -63,23 +63,25 @@
The examples below illustrate each of these methods.
"""
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
from matplotlib.lines import Line2D
from matplotlib.patches import Patch, Rectangle
from matplotlib.text import Text
from matplotlib.image import AxesImage
+import numpy as npy
+from numpy.random import rand
if 1: # simple picking, lines, rectangles and text
fig = figure()
ax1 = fig.add_subplot(211)
ax1.set_title('click on points, rectangles or text', picker=True)
ax1.set_ylabel('ylabel', picker=True, bbox=dict(facecolor='red'))
- line, = ax1.plot(nx.mlab.rand(100), 'o', picker=5) # 5 points tolerance
+ line, = ax1.plot(rand(100), 'o', picker=5) # 5 points tolerance
# pick the rectangle
ax2 = fig.add_subplot(212)
- bars = ax2.bar(range(10), nx.mlab.rand(10), picker=True)
+ bars = ax2.bar(range(10), rand(10), picker=True)
for label in ax2.get_xticklabels(): # make the xtick labels pickable
label.set_picker(True)
@@ -90,7 +92,7 @@
xdata = thisline.get_xdata()
ydata = thisline.get_ydata()
ind = event.ind
- print 'onpick1 line:', zip(nx.take(xdata, ind), nx.take(ydata, ind))
+ print 'onpick1 line:', zip(npy.take(xdata, ind), npy.take(ydata, ind))
elif isinstance(event.artist, Rectangle):
patch = event.artist
print 'onpick1 patch:', patch.get_verts()
@@ -122,12 +124,12 @@
xdata = line.get_xdata()
ydata = line.get_ydata()
maxd = 0.05
- d = nx.sqrt((xdata-mouseevent.xdata)**2. + (ydata-mouseevent.ydata)**2.)
+ d = npy.sqrt((xdata-mouseevent.xdata)**2. + (ydata-mouseevent.ydata)**2.)
- ind = nx.nonzero(nx.less_equal(d, maxd))
+ ind = npy.nonzero(npy.less_equal(d, maxd))
if len(ind):
- pickx = nx.take(xdata, ind)
- picky = nx.take(ydata, ind)
+ pickx = npy.take(xdata, ind)
+ picky = npy.take(ydata, ind)
props = dict(ind=ind, pickx=pickx, picky=picky)
return True, props
else:
@@ -139,16 +141,16 @@
fig = figure()
ax1 = fig.add_subplot(111)
ax1.set_title('custom picker for line data')
- line, = ax1.plot(nx.mlab.rand(100), nx.mlab.rand(100), 'o', picker=line_picker)
+ line, = ax1.plot(rand(100), rand(100), 'o', picker=line_picker)
fig.canvas.mpl_connect('pick_event', onpick2)
if 1: # picking on a scatter plot (matplotlib.collections.RegularPolyCollection)
- x, y, c, s = nx.mlab.rand(4, 100)
+ x, y, c, s = rand(4, 100)
def onpick3(event):
ind = event.ind
- print 'onpick3 scatter:', ind, nx.take(x, ind), nx.take(y, ind)
+ print 'onpick3 scatter:', ind, npy.take(x, ind), npy.take(y, ind)
fig = figure()
ax1 = fig.add_subplot(111)
@@ -159,10 +161,10 @@
if 1: # picking images (matplotlib.image.AxesImage)
fig = figure()
ax1 = fig.add_subplot(111)
- im1 = ax1.imshow(nx.rand(10,5), extent=(1,2,1,2), picker=True)
- im2 = ax1.imshow(nx.rand(5,10), extent=(3,4,1,2), picker=True)
- im3 = ax1.imshow(nx.rand(20,25), extent=(1,2,3,4), picker=True)
- im4 = ax1.imshow(nx.rand(30,12), extent=(3,4,3,4), picker=True)
+ im1 = ax1.imshow(rand(10,5), extent=(1,2,1,2), picker=True)
+ im2 = ax1.imshow(rand(5,10), extent=(3,4,1,2), picker=True)
+ im3 = ax1.imshow(rand(20,25), extent=(1,2,3,4), picker=True)
+ im4 = ax1.imshow(rand(30,12), extent=(3,4,3,4), picker=True)
ax1.axis([0,5,0,5])
def onpick4(event):
Modified: trunk/matplotlib/examples/scatter_custom_symbol.py
===================================================================
--- trunk/matplotlib/examples/scatter_custom_symbol.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/scatter_custom_symbol.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,12 +1,14 @@
-from pylab import figure, nx, show
+from matplotlib.pyplot import figure, show
+from numpy import arange, pi, cos, sin, pi
+from numpy.random import rand
# unit area ellipse
rx, ry = 3., 1.
-area = rx * ry * nx.pi
-theta = nx.arange(0, 2*nx.pi+0.01, 0.1)
-verts = zip(rx/area*nx.cos(theta), ry/area*nx.sin(theta))
+area = rx * ry * pi
+theta = arange(0, 2*pi+0.01, 0.1)
+verts = zip(rx/area*cos(theta), ry/area*sin(theta))
-x,y,s,c = nx.mlab.rand(4, 30)
+x,y,s,c = rand(4, 30)
s*= 10**2.
fig = figure()
Modified: trunk/matplotlib/examples/scatter_star_poly.py
===================================================================
--- trunk/matplotlib/examples/scatter_star_poly.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/scatter_star_poly.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,7 +1,7 @@
import pylab
-x = pylab.nx.mlab.rand(10)
-y = pylab.nx.mlab.rand(10)
+x = pylab.rand(10)
+y = pylab.rand(10)
pylab.subplot(321)
pylab.scatter(x,y,s=80,marker=">")
Modified: trunk/matplotlib/examples/spy_demos.py
===================================================================
--- trunk/matplotlib/examples/spy_demos.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/spy_demos.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -2,7 +2,8 @@
Plot the sparsity pattern of arrays
"""
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
+import numpy
fig = figure()
ax1 = fig.add_subplot(221)
@@ -10,7 +11,7 @@
ax3 = fig.add_subplot(223)
ax4 = fig.add_subplot(224)
-x = nx.mlab.randn(20,20)
+x = numpy.random.randn(20,20)
x[5] = 0.
x[:,12] = 0.
Modified: trunk/matplotlib/examples/xcorr_demo.py
===================================================================
--- trunk/matplotlib/examples/xcorr_demo.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/xcorr_demo.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -1,6 +1,7 @@
-from pylab import figure, show, nx
+from matplotlib.pylab import figure, show
+import numpy
-x,y = nx.mlab.randn(2,100)
+x,y = numpy.random.randn(2,100)
fig = figure()
ax1 = fig.add_subplot(211)
ax1.xcorr(x, y, usevlines=True, maxlags=50, normed=True)
@@ -13,3 +14,4 @@
ax2.axhline(0, color='black', lw=2)
show()
+
Modified: trunk/matplotlib/examples/zoom_window.py
===================================================================
--- trunk/matplotlib/examples/zoom_window.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/examples/zoom_window.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -9,15 +9,17 @@
Note the diameter of the circles in the scatter are defined in
points**2, so their size is independent of the zoom
"""
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
+import numpy
figsrc = figure()
figzoom = figure()
axsrc = figsrc.add_subplot(111, xlim=(0,1), ylim=(0,1), autoscale_on=False)
-axzoom = figzoom.add_subplot(111, xlim=(0.45,0.55), ylim=(0.4,.6), autoscale_on=False)
+axzoom = figzoom.add_subplot(111, xlim=(0.45,0.55), ylim=(0.4,.6),
+ autoscale_on=False)
axsrc.set_title('Click to zoom')
axzoom.set_title('zoom window')
-x,y,s,c = nx.mlab.rand(4,200)
+x,y,s,c = numpy.random.rand(4,200)
s *= 200
Modified: trunk/matplotlib/lib/matplotlib/pylab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pylab.py 2007-11-09 19:23:42 UTC (rev 4190)
+++ trunk/matplotlib/lib/matplotlib/pylab.py 2007-11-09 19:37:15 UTC (rev 4191)
@@ -202,8 +202,13 @@
from cbook import flatten, is_string_like, exception_to_str, popd, \
silent_list, iterable, enumerate, dedent
-import matplotlib.numerix as nx
import numpy as npy
+# The masked array namespace is brought in as ma; getting
+# this from numerix allows one to select either numpy.ma or
+# Pierre G-M's maskedarray implementation, which may
+# replace the present numpy.ma implementation in a future
+# numpy release.
+from matplotlib.numerix import npyma as ma
from matplotlib import mpl # pulls in most modules
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 19:23:45
|
Revision: 4190
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4190&view=rev
Author: mdboom
Date: 2007-11-09 11:23:42 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Merging trunk to branch
Added Paths:
-----------
branches/transforms/lib/enthought/
branches/transforms/lib/enthought/etsconfig/
branches/transforms/lib/enthought/etsconfig/tests/
branches/transforms/lib/enthought/traits/
branches/transforms/lib/enthought/traits/plugins/
Removed Paths:
-------------
branches/transforms/lib/enthought/etsconfig/
branches/transforms/lib/enthought/etsconfig/tests/
branches/transforms/lib/enthought/traits/
branches/transforms/lib/enthought/traits/plugins/
branches/transforms/lib/pytz/
Copied: branches/transforms/lib/enthought (from rev 4188, trunk/matplotlib/lib/enthought)
Copied: branches/transforms/lib/enthought/etsconfig (from rev 4188, trunk/matplotlib/lib/enthought/etsconfig)
Copied: branches/transforms/lib/enthought/etsconfig/tests (from rev 4188, trunk/matplotlib/lib/enthought/etsconfig/tests)
Copied: branches/transforms/lib/enthought/traits (from rev 4188, trunk/matplotlib/lib/enthought/traits)
Copied: branches/transforms/lib/enthought/traits/plugins (from rev 4188, trunk/matplotlib/lib/enthought/traits/plugins)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2007-11-09 19:09:44
|
Revision: 4189
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4189&view=rev
Author: mdboom
Date: 2007-11-09 11:09:42 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Add support for nonuniform grids to imshow.
Modified Paths:
--------------
branches/transforms/lib/matplotlib/axes.py
branches/transforms/lib/matplotlib/image.py
Modified: branches/transforms/lib/matplotlib/axes.py
===================================================================
--- branches/transforms/lib/matplotlib/axes.py 2007-11-09 16:43:38 UTC (rev 4188)
+++ branches/transforms/lib/matplotlib/axes.py 2007-11-09 19:09:42 UTC (rev 4189)
@@ -4385,7 +4385,9 @@
#### plotting z(x,y): imshow, pcolor and relatives, contour
- def imshow(self, X,
+ def imshow(self, I,
+ X = None,
+ Y = None,
cmap = None,
norm = None,
aspect=None,
@@ -4402,18 +4404,24 @@
**kwargs):
"""
- IMSHOW(X, cmap=None, norm=None, aspect=None, interpolation=None,
- alpha=1.0, vmin=None, vmax=None, origin=None, extent=None)
+ IMSHOW(I, X=None, Y=None, cmap=None, norm=None, aspect=None,
+ interpolation=None, alpha=1.0, vmin=None, vmax=None,
+ origin=None, extent=None)
- IMSHOW(X) - plot image X to current axes, resampling to scale to axes
- size (X may be numarray/Numeric array or PIL image)
+ IMSHOW(I) - plot image I to current axes, resampling to scale to axes
+ size (I may be numarray/Numeric array or PIL image)
- IMSHOW(X, **kwargs) - Use keyword args to control image scaling,
- colormapping etc. See below for details
+ IMSHOW(I, X, Y) - plot image I to current axes, with
+ nonuniform X and Y axes. (I, X and Y may be
+ numarray/Numeric array or PIL image)
+
+ IMSHOW(I, X, Y, **kwargs) - Use keyword args to control image
+ scaling, colormapping etc. See
+ below for details
- Display the image in X to current axes. X may be a float array, a
- uint8 array or a PIL image. If X is an array, X can have the following
+ Display the image in I to current axes. I may be a float array, a
+ uint8 array or a PIL image. If I is an array, I can have the following
shapes:
MxN : luminance (grayscale, float array only)
@@ -4425,6 +4433,10 @@
The value for each component of MxNx3 and MxNx4 float arrays should be
in the range 0.0 to 1.0; MxN float arrays may be normalised.
+ X and/or Y may be provided to specify a non-uniform image
+ grid. Each element of the X or Y arrays is the width or height
+ of the corresponding pixel in the given image.
+
A image.AxesImage instance is returned
The following kwargs are allowed:
@@ -4488,12 +4500,25 @@
if norm is not None: assert(isinstance(norm, mcolors.Normalize))
if cmap is not None: assert(isinstance(cmap, mcolors.Colormap))
if aspect is None: aspect = rcParams['image.aspect']
- self.set_aspect(aspect)
- im = mimage.AxesImage(self, cmap, norm, interpolation, origin, extent,
- filternorm=filternorm,
- filterrad=filterrad, **kwargs)
-
- im.set_data(X)
+ # self.set_aspect(aspect)
+
+ if X is None and Y is None:
+ im = mimage.AxesImage(self, cmap, norm, interpolation, origin, extent,
+ filternorm=filternorm,
+ filterrad=filterrad, **kwargs)
+
+ im.set_data(I)
+ else:
+ if X is None:
+ X = npy.arange(I.shape[1])
+ if Y is None:
+ Y = npy.arange(I.shape[0])
+ im = mimage.NonUniformImage(self, cmap=cmap, norm=norm,
+ interpolation=interpolation,
+ origin=origin, extent=extent,
+ filternorm=filternorm,
+ filterrad=filterrad, **kwargs)
+ im.set_data(X, Y, I)
im.set_alpha(alpha)
self._set_artist_props(im)
im.set_clip_path(self.axesPatch)
@@ -4515,7 +4540,7 @@
return im
-
+
def _pcolorargs(self, funcname, *args):
if len(args)==1:
C = args[0]
Modified: branches/transforms/lib/matplotlib/image.py
===================================================================
--- branches/transforms/lib/matplotlib/image.py 2007-11-09 16:43:38 UTC (rev 4188)
+++ branches/transforms/lib/matplotlib/image.py 2007-11-09 19:09:42 UTC (rev 4189)
@@ -77,8 +77,6 @@
# reverse interp dict
self._interpdr = dict([ (v,k) for k,v in self._interpd.items()])
- if interpolation is None: interpolation = rcParams['image.interpolation']
-
self.set_interpolation(interpolation)
self.axes = ax
@@ -267,7 +265,7 @@
ACCEPTS: ['bicubic' | 'bilinear' | 'blackman100' | 'blackman256' | 'blackman64', 'nearest' | 'sinc144' | 'sinc256' | 'sinc64' | 'spline16' | 'spline36']
"""
-
+ if s is None: s = rcParams['image.interpolation']
s = s.lower()
if not self._interpd.has_key(s):
raise ValueError('Illegal interpolation string')
@@ -317,17 +315,10 @@
class NonUniformImage(AxesImage):
def __init__(self, ax,
- cmap = None,
- norm = None,
- extent=None,
+ **kwargs
):
AxesImage.__init__(self, ax,
- cmap = cmap,
- norm = norm,
- extent=extent,
- interpolation = 'nearest',
- origin = 'lower',
- )
+ **kwargs)
def make_image(self, magnification=1.0):
if self._A is None:
@@ -382,9 +373,11 @@
raise NotImplementedError('Method not supported')
def set_interpolation(self, s):
- if s != 'nearest':
+ print s
+ if s != None and s != 'nearest':
raise NotImplementedError('Only nearest neighbor supported')
-
+ AxesImage.set_interpolation(self, s)
+
def get_extent(self):
if self._A is None:
raise RuntimeError('Must set data first')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2007-11-09 16:43:41
|
Revision: 4188
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4188&view=rev
Author: jdh2358
Date: 2007-11-09 08:43:38 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
removed unneeded draw command from tkagg
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py 2007-11-09 16:42:55 UTC (rev 4187)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py 2007-11-09 16:43:38 UTC (rev 4188)
@@ -549,9 +549,6 @@
fname, err)
error_msg_tkpaint(msg)
- #the enlarged figure prints to the canvas and freezes unless a redraw is forced
- self.canvas.draw()
-
def update(self):
_focus = windowing.FocusManager()
self._axes = self.canvas.figure.axes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2007-11-09 16:42:57
|
Revision: 4187
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4187&view=rev
Author: jdh2358
Date: 2007-11-09 08:42:55 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
added face and edge color = 'None' support to patches
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backend_bases.py
trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
trunk/matplotlib/lib/matplotlib/patches.py
Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py 2007-11-09 16:40:25 UTC (rev 4186)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py 2007-11-09 16:42:55 UTC (rev 4187)
@@ -1199,6 +1199,7 @@
self.figure.set_facecolor(origfacecolor)
self.figure.set_edgecolor(origedgecolor)
self.figure.set_canvas(self)
+ self.figure.canvas.draw()
return result
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py 2007-11-09 16:40:25 UTC (rev 4186)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py 2007-11-09 16:42:55 UTC (rev 4187)
@@ -549,6 +549,9 @@
fname, err)
error_msg_tkpaint(msg)
+ #the enlarged figure prints to the canvas and freezes unless a redraw is forced
+ self.canvas.draw()
+
def update(self):
_focus = windowing.FocusManager()
self._axes = self.canvas.figure.axes
Modified: trunk/matplotlib/lib/matplotlib/patches.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/patches.py 2007-11-09 16:40:25 UTC (rev 4186)
+++ trunk/matplotlib/lib/matplotlib/patches.py 2007-11-09 16:42:55 UTC (rev 4187)
@@ -198,15 +198,23 @@
if not self.get_visible(): return
#renderer.open_group('patch')
gc = renderer.new_gc()
- gc.set_foreground(self._edgecolor)
- gc.set_linewidth(self._linewidth)
+
+ if cbook.is_string_like(self._edgecolor) and self._edgecolor.lower()=='none':
+ gc.set_linewidth(0)
+ else:
+ gc.set_foreground(self._edgecolor)
+ gc.set_linewidth(self._linewidth)
+
gc.set_alpha(self._alpha)
gc.set_antialiased(self._antialiased)
self._set_gc_clip(gc)
gc.set_capstyle('projecting')
- if not self.fill or self._facecolor is None: rgbFace = None
- else: rgbFace = colors.colorConverter.to_rgb(self._facecolor)
+ if (not self.fill or self._facecolor is None or
+ (cbook.is_string_like(self._facecolor) and self._facecolor.lower()=='none')):
+ rgbFace = None
+ else:
+ rgbFace = colors.colorConverter.to_rgb(self._facecolor)
if self._hatch:
gc.set_hatch(self._hatch )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
