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
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
(3) |
2
(2) |
3
(6) |
4
(4) |
5
(1) |
6
|
7
|
|
8
|
9
|
10
|
11
(1) |
12
(1) |
13
(1) |
14
(4) |
|
15
|
16
(8) |
17
(7) |
18
(5) |
19
|
20
|
21
(2) |
|
22
|
23
(2) |
24
|
25
(2) |
26
(6) |
27
(3) |
28
(2) |
|
29
(2) |
30
(2) |
31
|
|
|
|
|
Revision: 8672 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8672&view=rev Author: jswhit Date: 2010年08月30日 15:20:42 +0000 (2010年8月30日) Log Message: ----------- change version number to 1.0.1 Modified Paths: -------------- trunk/toolkits/basemap/Changelog trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py trunk/toolkits/basemap/setup.py Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2010年08月30日 15:18:39 UTC (rev 8671) +++ trunk/toolkits/basemap/Changelog 2010年08月30日 15:20:42 UTC (rev 8672) @@ -1,4 +1,7 @@ -version 1.0 (svn revision 8531) +version 1.0.1 (not yet released). + * add datum grid shift files, so that pyproj.transform can do datum + shifts. +version 1.0 (svn revision 8531) * don't force adjustable='box' so Basemap is compatible with AxesGrid. Added fcstmaps_axesgrid.py example. * add support for plotting on unstructured grids using Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2010年08月30日 15:18:39 UTC (rev 8671) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2010年08月30日 15:20:42 UTC (rev 8672) @@ -52,7 +52,7 @@ else: basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -__version__ = '1.0' +__version__ = '1.0.1' # supported map projections. _projnames = {'cyl' : 'Cylindrical Equidistant', Modified: trunk/toolkits/basemap/setup.py =================================================================== --- trunk/toolkits/basemap/setup.py 2010年08月30日 15:18:39 UTC (rev 8671) +++ trunk/toolkits/basemap/setup.py 2010年08月30日 15:20:42 UTC (rev 8672) @@ -241,7 +241,7 @@ setup( name = "basemap", - version = "1.0", + version = "1.0.1", description = "Plot data on map projections with matplotlib", long_description = """ An add-on toolkit for matplotlib that lets you plot data This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8671 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8671&view=rev Author: jswhit Date: 2010年08月30日 15:18:39 +0000 (2010年8月30日) Log Message: ----------- update tests to check for installation of datum grid files. Modified Paths: -------------- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py 2010年08月29日 13:27:14 UTC (rev 8670) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pyproj.py 2010年08月30日 15:18:39 UTC (rev 8671) @@ -258,7 +258,7 @@ >>> print '%9.3f %11.3f' % (x1,y1) 569704.566 4269024.671 >>> print '%9.3f %11.3f' % (x2,y2) - 569706.333 4268817.680 + 569722.342 4268814.027 >>> print '%8.3f %5.3f' % p2(x2,y2,inverse=True) -92.200 38.567 >>> # process 3 points at a time in a tuple @@ -271,11 +271,18 @@ 567703.344 351730.944 728553.093 4298200.739 4353698.725 4292319.005 >>> xy = x2+y2 >>> print '%9.3f %9.3f %9.3f %11.3f %11.3f %11.3f' % xy - 567705.072 351727.113 728558.917 4297993.157 4353490.111 4292111.678 + 567721.149 351747.558 728569.133 4297989.112 4353489.644 4292106.305 >>> lons, lats = p2(x2,y2,inverse=True) >>> xy = lons+lats >>> print '%8.3f %8.3f %8.3f %5.3f %5.3f %5.3f' % xy -92.220 -94.720 -90.370 38.830 39.320 38.750 + >>> # test datum shifting, installation of extra datum grid files. + >>> p1 = Proj(proj='latlong',datum='WGS84') + >>> x1 = -111.5; y1 = 45.25919444444 + >>> p2 = Proj(proj="utm",zone=10,datum='NAD27') + >>> x2, y2 = transform(p1, p2, x1, y1) + >>> print "%12.3f %12.3f" % (x2,y2) + 1402285.991 5076292.423 """ # process inputs, making copies that support buffer API. inx, xisfloat, xislist, xistuple = _copytobuffer(x) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8670 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8670&view=rev Author: jswhit Date: 2010年08月29日 13:27:14 +0000 (2010年8月29日) Log Message: ----------- remove dead file Removed Paths: ------------- trunk/toolkits/basemap/src/PJ_mpoly.c Deleted: trunk/toolkits/basemap/src/PJ_mpoly.c =================================================================== --- trunk/toolkits/basemap/src/PJ_mpoly.c 2010年08月29日 13:26:17 UTC (rev 8669) +++ trunk/toolkits/basemap/src/PJ_mpoly.c 2010年08月29日 13:27:14 UTC (rev 8670) @@ -1,21 +0,0 @@ -#ifndef lint -static const char SCCSID[]="@(#)PJ_mpoly.c 4.1 94/05/22 GIE REL"; -#endif -#define PROJ_PARMS__ \ - double rho_0; -#define PJ_LIB__ -#include <projects.h> -PROJ_HEAD(mpoly, "Modified Polyconic") - "\n\tPolyconic, Sph\n\tlat_1= and lat_2= lotsa"; -FORWARD(s_forward); /* spheroid */ - return (xy); -} -INVERSE(s_inverse); /* ellipsoid & spheroid */ - return (lp); -} -FREEUP; if (P) pj_dalloc(P); } -ENTRY0(mpoly) - P->fwd = s_forward; - P->inv = s_inverse; - P->es = 0; -ENDENTRY(P) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8669 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8669&view=rev Author: jswhit Date: 2010年08月29日 13:26:17 +0000 (2010年8月29日) Log Message: ----------- fix so that datum grid files are installed with pyproj Modified Paths: -------------- trunk/toolkits/basemap/setup.py Added Paths: ----------- trunk/toolkits/basemap/datumgrid/ trunk/toolkits/basemap/datumgrid/FL.lla trunk/toolkits/basemap/datumgrid/MD.lla trunk/toolkits/basemap/datumgrid/TN.lla trunk/toolkits/basemap/datumgrid/WI.lla trunk/toolkits/basemap/datumgrid/WO.lla trunk/toolkits/basemap/datumgrid/alaska.lla trunk/toolkits/basemap/datumgrid/conus.lla trunk/toolkits/basemap/datumgrid/hawaii.lla trunk/toolkits/basemap/datumgrid/null.lla trunk/toolkits/basemap/datumgrid/prvi.lla trunk/toolkits/basemap/datumgrid/stgeorge.lla trunk/toolkits/basemap/datumgrid/stlrnc.lla trunk/toolkits/basemap/datumgrid/stpaul.lla trunk/toolkits/basemap/nad2bin.c Added: trunk/toolkits/basemap/datumgrid/FL.lla =================================================================== --- trunk/toolkits/basemap/datumgrid/FL.lla (rev 0) +++ trunk/toolkits/basemap/datumgrid/FL.lla 2010年08月29日 13:26:17 UTC (rev 8669) @@ -0,0 +1,162 @@ +Florida - HP + 33 33 1 -88.00000 .25000 24.00000 .25000 +0: 7672 -6501 103 -773 125 -788 160 -817 200 -858 246 -914 294 -982 339 -1060 +378 -1141 404 -1217 416 -1277 406 -1312 377 -1308 321 -1253 243 -1136 136 -946 +6 -668 -154 -294 -347 194 -577 813 -837 1548 -1039 2280 -920 2603 -731 2767 +-244 2680 366 2537 835 2117 545 1930 194 2344 152 2581 592 2449 1020 2189 +1247 1948 +1: 6754 -7120 8 -708 34 -720 68 -742 113 -778 164 -827 220 -889 276 -960 +327 -1036 372 -1109 404 -1169 422 -1206 423 -1211 404 -1170 367 -1076 311 -915 +234 -680 133 -352 -5 91 -206 694 -519 1526 -940 2565 -720 2708 -761 2904 +-190 2656 556 2684 1384 1878 336 1391 -509 2300 -707 2530 249 2025 931 1499 +1153 1093 +2: 5839 -7757 -85 -643 -60 -651 -23 -668 24 -696 79 -738 141 -792 206 -856 +269 -925 328 -992 380 -1048 420 -1085 448 -1093 461 -1060 462 -982 449 -845 +426 -645 391 -367 339 8 246 530 22 1341 -727 2950 -300 2631 -817 2997 -63 2328 +605 3088 2423 1864 -180 932 -1705 2673 -2090 2563 126 1350 1056 604 1092 80 +3: 4931 -8407 -176 -580 -152 -582 -115 -593 -67 -613 -9 -648 57 -692 128 -747 +200 -807 272 -865 339 -914 396 -946 446 -950 484 -919 511 -844 531 -719 +544 -534 557 -282 575 57 603 521 666 1219 935 2462 -596 2881 -290 2556 533 1660 +517 2766 2960 2565 -780 2955 -4000 3000 -3837 1859 682 18 1424 -535 929 -1087 +4: 4040 -9062 -266 -517 -242 -515 -207 -517 -159 -531 -101 -555 -33 -590 +42 -634 122 -683 201 -730 279 -768 350 -790 413 -785 466 -747 508 -664 540 -533 +563 -344 583 -85 600 264 616 739 614 1405 484 2283 -488 2772 -579 2757 -245 2656 +-1 3507 917 4006 -862 4197 -2155 2464 -1050 -2791 1050 -1209 1564 -1695 +378 -2234 +5: 3177 -9703 -353 -457 -331 -449 -299 -444 -253 -449 -196 -464 -128 -487 +-51 -519 32 -556 117 -590 201 -614 281 -623 350 -604 410 -550 453 -452 480 -305 +487 -97 471 180 425 544 331 1017 146 1614 -231 2286 -935 2790 -1308 3079 +-1338 3409 -1044 4066 -165 4364 -98 3520 1098 -1747 317 -3205 1665 -2467 +2276 -2277 -302 -2541 +6: 2355 -10301 -436 -403 -419 -387 -389 -376 -348 -372 -294 -374 -228 -388 +-152 -406 -67 -430 20 -449 108 -460 191 -452 264 -416 322 -343 359 -227 +369 -58 345 170 276 464 147 829 -69 1271 -405 1783 -900 2313 -1540 2764 +-2049 3120 -2302 3479 -1974 3796 -82 3346 1747 1598 3151 -3091 281 -2706 +2719 -2294 352 -2797 200 -3163 +7: 1590 -10819 -516 -357 -503 -335 -479 -316 -444 -301 -394 -293 -333 -294 +-259 -301 -176 -310 -87 -315 3 -311 87 -287 161 -234 215 -144 244 -7 237 183 +182 427 65 727 -132 1080 -432 1471 -848 1880 -1370 2263 -1925 2567 -2361 2769 +-2645 2902 -2624 2933 286 1797 3755 -705 3171 -2773 1532 -1897 1118 -915 +636 -2145 -185 -3134 +8: 898 -11213 -591 -325 -585 -296 -567 -267 -540 -243 -498 -224 -442 -213 +-372 -206 -291 -202 -202 -194 -111 -176 -24 -139 50 -71 103 35 127 188 109 393 +37 650 -105 952 -335 1281 -668 1611 -1101 1905 -1581 2125 -1957 2219 -1968 2123 +-1462 1769 -924 1518 -924 1495 3095 -2090 3298 -1453 2284 -1197 -736 -682 +983 -1073 1002 -3205 +9: 299 -11436 -663 -310 -663 -275 -655 -237 -637 -202 -604 -171 -556 -148 +-490 -128 -412 -111 -322 -92 -229 -63 -138 -16 -59 61 -3 177 23 342 6 557 +-64 823 -202 1125 -423 1433 -739 1703 -1151 1887 -1604 1941 -1908 1856 +-1633 1562 -301 701 169 192 -158 600 1102 -1285 3892 -1075 734 -429 262 -858 +248 -1211 1092 -2529 +10: -192 -11437 -729 -320 -738 -277 -741 -230 -735 -183 -714 -141 -673 -104 +-615 -71 -538 -42 -446 -14 -347 23 -249 75 -162 154 -95 273 -60 438 -62 660 +-112 932 -217 1238 -388 1541 -637 1773 -980 1854 -1425 1726 -1884 1463 +-1835 1296 626 440 839 696 -805 -950 675 -1036 4029 -688 210 -2089 1085 -24 +-138 -838 328 -1417 +11: -559 -11168 -788 -361 -808 -309 -826 -252 -835 -194 -827 -137 -798 -85 +-745 -38 -668 2 -572 39 -464 79 -354 130 -252 203 -171 313 -117 470 -98 687 +-115 961 -170 1281 -261 1604 -388 1849 -570 1874 -871 1503 -1453 663 -2290 -114 +104 1078 789 -131 164 -22 1680 -765 4263 -160 -787 -1958 2609 -1886 -2732 873 +-29 -276 +12: -789 -10590 -839 -437 -873 -378 -909 -310 -935 -237 -945 -164 -929 -95 +-883 -32 -806 21 -700 67 -578 106 -449 150 -328 208 -226 296 -151 432 -108 627 +-92 893 -99 1224 -112 1599 -113 1941 -75 2099 -9 1802 -158 798 -2134 5 -660 884 +-909 -1955 809 46 864 -927 1716 -1008 2936 -1094 -50 25 -1001 -540 148 -655 +13: -874 -9674 -878 -556 -930 -488 -988 -408 -1038 -320 -1069 -227 -1070 -135 +-1031 -52 -951 18 -832 73 -688 111 -533 142 -384 175 -257 229 -161 323 -97 479 +-59 710 -37 1029 -17 1436 20 1898 103 2309 265 2370 583 1459 1923 -901 -2624 -38 +-3346 -1930 102 16 663 379 973 -2392 1234 -868 -1191 942 187 -3809 909 1161 +14: -810 -8403 -902 -723 -976 -647 -1061 -554 -1142 -445 -1201 -328 -1222 -209 +-1193 -96 -1107 -3 -970 64 -794 104 -601 118 -416 118 -261 126 -143 164 +-64 256 -12 422 22 678 42 1036 42 1490 -8 1932 -193 1847 -1030 -947 127 3077 +-1734 645 -141 -1585 -1138 971 1611 5264 -608 -9267 85 -497 -917 -1288 +796 1568 1477 278 +15: -600 -6782 -906 -943 -1005 -858 -1124 -751 -1245 -620 -1342 -471 -1391 -314 +-1374 -164 -1280 -36 -1115 54 -895 97 -651 95 -418 57 -228 10 -90 -17 -1 1 +61 87 112 247 159 495 175 847 120 1293 38 1673 941 1936 -9941 -936 858 1039 +-1295 -2639 3057 -804 2291 1821 1058 -1212 123 688 680 390 -440 1982 611 313 +16: -255 -4835 -881 -1218 -1011 -1128 -1173 -1005 -1344 -848 -1492 -659 +-1579 -453 -1580 -249 -1478 -73 -1274 52 -993 110 -676 93 -379 15 -146 -93 +4 -185 92 -229 159 -205 246 -111 382 67 568 396 796 1097 1014 2461 0 2000 +-8346 -5148 -6654 4148 2600 -4833 3503 1265 3163 2598 1837 870 -186 126 +143 1015 -128 1314 205 670 +17: 206 -2608 -821 -1550 -983 -1458 -1197 -1322 -1435 -1135 -1652 -897 +-1793 -624 -1819 -349 -1707 -105 -1455 72 -1091 157 -670 133 -282 12 -3 -161 +147 -315 206 -394 252 -378 366 -266 611 -48 1003 357 1540 1418 2577 5461 +-501 -2255 5516 5948 -18845 -6837 0 -5107 2402 2555 4553 2700 1242 348 +-368 554 15 637 -179 1340 -96 1049 +18: 751 -169 -717 -1938 -909 -1851 -1183 -1706 -1510 -1488 -1820 -1188 +-2035 -829 -2098 -459 -1978 -127 -1670 124 -1195 255 -625 237 -104 65 226 -193 +346 -405 326 -493 294 -428 384 -196 713 217 1330 869 2070 1935 2277 3529 +24 1272 7103 3967 -2782 -5390 -9810 -3597 -2867 1487 1170 -514 1204 -5 +64 107 122 1081 -289 1400 -334 1205 +19: 1334 2389 -561 -2377 -773 -2304 -1112 -2162 -1555 -1917 -1996 -1538 +-2311 -1065 -2419 -573 -2295 -132 -1932 210 -1324 413 -533 419 190 188 +576 -195 619 -483 443 -566 243 -436 202 -76 504 525 1285 1262 2419 1785 +2861 1614 258 744 4600 5835 -1610 -5973 -5784 -751 -2652 -890 -2683 -1865 +1273 57 733 862 74 1430 -445 1184 -488 1116 +20: 1890 4955 -353 -2859 -553 -2813 -955 -2692 -1556 -2435 -2181 -1954 +-2620 -1320 -2775 -676 -2644 -120 -2251 317 -1516 619 -396 687 657 403 +1088 -190 986 -572 565 -644 110 -486 -190 -62 -107 705 599 1700 2151 2152 +3558 1268 -1507 -983 42 152 1603 -2650 270 -1361 85 859 -7000 0 1798 903 +-428 542 -32 1121 -308 1103 -438 1050 +21: 2332 7397 -106 -3372 -236 -3370 -662 -3295 -1489 -3073 -2389 -2435 +-2965 -1560 -3134 -725 -2964 -85 -2606 403 -1849 812 -234 1005 1373 728 +1775 -181 1446 -645 703 -683 -10 -593 -617 -297 -874 462 -590 1868 727 2585 +3088 850 -2719 -882 2463 -2273 1661 -1542 403 -247 -803 -600 -2808 2265 +78 552 -268 754 -152 985 -266 998 -380 958 +22: 2553 9565 128 -3909 183 -3962 -150 -3947 -1331 -3900 -2665 -2973 -3354 -1695 +-3442 -625 -3088 7 -2864 391 -2448 853 -86 1168 2369 1054 2538 8 1923 -527 +819 -504 24 -633 -783 -758 -1053 -507 -337 1109 1651 2823 536 -2240 1044 1122 +946 -1948 -80 -814 -1704 2439 -1329 403 -1042 1100 -6 504 -44 770 -102 851 +-225 850 -342 820 +23: 2453 11303 233 -4478 625 -4610 730 -4564 -1058 -5090 -3119 -3498 -3769 -1546 +-3669 -178 -2723 264 -2620 231 -3334 613 251 553 3000 0 3158 1966 2158 218 +815 55 337 -390 -796 -933 -1254 -1571 -797 456 2435 -455 2771 1386 -827 3268 +0 -3000 -510 -862 -2895 2167 -1703 1713 -892 982 151 593 90 586 -70 637 +-225 654 -348 648 +24: 2018 12480 20 -5106 779 -5482 2150 -4984 -657 -6960 -3918 -3730 -3983 -827 +-3972 874 -1687 926 -1286 60 -3464 749 -716 2140 8510 -484 -1773 1318 954 978 +1151 -16 1237 -44 -557 -171 -893 -1011 630 -1280 -303 -5857 2962 3371 -2993 5847 +528 -1758 -1163 250 -3620 1297 -22 1275 144 1277 -37 420 -85 425 -185 475 +-306 485 -413 474 +25: 1482 13045 -595 -5698 -76 -7030 3555 -5891 -75 -9103 -4913 -2783 -2879 620 +-4780 2466 -842 2224 -1877 150 899 5691 -4885 5468 9110 -4286 -849 -657 +27 -1439 790 -1014 1344 195 -172 -280 -633 -726 369 -1130 22 -1009 -22 2187 +-1000 0 -51 -252 -87 1011 -3027 403 -787 279 904 2090 38 1229 -150 767 -289 523 +-419 392 -521 320 +26: 1355 12925 -894 -5548 -930 -7327 -2531 -19050 1950 -360 -2950 -640 +2000 2000 -4428 2801 -435 3572 -167 2638 386 3423 -965 1454 2797 9 519 847 +-1666 -1917 1959 -4827 1000 3000 -886 -211 -1177 -2017 439 -905 749 -2342 +-191 5903 406 2279 -2340 -8707 674 987 -4677 5266 -25 -1215 1305 2437 588 1784 +-4 996 -354 519 -556 270 -669 146 +27: 1459 11181 -1466 -7182 -2572 -10336 -3104 -11802 1118 -1032 3176 911 +-611 4260 -2000 0 -619 3300 -2381 700 -1000 4000 0 -4000 2404 3094 5349 7048 +1689 4151 -991 -3201 131 63 -2168 386 1542 242 -560 -3732 80 -2204 493 3164 +1412 2599 318 -2751 -1207 -4294 -5222 -3431 -2270 3866 520 1894 163 1104 +-327 566 -631 218 -792 16 -873 -88 +28: 2203 10314 -830 -6011 -1373 -7303 -4130 -9160 -817 1919 3956 749 -1009 1492 +221 -1684 2270 2426 -2873 3931 -2405 -482 2282 309 2655 2770 3130 5110 +1455 3807 -535 -219 -587 -72 -1198 71 457 -475 -266 -2633 -86 -1848 222 551 +326 205 -885 -2650 -2183 -2117 -1600 -1445 569 2262 -1413 425 -1219 69 +-1107 -98 -1098 -227 -1110 -316 -1112 -365 +29: 2716 10001 -644 -4332 -1204 -4602 -2281 -3934 -319 1881 2290 2592 +-73 -1368 577 -1976 1226 678 -1193 2021 -1019 265 1543 1065 2171 2483 2097 3629 +1087 2963 -136 972 -554 260 -736 -122 -151 -785 -284 -1841 -246 -1646 -177 -779 +-348 -949 -1043 -1950 -1496 -1537 -785 -809 26 629 -1182 -51 -1483 -404 +-1478 -541 -1425 -604 -1375 -633 -1328 -640 +30: 3029 9940 -431 -2553 -758 -2281 -989 -1183 36 1426 1195 1655 548 -691 +693 -1266 753 -73 -164 811 -55 576 1094 1158 1573 2020 1451 2592 814 2237 +47 1191 -382 422 -535 -164 -382 -796 -399 -1427 -411 -1516 -453 -1290 -631 -1364 +-965 -1632 -1085 -1356 -727 -853 -505 -282 -1099 -484 -1463 -716 -1581 -842 +-1583 -891 -1541 -903 -1490 -894 +31: 3263 9862 -143 -949 -274 -581 -241 203 289 1267 831 1191 750 -14 764 -535 +696 -141 363 355 425 565 901 1014 1144 1543 1026 1844 608 1640 101 1035 +-260 405 -438 -173 -461 -729 -496 -1199 -542 -1406 -614 -1430 -746 -1484 +-908 -1531 -950 -1354 -827 -1061 -822 -811 -1145 -862 -1437 -992 -1593 -1084 +-1643 -1128 -1633 -1136 -1596 -1125 +32: 3476 9640 176 430 146 687 231 1079 513 1415 789 1190 837 486 835 38 +769 55 633 269 646 489 808 801 876 1120 747 1278 449 1148 92 765 -203 287 +-393 -203 -490 -673 -563 -1065 -630 -1312 -711 -1435 -809 -1506 -904 -1520 +-946 -1426 -943 -1278 -1014 -1165 -1223 -1178 -1442 -1248 -1592 -1310 +-1667 -1343 -1682 -1351 -1667 -1343 Added: trunk/toolkits/basemap/datumgrid/MD.lla =================================================================== --- trunk/toolkits/basemap/datumgrid/MD.lla (rev 0) +++ trunk/toolkits/basemap/datumgrid/MD.lla 2010年08月29日 13:26:17 UTC (rev 8669) @@ -0,0 +1,70 @@ +Maryland - HP + 25 17 1 -80.00000 .25000 37.00000 .25000 +0: 5107 -2502 -700 496 -656 468 -587 418 -481 347 -325 256 -111 152 166 50 +493 -37 854 -96 1221 -118 1568 -125 1953 -143 2433 -195 2464 -281 2529 -395 +1987 -729 447 -916 -3011 -1181 -5559 -406 -6094 541 -5714 1110 -5247 1289 +-4993 1254 -4960 1151 +1: 4757 -1695 -644 429 -627 411 -602 368 -555 299 -470 206 -328 96 -125 -15 +126 -105 391 -146 634 -120 762 -58 911 -13 1583 -8 1049 -28 1451 123 1377 -464 +907 -603 -4056 -1955 -6769 -485 -5797 929 -4254 1413 -3251 1295 -2871 993 +-2899 724 +2: 4413 -932 -563 355 -566 354 -582 322 -597 258 -579 164 -499 45 -341 -84 +-127 -192 93 -234 288 -157 190 -25 -145 65 1065 74 -1087 -40 -877 1058 -994 18 +1208 694 -5540 -3840 -7658 -332 -4130 1732 -1668 1786 -634 1127 -525 501 +-856 110 +3: 4055 -240 -456 271 -467 294 -520 279 -598 226 -652 137 -622 9 -469 -140 +-216 -285 27 -362 263 -223 177 -13 -96 71 110 26 -1646 -1167 -6731 2306 +-6507 1730 -6212 3695 -4277 -7455 -3522 570 519 3029 2116 1873 2259 459 +1672 -383 871 -737 +4: 3649 351 -332 164 -326 230 -409 235 -557 201 -693 131 -718 0 -535 -165 +-101 -346 460 -493 33 -283 -1321 62 -1559 1 -5178 295 -5413 -3383 -1930 1443 +-2892 564 -10423 1293 -5171 1702 -2535 2461 2932 4061 4566 750 4123 -1116 +2992 -1715 1857 -1727 +5: 3144 806 -212 20 -145 160 -245 172 -468 175 -706 151 -825 16 -677 -154 +-182 -358 990 -703 -674 -285 -5937 730 -3063 -730 -2085 -867 -3581 281 +-2334 586 -1865 759 -5614 1473 -3452 5821 -3401 5679 1428 2413 4628 -2496 +4177 -3412 2947 -3078 1846 -2521 +6: 2486 1092 -149 -192 58 93 -44 50 -322 127 -644 224 -873 34 -771 -149 +-678 -275 1770 -1075 -356 -827 -5051 5 -7881 816 -1030 443 -515 634 -2144 1008 +-1825 1030 -2498 1380 -732 4469 -286 5830 843 2970 3527 -3923 2622 -4302 +1634 -3420 962 -2613 +7: 1654 1205 -254 -546 221 60 99 -240 -127 38 -418 455 -728 36 -31 -311 +-225 -355 -33 -358 -3518 -30 -4640 -954 -5000 1000 -1818 2806 1675 -346 +-1857 1540 -225 -656 -1646 2284 2156 3127 2865 2526 3328 2398 1668 -4480 +57 -3443 -249 -2495 -233 -1941 +8: 774 1247 -684 -1157 78 -16 -159 -920 104 -45 117 1090 -906 205 695 -339 +-472 -133 -1852 1212 -5751 619 -1944 -763 0 0 -1000 1000 0 2000 -781 1116 +399 1285 -1441 1545 4580 1012 1900 -687 3393 1019 2580 -6254 -1198 -1689 +-1158 -1160 -867 -1068 +9: 286 1527 -1064 -1509 -1784 -1841 -1774 -1770 671 449 1944 1770 -864 986 +-654 174 -459 -486 -3471 4225 -753 -3046 -1998 -493 920 1014 -194 1777 +219 1456 -220 1705 -4805 4062 4000 -1000 1438 -738 1687 -1949 4875 -1313 +137 -2862 1175 -2395 -88 -1276 -580 -789 +10: 155 1275 -1109 -3207 -3642 -4791 -2359 752 -671 811 -127 1647 2394 2226 +143 593 -1814 676 -2822 760 3 -1215 2849 -1527 273 2735 -238 2454 -152 3485 +1117 -674 1000 0 -2868 944 -947 22 3163 1227 3618 -1203 2940 -5487 -80 -2667 +-428 -1173 -531 -579 +11: 210 2136 -191 -2212 -19 -4924 -671 974 -2112 719 -1798 471 60 914 304 1048 +-2565 1609 -3875 184 1862 -2588 7166 1567 -242 2228 -1731 3121 2189 749 +-4055 528 -454 -2297 -78 773 -1000 -1000 2289 1712 5097 -691 -167 -5244 +240 -1551 -59 -589 -233 -314 +12: 136 2158 79 -2113 870 -2292 -87 492 -1395 1041 -324 108 1093 15 -372 591 +-3302 -1631 1228 1503 2274 -18 348 98 -548 48 3116 847 -2761 -369 -1636 4272 +-1692 3024 -2566 -1109 3539 -5665 -2548 3660 4460 -4303 33 -1230 -83 -215 +64 -282 7 -263 +13: 437 2268 560 -1486 885 -1135 371 147 -233 547 243 42 679 -222 -336 -237 +-1466 -996 550 564 492 316 -1347 86 -1522 -8 -3178 -134 3508 29 224 1615 +-978 2218 111 -3614 1000 -1000 814 1143 -1762 1626 28 -784 -14 -140 274 -574 +170 -385 +14: 853 2381 888 -971 974 -638 715 -41 417 171 481 -79 441 -329 -174 -472 +-704 -640 -236 -12 -607 49 -1686 -95 -2002 -238 -1988 -349 1822 -129 995 494 +219 507 526 -1730 552 -212 170 1146 -1495 1850 -678 543 -301 275 -1 -88 +30 -81 +15: 1272 2398 1135 -612 1122 -398 955 -126 740 -45 598 -193 366 -390 -90 -527 +-502 -568 -637 -337 -1047 -270 -1628 -342 -1734 -438 -1191 -480 655 -329 +834 -53 575 -59 523 -598 291 234 -200 1168 -1032 1651 -848 1158 -561 799 +-319 502 -228 413 +16: 1671 2307 1341 -357 1280 -252 1127 -153 911 -156 671 -279 357 -439 +-57 -566 -460 -614 -776 -555 -1133 -534 -1436 -571 -1391 -613 -871 -599 +97 -470 476 -272 475 -136 364 -48 91 536 -331 1193 -799 1568 -849 1461 -725 1247 +-579 1047 -498 951 Added: trunk/toolkits/basemap/datumgrid/TN.lla =================================================================== --- trunk/toolkits/basemap/datumgrid/TN.lla (rev 0) +++ trunk/toolkits/basemap/datumgrid/TN.lla 2010年08月29日 13:26:17 UTC (rev 8669) @@ -0,0 +1,72 @@ +Tennessee - HP + 41 13 1 -91.00000 .25000 34.00000 .25000 +0: 4428 -22007 -1493 4893 -1577 5555 -1600 6225 -1405 5086 -965 1594 -1701 -1996 +-2039 -3629 -1741 -3344 -815 -1573 494 700 1259 1802 1435 1879 1325 1617 +1153 1350 1009 1144 885 1001 778 868 707 653 744 389 841 191 927 57 931 -55 +770 -133 351 -128 -257 -37 -607 -22 -737 -63 -743 -99 -678 -91 -560 -30 +-416 38 -280 74 -175 66 -102 31 -54 -8 -26 -41 -11 -60 -5 -71 -6 -73 -10 -70 +1: 3780 -18301 -1014 3344 -1198 4442 -1427 6806 -1330 6403 118 1384 -1798 -3653 +-2337 -5100 -2065 -4288 -954 -1580 1037 1956 1772 2803 1591 2110 1187 1417 +865 1022 694 810 561 754 431 767 300 564 399 238 602 75 797 25 926 -76 882 -173 +432 -168 -496 49 -785 39 -800 -58 -737 -137 -642 -130 -489 -13 -301 104 +-146 160 -46 133 7 73 30 15 39 -23 39 -41 32 -46 25 -45 15 -38 +2: 3069 -14097 -393 1440 -561 2094 -1223 6705 -1961 7926 1706 1136 -2308 -5180 +-2320 -5540 -2111 -4420 -1122 -1101 1818 3758 2256 3591 1515 1676 829 738 +424 480 357 358 273 454 155 786 -183 562 41 35 350 -45 609 92 842 -20 992 -165 +588 -224 -866 182 -861 84 -731 -82 -648 -214 -592 -222 -424 11 -164 201 +11 278 89 207 108 101 102 26 89 -10 74 -20 60 -19 46 -10 34 0 +3: 2036 -8580 276 277 983 -599 -510 2225 -1953 5028 -1355 918 -1485 -2621 +-646 -2637 -1037 -2105 -236 1836 1439 3031 2063 2724 988 58 257 -375 -160 -55 +89 -77 91 65 124 1042 -806 722 -215 -297 136 -170 329 352 528 121 879 -7 +201 -18 -794 57 -492 2 -427 -117 -460 -287 -591 -403 -424 80 5 335 195 442 +217 266 181 97 144 20 116 3 92 10 73 22 58 35 46 47 +4: 287 -1924 -453 1080 -331 3 2355 -7518 -858 2359 -3610 -2302 575 3050 +1411 1053 432 3839 -252 90 303 163 1142 119 774 -805 -8 -1014 -755 -120 +-12 -73 46 -498 607 1411 -1622 1049 -8 -684 10 -208 0 821 -33 109 994 45 +-23 190 -839 -183 -74 50 -109 73 -267 -134 -800 -764 -629 316 275 425 405 661 +304 257 190 30 139 10 112 38 91 67 73 85 60 97 52 105 +5: -865 3376 -382 913 -44 -261 1057 -3331 -508 -2245 742 -3452 775 -1825 +-559 27 1784 1798 737 1534 -2211 1916 -525 -445 1059 -829 775 -1226 -946 -789 +-613 1793 620 -328 564 -481 -1185 836 1279 836 -572 345 -171 501 -881 -280 +962 -334 169 767 678 -1396 -1259 824 78 836 -143 828 -1381 -1522 -1321 1038 +903 11 594 946 264 66 77 -98 79 60 86 143 74 176 64 182 56 178 53 174 +6: -1343 6747 -88 292 232 -825 700 -2723 317 -3600 220 -3850 200 -1389 +784 -730 1893 125 1140 212 -216 618 -3344 1373 -992 -463 1441 -1220 -673 -1585 +592 -975 -498 836 816 1029 -122 1065 805 1213 67 777 -417 -867 -2156 -452 +1484 229 295 930 833 -644 -135 -680 -38 1930 133 3340 -1820 -2259 -3171 2527 +2553 -2627 483 1358 -55 -352 -228 -120 3 358 68 383 61 351 52 310 51 273 +52 247 +7: -1388 8391 183 -350 407 -1309 560 -2735 238 -3997 -42 -4199 71 -1137 +986 -992 1896 -487 1923 -342 237 149 280 -714 -1945 -467 -1380 -467 -1011 -371 +-834 -58 -158 -7 1730 2420 237 1669 164 -191 665 -772 723 -1413 -3157 345 +324 726 329 497 1138 1010 -121 -133 -175 -268 -51 4070 2416 8621 -8245 -1489 +5673 -10573 -529 1071 -827 490 -744 521 87 1194 130 721 64 551 45 439 48 362 +56 311 +8: -1226 8668 372 -864 552 -1607 648 -2768 398 -4734 -744 -9695 44 2104 +907 915 2135 -112 1924 -870 990 963 66 -49 -1087 -39 -2185 14 -1731 115 +-1028 -154 -294 -680 -1047 2008 2306 1785 1325 -1428 623 -2381 922 -799 +-2498 1892 -1328 829 885 93 580 1349 576 1217 12 -1876 -97 104 -616 1461 +-931 1274 641 -1811 -915 917 -299 -301 -1130 436 746 2382 319 748 68 663 +38 517 51 417 62 354 +9: -1031 7928 431 -1230 551 -1693 574 -2266 289 -3136 -774 -5420 881 -309 +-40 209 2144 -2843 1906 -2731 630 3134 902 1630 -1538 739 -1788 -303 -2169 90 +-968 -799 -248 349 -752 651 633 1763 1973 -1677 -241 -2784 761 1326 -1204 715 +-841 2315 733 577 2318 604 1564 14 740 -2126 -2785 -760 -1562 2680 -259 -93 +-254 487 -1576 -41 795 -1621 -2359 -288 1945 3980 577 -12 -18 710 15 520 +53 425 71 367 +10: -885 6528 377 -1487 428 -1749 404 -1817 238 -1402 -132 -1485 293 583 +-1609 -1903 603 -5543 341 6911 -891 -1006 4153 -596 581 -549 -1636 -2262 +-1235 290 -986 1249 -792 -297 691 542 87 2083 88 -194 793 190 -515 -726 +-295 193 -168 1078 -910 1303 1418 698 1650 -729 -160 -1305 -3097 -1402 +2044 1640 -870 -591 -202 171 -706 -189 817 -396 -1835 172 -131 615 2670 852 +-539 476 -59 457 45 400 75 354 +11: -792 4852 259 -1571 258 -1740 205 -1615 161 -93 -68 78 -214 222 -936 -1563 +147 -2586 598 2672 188 1463 1970 688 681 371 -1504 -866 -222 708 -687 -1579 +-6 -404 826 -952 -34 2378 -753 786 -287 433 -361 -358 -228 -75 -227 374 +-444 519 710 -70 989 -1131 26 -1638 -986 -1436 841 556 -277 83 -228 258 +-292 107 130 42 -820 165 -28 216 1382 525 99 410 16 381 51 349 78 321 +12: -729 3220 132 -1351 115 -1285 70 -874 15 145 -134 465 -293 299 -469 -539 +47 -619 440 1495 483 1720 994 1314 412 822 -565 50 -136 69 -190 -1194 167 -806 +416 -572 -146 1121 -691 793 -600 383 -479 -159 -323 -266 -231 -229 -124 -363 +458 -902 717 -1662 439 -2116 168 -1882 116 411 -205 548 -226 540 -208 421 +-101 321 -326 275 64 248 641 360 262 339 120 317 96 296 99 278 Added: trunk/toolkits/basemap/datumgrid/WI.lla =================================================================== --- trunk/toolkits/basemap/datumgrid/WI.lla (rev 0) +++ trunk/toolkits/basemap/datumgrid/WI.lla 2010年08月29日 13:26:17 UTC (rev 8669) @@ -0,0 +1,121 @@ +Wisconsin - HP + 33 25 1 -94.00000 .25000 42.00000 .25000 +0: 1142 -2439 -9 236 -4 218 3 196 11 171 18 143 24 117 28 93 21 74 -7 64 -62 57 +-151 10 -225 -154 -63 -403 -174 -312 -109 -375 719 -221 484 11 -544 454 +778 199 399 -131 482 334 1322 -1332 466 -2511 25 -1372 -3555 -3448 -5228 -413 +-4418 992 -3463 1547 -2945 1834 -2806 2036 -2895 2186 -3089 2289 +1: 962 -2138 -21 236 -17 215 -14 188 -10 161 -8 137 -5 116 0 103 -4 101 -29 128 +-94 195 -226 268 -450 166 77 -52 -177 185 -345 -67 1266 -30 758 66 -2237 666 +637 96 -1126 -674 -787 1772 867 -1040 -715 -2820 291 1249 -5772 -5028 -5685 625 +-2814 1117 -1412 1110 -1050 1180 -1186 1314 -1522 1455 -1903 1573 +2: 789 -1853 -29 240 -26 212 -27 179 -29 147 -35 124 -38 108 -36 97 -39 91 +-73 111 -155 193 -302 351 -899 28 -3 1571 93 396 809 1005 933 26 1061 901 +-1277 -638 -1717 -289 -3934 -1909 816 1843 -2988 -654 9 -323 -4099 1350 +-11582 532 -703 -565 1348 -475 1346 -154 837 167 207 447 -418 678 -972 858 +3: 626 -1593 -31 249 -30 212 -30 169 -40 129 -57 109 -75 103 -74 102 -72 84 +-145 61 -357 63 -715 360 -934 1755 -8 140 -147 130 2178 -1107 -475 3922 +1496 1973 -977 -20 -2133 159 -3098 -1078 -853 -668 -1175 -182 -4471 305 +-4241 5372 -11726 2321 1303 -2332 2775 -1960 2375 -1259 1651 -726 889 -329 +178 -20 -427 215 +4: 478 -1372 -30 268 -23 218 -22 158 -33 104 -67 88 -106 112 -103 149 -39 161 +-71 165 -279 98 -723 336 -906 3204 -74 516 -1855 765 -982 1893 69 2079 3646 -888 +-922 -15 -235 719 -2777 -1741 -1142 -103 -1804 86 -2956 1757 -1355 2255 +-3134 1816 -3203 103 -128 -984 1112 -1213 1179 -1075 762 -814 214 -536 +-302 -290 +5: 348 -1202 -25 299 -11 235 4 147 4 62 -46 46 -130 114 -143 230 57 315 157 508 +223 453 436 -126 -19 2708 -902 1099 -1702 1214 -1251 898 -1389 1090 -605 -59 +-6 -31 900 1775 -64 -924 -1836 -851 -1235 -23 -1467 787 -522 1401 -1184 2449 +-1736 1127 -501 -242 316 -968 467 -1169 234 -1078 -139 -864 -510 -635 +6: 238 -1102 -22 346 1 271 43 145 83 -10 35 -43 -116 59 -232 271 114 384 +163 885 -209 1025 -1048 -1897 -50 2666 1000 2000 1000 3000 -3204 899 -3657 -801 +-255 -263 121 -887 -90 138 67 -175 48 913 15 357 30 1633 408 1889 -765 1792 +-85 973 98 -205 19 -979 -185 -1264 -443 -1227 -704 -1042 -930 -825 +7: 156 -1093 -27 409 -4 335 65 174 195 -109 205 -181 40 -99 -123 93 17 377 +516 888 69 909 -2504 1753 -1605 -456 2000 4000 -1616 -315 -2672 -664 -3712 -1021 +1785 209 846 -379 -473 1235 714 -95 983 1023 1307 762 1190 1830 1358 2334 +-710 2081 1700 772 669 -488 -327 -1192 -905 -1387 -1204 -1290 -1358 -1081 +-1438 -866 +8: 114 -1197 -36 471 -38 418 11 270 246 -190 339 -236 156 -137 -83 56 -170 677 +1969 2103 -321 3927 -6425 -228 238 -2934 -2825 -2596 -1107 1550 811 265 +-666 123 -197 833 -16 -175 1144 678 1132 434 2328 1064 1755 1036 3196 1540 +1493 2616 1952 2632 2169 1092 36 -792 -1226 -1434 -1792 -1434 -1980 -1216 +-1982 -967 -1912 -760 +9: 130 -1426 -28 508 -64 452 -90 282 -22 -35 144 -52 -13 211 -156 41 -1453 1063 +719 1943 -896 4530 -6271 -1517 -104 -2066 1068 -925 -361 -53 -1982 -944 +1379 -12 -952 965 -1070 -797 2239 624 1667 -203 4486 701 2870 1044 3892 1732 +3191 2514 1811 2523 3311 1338 -956 -1332 -2114 -1570 -2499 -1269 -2540 -935 +-2409 -686 -2221 -523 +10: 206 -1747 15 555 -56 549 -244 443 -642 173 -1140 20 -960 1837 53 -952 +-296 140 -5773 2701 -4163 -1719 -804 1949 2804 51 2534 -368 -355 -591 1447 -1726 +334 650 -359 97 -3335 800 2697 -1044 1647 -4023 16184 4356 3962 2167 932 5018 +-1556 -308 -158 91 1802 -533 -856 -1170 -1910 -1167 -2509 -752 -2635 -438 +-2489 -275 -2262 -206 +11: 317 -2136 114 611 127 731 52 866 -353 852 -1022 243 -1368 2721 -5443 12 +-3424 100 -3449 1816 -3385 -2127 1752 -602 2884 -927 3992 -127 2172 904 +1956 -66 -514 -1139 -720 -845 -371 -437 -412 836 1652 -861 10857 -5335 +17344 -13635 39679 -18671 -40694 36552 -10007 7834 -814 -887 599 -2128 +-621 -1143 -1919 -233 -2275 81 -2196 126 -2005 89 +12: 380 -2585 181 602 339 824 723 1249 1377 1910 -107 1194 -5794 1662 -5583 1775 +-1598 -658 -1308 901 -2569 176 3177 -2081 1537 -2218 468 -1548 2980 956 +324 50 -723 -1427 -1159 -1287 2355 505 1492 309 -1213 814 -7803 -4600 5901 -6146 +26567 -18529 -10372 21045 -4757 11552 862 651 1323 -3096 1006 -1396 -1264 193 +-1632 412 -1591 355 -1490 258 +13: 338 -3044 56 492 21 635 -43 831 130 1333 3437 5060 -4977 1084 -8092 2428 +-529 -1856 2522 114 1587 392 4576 -1342 -83 -1159 -1736 865 4841 -2658 +-1515 -1462 -2283 1122 -1734 -5519 1727 1103 -934 814 -787 -239 -8829 -2963 +-10693 -3031 12771 2677 4136 3094 3693 2953 3333 -96 1733 -1087 1142 -586 +-526 127 -684 291 -760 297 -829 250 +14: 300 -3401 -37 454 -150 702 -367 1139 -720 1828 -1336 1531 -1339 5182 +-2773 155 2106 -380 1087 -1387 3721 -1719 2310 32 456 -120 742 -16 1655 -160 +-988 50 -1105 1159 -1133 -3569 4 -313 -2867 541 -3983 855 -11104 -3164 +2270 -5082 7686 1598 2136 2220 1634 1412 1577 315 277 -22 829 34 -745 123 +55 59 -61 122 -256 147 +15: 325 -3665 -54 412 -133 738 -305 1282 -833 2233 -3111 4516 2527 7153 +5200 -902 1671 -2632 -1102 -3172 -105 -1837 2154 -742 -1982 1391 625 158 +244 -129 -160 -565 216 686 -334 -1090 -1269 90 -1522 56 -432 -627 2310 -7203 +-1769 -1452 -673 2171 -764 2065 -903 1030 -390 -25 -340 -100 59 -6 -353 30 +62 -6 127 24 25 54 +16: 403 -3896 -56 315 -85 689 -102 1244 -72 1989 136 2611 1494 3958 2390 42 +197 178 -481 -1145 1039 -106 -459 -919 435 -20 160 184 -27 -148 -260 -181 +414 -492 35 -190 -1570 -225 406 434 2134 -370 6112 -2074 -1820 -4189 -7219 529 +-1826 901 -1739 972 -631 9 -413 -143 -191 -96 -189 -61 38 -59 141 -40 117 -17 +17: 520 -4172 -83 125 -123 511 -146 1010 -38 1486 676 1817 -821 1175 2015 3048 +-175 373 -1334 480 3189 -750 172 48 478 -3 933 663 1404 138 -422 273 -506 -1238 +-2394 -1351 -204 -1819 566 -693 -594 -1225 6646 2265 -307 -2024 -4556 -563 +-2739 109 -1963 354 -1008 48 -564 -92 -304 -111 -165 -102 0 -98 100 -85 +115 -70 +18: 694 -4558 -109 -173 -174 252 -276 870 -421 1650 -542 2308 -90 845 3268 4894 +-759 112 -629 -130 575 -159 2441 -41 934 67 977 -577 3696 1106 7694 2089 +-12687 -4638 -8040 -3403 2997 -480 512 249 -344 -398 4851 1203 1431 -461 +-1711 -421 -1978 -162 -1675 -13 -1007 28 -610 -54 -357 -100 -188 -117 -49 -121 +38 -117 68 -111 +19: 942 -5097 -104 -625 -138 -252 -175 314 -187 1120 -149 2147 -371 2824 +-559 4060 9826 3350 -5878 -1630 -1718 -319 3515 -502 1111 1664 -688 -828 +2873 1448 3923 1087 -6691 -2448 -5696 -3595 -80 -2854 -323 -100 165 145 +2528 648 1427 52 -327 -163 -1042 -153 -1121 -98 -840 -51 -572 -76 -368 -109 +-217 -129 -102 -140 -30 -144 4 -142 +20: 1238 -5750 -94 -1191 -95 -969 -76 -682 -15 -418 64 -332 -144 -155 -1857 5519 +1958 4101 148 2169 597 1518 3682 2085 2109 2553 -1401 -1172 736 1535 1344 -16 +-3061 -1900 -3399 -2921 -1191 -2567 -557 -882 170 -149 1273 224 1011 85 +153 -61 -437 -115 -654 -114 -605 -100 -475 -110 -345 -130 -235 -148 -150 -160 +-94 -168 -66 -171 +21: 1548 -6408 -116 -1732 -116 -1605 -112 -1432 -122 -1215 -222 -834 -614 353 +-1365 3851 104 4149 556 3567 560 3306 2935 2120 2372 2503 169 597 334 987 +239 -83 -1513 -1348 -1955 -2107 -1167 -1985 -566 -1111 48 -463 640 -104 +639 -44 251 -84 -131 -119 -347 -133 -401 -136 -368 -144 -305 -157 -241 -172 +-189 -184 -152 -193 -134 -198 +22: 1852 -6980 -177 -2161 -192 -2040 -224 -1824 -298 -1451 -459 -746 -744 632 +-963 2795 -278 3694 368 3792 849 3565 2047 2766 1926 2465 861 1445 455 995 +70 133 -745 -788 -1082 -1380 -828 -1426 -444 -1023 -24 -596 326 -305 391 -184 +224 -157 -3 -160 -173 -168 -258 -172 -278 -179 -267 -189 -242 -200 -219 -211 +-203 -220 -196 -226 +23: 2146 -7440 -260 -2464 -291 -2299 -346 -1990 -436 -1469 -568 -623 -711 650 +-706 2178 -281 3154 280 3541 832 3481 1481 3025 1518 2570 1027 1852 612 1219 +211 467 -261 -261 -515 -767 -467 -929 -268 -801 -20 -578 184 -389 247 -278 +174 -230 41 -215 -84 -211 -169 -213 -217 -217 -236 -224 -243 -231 -244 -241 +-246 -248 -249 -254 +24: 2438 -7814 -354 -2672 -393 -2447 -449 -2055 -522 -1446 -599 -573 -635 553 +-537 1758 -211 2673 242 3174 711 3277 1127 3050 1224 2659 1012 2096 719 1487 +404 830 88 214 -113 -248 -153 -490 -82 -532 38 -471 140 -385 176 -320 136 -282 +51 -266 -40 -257 -119 -256 -176 -257 -217 -260 -244 -265 -266 -272 -282 -278 +-297 -285 Added: trunk/toolkits/basemap/datumgrid/WO.lla =================================================================== --- trunk/toolkits/basemap/datumgrid/WO.lla (rev 0) +++ trunk/toolkits/basemap/datumgrid/WO.lla 2010年08月29日 13:26:17 UTC (rev 8669) @@ -0,0 +1,204 @@ +Washington - Oregon - HP + 37 37 1 -125.00000 .25000 41.00000 .25000 +0: 21787 -14100 -1545 -660 -1593 -125 -1424 653 -1185 1188 -1424 644 -1448 264 +-1228 283 -946 601 -741 1113 -627 1500 -442 1503 -369 1374 -528 1151 -665 929 +-849 774 -1071 783 -1276 870 -1125 855 -747 746 -425 548 -202 218 56 -54 +244 -107 263 -196 201 -421 103 -535 -18 -665 -170 -591 -279 -297 -313 198 +-214 817 169 1323 342 1652 362 1584 338 1433 316 1336 +1: 15553 -7641 -1186 -1309 -1399 -682 -1135 598 -450 1871 -1348 181 -1479 -481 +-1141 -377 -745 71 -547 884 -495 1449 -25 1135 209 935 -150 647 -210 411 +-414 214 -743 355 -1325 667 -1108 694 -501 630 -175 504 -119 18 187 -372 +429 -176 346 -156 219 -590 94 -603 -49 -928 -283 -861 -421 -522 -461 98 +-460 993 390 1621 571 2155 509 1785 436 1460 388 1311 +2: 9304 -960 -697 -1990 -1317 -1536 -1106 271 1079 3748 -1601 -967 -1634 -1456 +-1077 -970 -509 -429 -557 853 -716 1712 545 345 1094 290 21 41 364 -46 201 -402 +-136 -118 -1625 603 -1175 489 -71 476 200 621 -221 -195 235 -917 645 -143 +347 104 186 -980 77 -462 -57 -1299 -490 -1122 -603 -789 -463 -106 -1053 1254 +869 1834 865 2974 655 1885 536 1412 461 1274 +3: 2957 6169 209 -2374 -1163 -2575 -2003 -1220 3870 7220 -2410 -3715 -1607 -2244 +-1090 -1121 94 -606 -1612 1237 -1631 2539 1803 -1923 2554 -797 -549 -686 +1193 -85 1139 -862 1034 -707 -2243 854 -1303 -31 642 147 750 1007 -619 -373 +68 -1652 813 -4 162 663 105 -1902 145 80 7 -1860 -990 -1127 -1070 -1049 +344 -421 -2065 1625 1392 1694 1154 4138 850 1713 685 1383 549 1315 +4: -3925 13709 1975 -1733 324 -2204 -2905 -2053 2052 2327 460 -3287 -588 -1674 +-2585 -1319 3966 1261 -9104 2788 -1964 3207 6046 -7829 3305 -2997 -2057 -1196 +2031 905 3494 174 1232 -1806 -1157 1489 -1430 -1783 1007 73 823 948 -31 -838 +-889 -147 -24 -778 37 -82 6 -1314 868 -1037 9 -1571 -2057 -275 -3306 -1641 +3047 231 713 724 -3373 2728 2573 2668 1592 2400 964 1873 637 1550 +5: -12666 20545 3843 -419 3000 -696 -4259 -1703 -1092 -3843 4296 -1540 +1277 -2701 -1924 -1118 -1385 1298 -3090 1177 692 1529 3975 -7198 2700 -4986 +-1242 -1680 1944 -1574 1840 -317 1526 -736 603 241 -38 -279 1000 0 1222 682 +-35 141 -1568 874 -351 -986 -278 -846 -30 -845 91 -766 105 -284 -1381 -131 +-1984 -1184 2354 -1520 1476 1283 -253 3118 -1380 2299 1202 1660 764 1738 +520 1519 +6: -24642 24838 3316 261 2035 -356 -1834 -4110 3031 -4739 4516 -2593 2167 -2076 +-667 -691 -847 577 -270 -1452 1893 -1660 3175 -4131 2084 -3282 -353 -3054 +93 -1241 1411 -263 1843 -939 511 -546 1538 457 2741 -72 1531 -459 155 -87 +-1540 319 114 990 -1037 -395 -266 -409 -438 49 -464 -414 -796 -325 0 803 +188 444 -315 535 -1071 1100 2265 1617 594 1202 301 1232 273 1205 +7: -38069 25452 2538 -239 2531 -1213 817 -5786 3090 -3032 7642 -2607 2258 -1793 +190 1851 2630 -2548 656 -3374 1865 -2186 3609 -2323 1760 -2873 -13 -2193 +-337 -1000 1420 -1241 1197 -1364 592 -1689 2771 -1024 4961 1067 3892 115 +999 -1232 -3964 824 88 2914 -1180 362 -703 41 -374 348 -665 -229 -233 -109 +114 467 773 1611 768 990 1215 890 -1248 871 -642 695 -133 768 101 863 +8: -50842 22647 1270 -1512 1247 -2122 8260 -3292 5207 -3327 7780 -3643 +5049 -2313 -406 -589 3614 -2031 2087 -2089 1290 -1086 2433 -1141 1795 -1347 +-89 -1520 -109 -927 729 -1033 1640 -1950 -191 -2703 6891 -609 4634 448 +5756 -758 -639 4333 -1965 2038 -401 85 -1892 -481 -955 116 -682 501 -488 -749 +-370 88 744 800 1561 1326 303 1403 -1122 310 -1660 1223 -254 529 90 525 +171 645 +9: -60026 17708 2782 -3010 4619 -3693 7578 -2258 7619 -2858 8905 -2177 +6678 -1940 -155 -772 1605 -1166 2376 -682 2932 -358 368 -1232 2956 -1329 +-137 -131 430 -448 -1250 -2237 657 -197 3408 1371 5004 287 3376 1322 2834 2953 +573 1943 52 -1850 766 -1455 -544 -1512 401 -396 -1186 -490 284 -1127 -201 1024 +8 1168 733 707 3230 3507 -5021 -1994 -1867 1275 -22 449 200 475 184 572 +10: -66461 12267 3821 -3476 6021 -4007 8619 -3784 8962 -2813 3725 2285 +7195 -1944 3273 -174 4118 -1341 2563 425 2407 -490 2337 887 3197 -5346 +-1424 1423 -205 1829 -977 -381 3298 2069 4609 3636 2044 -1086 782 -634 +548 41 2061 -366 2501 -93 774 -1848 620 -1458 592 -1621 -1768 890 2768 -890 +-469 2588 537 1792 -1543 -1123 -526 157 -3795 2418 -265 158 22 91 7 480 +30 561 +11: -70595 6783 3854 -3128 6111 -3300 9803 -3554 14590 -3660 -754 1374 +5737 -2536 3847 -3226 4390 8 2064 1206 2652 2658 4365 -431 1098 534 1611 1857 +2641 470 -414 2945 4867 924 4488 2188 -293 -978 -872 -1583 1215 -1735 88 -3265 +2231 1520 1159 100 2117 -171 -1684 -975 -501 889 -169 1201 1679 3064 3892 3526 +-2753 -494 -4030 -2238 -1773 50 -656 -32 48 92 -21 389 -97 469 +12: -72112 936 2875 -2593 4004 -2082 5999 -1700 8234 -3561 8895 -2873 +9125 -1260 6243 -1255 821 -636 1458 -155 8143 3887 2315 2292 2948 715 1993 947 +839 -128 3220 1466 7859 3292 6759 1778 -4710 -2415 -3716 -2524 4035 572 +-1593 -1854 -387 1085 682 -15 1682 67 -86 6 4 803 1415 2251 12 1079 296 3413 +-3336 1338 -2397 -1965 -1523 -912 913 49 -347 271 -340 263 -306 319 +13: -69937 -5749 2234 -2946 2614 -2714 4483 -3452 13195 -9238 8782 760 +6000 3082 6157 2977 615 747 623 -1802 1728 -2279 4485 2343 11977 4969 6586 3390 +-1154 2644 1608 -311 7675 3102 15359 -1247 -11875 -4418 -10444 -9781 6256 8078 +-2221 2731 9 3089 -856 79 451 -38 700 -1 1742 874 241 1465 -395 1706 -591 1711 +-5765 456 -1228 -78 -27 -155 973 1006 282 -184 -148 -67 -335 146 +14: -63499 -12814 2818 -3940 3313 -4184 5284 -4967 9906 -6096 11082 1310 +4661 5020 -549 1524 3453 3095 541 1403 3094 1712 5519 -1726 6038 427 6249 582 +1004 9728 959 712 2453 -728 6226 -579 17726 1955 -47813 14220 16410 -7263 +6825 -6891 2314 455 11 32 957 672 715 91 964 915 2031 653 2028 4644 1382 1400 +-11349 -1158 -2484 -324 2502 -602 -545 962 48 196 -200 99 -416 218 +15: -53556 -19083 4048 -4708 4451 -4891 5639 -4536 7573 -2004 7752 3888 +4451 4630 851 1771 -95 1028 -346 1850 -814 3446 4772 -447 1841 -343 8995 3416 +1973 4849 1566 1317 1606 -296 2035 -632 6569 942 -7701 2228 1280 -85 119 517 +988 64 170 -302 693 105 843 160 2336 2384 1705 1089 3379 583 2044 1643 -15903 -166 +490 -34 404 1319 -145 348 369 -114 -300 229 -559 383 +16: -41475 -23536 5455 -4947 5476 -5082 5474 -4763 5070 -2672 4242 10035 +368 3857 1170 1322 220 1786 -794 2101 4294 1856 -3423 529 -2151 2449 14886 2156 +-1510 893 2380 1227 1549 701 900 1228 1585 1006 663 1154 621 700 589 259 +-1658 527 -319 291 1042 376 1983 -473 4076 3481 1715 -189 1344 -7246 -1411 10298 +-3523 -197 -5318 -4348 -2668 3230 -852 991 791 217 -677 620 -742 584 +17: -28742 -25576 6870 -4395 6517 -3829 5647 -1944 3833 2075 -850 4577 +-921 3198 -2354 -106 940 2622 -517 2286 55 996 -233 731 1626 -525 3148 4096 +5219 -1117 2051 1936 1587 493 8 2786 1121 1800 2101 1928 53 669 -2673 1984 +-16427 9085 -2076 12532 27517 8764 -4554 -29183 1162 491 1659 2562 1316 869 +-298 1725 -11388 7066 -8259 -5474 8201 -3897 16 -256 -506 958 -998 178 +-687 434 +18: -16811 -25318 8142 -3711 7381 -3101 5452 -1422 2036 1482 -2243 4629 +-2106 3637 -2583 -8 -2860 1177 -408 2635 -1717 3153 -1486 3737 4858 -1961 +2471 1129 2972 -189 1522 930 309 39 74 1424 1085 1790 1987 912 1007 -700 +-3351 2829 -11348 6148 828 5857 13992 -956 -1465 -6260 714 474 1584 864 +1984 -1215 5038 -1568 -4639 1977 -1973 -744 -3471 1073 -3714 220 -2300 994 +-1103 152 -660 513 +19: -6977 -22933 9263 -2946 8382 -2683 5682 -1549 393 1454 -5174 4786 +-3881 2536 -2903 822 -2286 955 -1499 -442 -1684 4068 -7316 2932 -1103 3052 +1062 -1496 6206 -3571 8304 1249 -955 485 546 2176 816 214 1089 894 194 890 +-636 881 -4221 1701 -167 1634 2286 -271 1718 1408 1423 501 -52 452 1719 -1201 +459 457 -2490 -1751 1838 6070 -4041 -234 -5155 -1404 72 6 -941 886 -475 665 +20: -406 -18627 10038 -1836 9627 -2126 7317 -2636 1088 -2536 -10930 10601 +-6455 -503 -2970 -421 -1819 1285 -3817 -277 -12457 5735 -966 -2555 -1126 -148 +6877 -544 10735 -4040 5941 -242 -986 1830 -763 6279 -736 943 1063 -129 +-267 32 -1055 1057 -1036 949 -690 533 -59 1212 847 867 170 612 -1165 1685 +1637 -1755 -1294 -982 -1209 -372 -750 923 -2039 1141 -1585 2626 -820 1242 +-10 366 110 566 +21: 1966 -12898 9789 34 9929 367 8705 1337 3611 3160 -19465 -1922 -6535 -3078 +-3298 -259 -4156 -3872 -3076 -5160 -9099 8803 3180 -4703 1459 1209 8974 1518 +12520 -468 -2370 741 -1312 1499 178 2692 -699 1287 1070 -179 -1049 119 +-1427 863 -956 871 -939 -961 1000 888 226 1071 295 528 -1352 382 -1081 -116 +-1897 41 639 127 -1084 -712 -878 844 -2952 2582 -347 2477 609 1029 913 511 +22: 45 -7012 7989 1605 7729 1761 5295 1782 -1226 1303 -5404 -714 -8221 2752 +-803 -9453 -11306 -4342 -1233 -11 3789 -2553 -14190 -2317 6536 1199 9562 1995 +12609 -177 3103 965 -3090 2904 2801 27 1549 -329 -1514 1456 -3136 37 -115 187 +-317 772 -452 -837 94 -30 -241 796 56 249 -1368 -569 -1541 -57 -994 386 +371 495 -377 730 -284 1380 -4278 3696 -546 1432 773 581 1498 144 +23: -4884 -1962 5559 2734 5743 2458 4664 1300 76 -802 -11158 272 7610 -3883 +-5436 -3346 -20671 4465 7472 8543 -76 -17457 -3479 421 -8674 -3937 4481 -1051 +10682 2962 15165 -2249 2132 905 6833 1374 -58 275 -2373 517 -695 -475 -1676 -116 +-36 71 854 -36 -624 -186 -2138 -92 -384 -524 -2031 564 240 693 -3 -423 1109 1255 +-1169 953 -1062 1937 -1563 2685 -867 1061 687 408 2051 -156 +24: -11046 1594 2750 3538 3647 3105 4458 1325 191 -2562 2551 -1691 449 -309 +-7045 -1409 -6775 -1656 -1093 1301 -2177 -1163 -3507 -1759 29500 -6082 +-18710 -3191 -3246 15487 9665 -13544 4798 -1320 11488 4203 3102 1133 -3915 -1302 +-2095 -3624 -1119 -1002 108 -122 685 -82 -1685 -679 -1714 -55 -1384 -413 +-1804 -758 1963 1092 357 -6 1346 10 -2670 2101 -766 1140 -39 1659 -597 2037 +1302 770 3204 -398 +25: -16237 3193 -42 3865 1727 3354 7488 567 1769 -3123 1669 -2983 -418 -1243 +-3098 -2711 -1165 259 -1742 3440 -2951 382 0 2000 0 2000 9205 -9906 2076 -5315 +-1764 -4576 12607 5377 8440 -278 455 985 -1602 -1549 -2810 -1220 -2108 -497 +-673 -1128 -880 -755 -844 -164 -45 -791 -313 -895 -2721 -1259 238 1196 +1687 1777 -574 843 -684 937 -2690 218 1321 1893 802 2088 3200 323 5363 -1207 +26: -18107 2782 -2092 3698 -1342 3856 12267 120 -467 -678 2741 -3778 183 -1145 +-1215 -1039 -823 -1 899 324 -44 1861 0 1000 375 2218 1625 782 9005 -3530 +1876 -3709 5210 -426 5592 -838 1924 -3352 -1432 -1674 -1963 -1266 -304 -2643 +-3141 -1020 -2018 -512 -1068 -1965 -322 -921 -44 -163 -689 -169 -666 1995 +235 1211 1480 297 111 1929 -3528 568 -86 795 1809 1483 6000 -1119 8352 -2725 +27: -15027 798 -177 2510 1012 3787 7493 1218 -774 -1947 1216 -2468 -1174 -223 +-742 -71 163 -586 2010 -18 2000 2000 0 2000 807 1254 437 826 4584 -2860 +2921 -1198 2641 -314 5331 -1483 3298 -2594 -1457 -2265 -1076 -1615 -297 -1419 +-3157 -1123 -4032 -2209 27 -2043 920 -969 46 -980 -1257 -392 -4734 7912 +4438 -3887 -2893 1162 5360 2169 -1943 -2573 -1507 1810 2403 1821 9566 -3199 +11636 -4570 +28: -10662 -998 292 1038 -5265 4989 12447 987 -3140 -3750 2032 -585 -3574 331 +258 -73 -279 61 2616 -786 2218 65 2604 1664 4423 1513 -2109 -1336 -152 -2651 +3348 971 1615 440 3139 -516 2132 -1643 -192 -1855 -574 -1737 -1410 -1874 +-2753 -1818 -3087 1527 -2097 -4769 89 -280 2211 -15 -1306 547 -10824 6553 +8051 -5806 5525 4111 2686 3060 -5071 464 1576 -1936 7370 -2501 12466 -4954 +14097 -5891 +29: -6637 -584 2539 1277 -748 -32 823 -459 -1194 -894 1568 229 -1390 1597 +2432 67 23 -944 -416 -257 0 -3000 -2720 1989 6776 -899 4794 763 9713 2153 +-8324 -2071 -1239 65 1307 244 1041 -818 960 -1870 -1308 -1556 -1000 -1000 +-2185 -1117 -1024 -1002 -1883 -2075 72 -636 1904 -18 1072 473 -1776 1960 +48 -472 1127 2283 -1057 3613 -3384 752 5575 -2670 13440 -5605 16367 -6914 +16313 -7030 +30: -4765 -453 3502 574 1146 -787 -562 -627 -1207 -172 1208 422 14 957 +-431 -176 -2905 -1738 -257 -25 -3612 -1052 -1131 1077 7868 1735 4972 -806 +-8162 -661 10660 -1726 -1497 2563 77 -158 1111 -909 2148 -1521 -2887 -115 +-1216 -1509 -279 -918 -1694 -1846 1575 -1645 -185 38 656 662 537 2763 -3657 2254 +1537 483 -1371 1915 -887 357 -835 -239 7016 -4174 20824 -9478 20584 -9116 +17859 -7952 +31: -4037 -459 4908 123 3039 -556 1267 -455 368 -12 332 438 -1625 691 -3348 211 +-1530 -929 2893 225 -4267 -1277 -11272 3460 15427 -3101 -2386 -9155 2260 5334 +2384 1169 -2646 3752 1233 -1459 2778 1523 532 -355 -2704 -980 -2461 -258 +-1168 -465 -4709 -972 6883 2384 -1062 -486 1760 720 4325 -1752 -3096 1310 +-2078 1331 -4778 1910 4035 -2336 -2350 1081 4834 -4809 33656 -15590 24122 -11029 +17970 -8348 +32: -3700 -293 6983 -19 5615 -316 4226 -248 3109 54 1736 354 -1661 474 +-6979 249 -3154 162 47825 2583 12000 -2000 -72000 10000 13300 -7819 -7300 -28181 +-9000 2000 9000 5000 0 17000 -1000 2000 9421 2789 -2291 190 -5130 21 15000 -3000 +-16000 -2000 -9321 5195 33995 6522 326 -4717 11000 -11000 7000 -4000 -2863 1397 +-35583 11400 -8875 1804 16321 -7601 -15753 6448 -1145 -4686 54898 -24762 +23396 -11131 16559 -8236 +33: -3432 85 9566 -34 8688 -154 7833 -97 7225 97 6862 306 6699 437 6965 484 +-214 662 22959 1489 -197 -130 -42569 2278 -10653 -8997 -11106 -18666 -8905 -3700 +1692 5835 524 12894 880 6497 5224 4249 360 1836 -145 520 7013 -1257 -5776 -154 +329 3762 21344 3173 9613 -4220 9929 -8544 3962 -4270 -7800 1308 -25010 6861 +-11444 1843 2984 -3349 -6067 434 6685 -7019 35519 -17747 25333 -12871 +18689 -9920 +34: -3189 620 12367 -14 11829 -61 11305 -19 10921 96 10661 226 10272 319 +8870 367 4172 406 7815 377 -6104 -706 -25145 -1826 -17124 -7648 -13786 -11060 +-9837 -3779 -3424 3880 -1222 8649 426 7021 2572 5087 1546 3091 1881 1609 +4097 509 880 921 4974 2182 13638 1015 10489 -3045 7678 -5395 1489 -3301 +-7621 310 -15807 2978 -10447 845 -2528 -2144 -851 -2964 8916 -7787 23029 -13247 +22196 -12480 18886 -10904 +35: -3007 1251 15149 -1 14752 -25 14266 -9 13699 36 12924 80 11578 84 9000 22 +4740 -147 1549 -561 -7622 -1579 -17312 -3110 -16791 -5847 -14449 -6636 +-10904 -2659 -6425 2424 -3361 5852 -1038 6107 873 5148 1555 3793 2440 2572 +3677 1696 3734 1495 6269 1451 9734 273 8592 -1974 5542 -3268 376 -2391 +-5845 -546 -10126 595 -8073 -490 -3286 -2533 1008 -4492 8255 -7812 16163 -10996 +18128 -11604 17374 -11160 +36: -2896 1928 17800 -7 17375 -34 16719 -55 15754 -79 14310 -124 12097 -223 +8768 -404 4287 -714 -650 -1239 -7417 -2088 -13466 -3182 -15005 -4315 -14020 -4104 +-11506 -1629 -8199 1669 -5191 4173 -2617 5040 -492 4823 1019 4070 2356 3196 +3618 2435 4564 1900 6100 1330 7397 275 6507 -1115 3917 -1971 39 -1793 -4063 -1113 +-6539 -852 -5667 -1693 -2533 -3295 1534 -5245 6850 -7679 11997 -9858 14529 -10862 +15142 -11072 Added: trunk/toolkits/basemap/datumgrid/alaska.lla =================================================================== --- trunk/toolkits/basemap/datumgrid/alaska.lla (rev 0) +++ trunk/toolkits/basemap/datumgrid/alaska.lla 2010年08月29日 13:26:17 UTC (rev 8669) @@ -0,0 +1,20751 @@ +Alaska + 529 249 1 -194.00000 .12500 46.00000 .12500 +0: 7735165 -6427502 -4788 8872 -4831 8861 -4882 8842 -4939 8828 -5000 8810 +-5060 8793 -5127 8772 -5195 8751 -5264 8725 -5345 8704 -5420 8684 -5500 8665 +-5571 8642 -5654 8624 -5733 8609 -5815 8592 -5889 8574 -5965 8557 -6037 8546 +-6105 8539 -6176 8530 -6242 8523 -6300 8519 -6357 8521 -6412 8523 -6452 8529 +-6492 8537 -6532 8543 -6566 8559 -6585 8572 -6609 8593 -6625 8618 -6629 8647 +-6637 8675 -6635 8705 -6633 8735 -6629 8766 -6614 8802 -6598 8838 -6574 8883 +-6552 8921 -6531 8960 -6509 9002 -6481 9044 -6455 9084 -6424 9124 -6401 9164 +-6374 9200 -6354 9238 -6331 9267 -6315 9308 -6300 9340 -6284 9360 -6282 9387 +-6278 9410 -6277 9426 -6287 9438 -6307 9450 -6339 9460 -6379 9467 -6417 9465 +-6451 9459 -6486 9446 -6524 9437 -6567 9419 -6628 9397 -6690 9373 -6756 9346 +-6833 9317 -6908 9283 -6992 9247 -7089 9211 -7181 9169 -7282 9136 -7390 9090 +-7498 9048 -7609 9014 -7725 8972 -7849 8929 -7970 8895 -8100 8860 -8232 8828 +-8366 8796 -8503 8773 -8641 8749 -8784 8724 -8935 8716 -9079 8703 -9238 8697 +-9396 8700 -9561 8707 -9732 8717 -9900 8738 -10076 8761 -10263 8798 -10453 8834 +-10656 8885 -10857 8940 -11057 9007 -11274 9076 -11492 9153 -11721 9239 +-11955 9336 -12187 9440 -12429 9546 -12675 9664 -12923 9783 -13166 9911 +-13421 10044 -13671 10183 -13925 10328 -14179 10476 -14426 10630 -14662 10785 +-14893 10941 -15131 11095 -15376 11243 -15616 11406 -15843 11570 -16051 11731 +-16259 11884 -16458 12035 -16641 12182 -16820 12324 -16988 12466 -17144 12596 +-17291 12725 -17425 12850 -17541 12968 -17651 13080 -17752 13186 -17842 13284 +-17918 13375 -17978 13460 -18026 13536 -18067 13602 -18092 13666 -18108 13724 +-18121 13774 -18113 13814 -18092 13842 -18067 13874 -18038 13891 -17986 13902 +-17932 13909 -17869 13905 -17792 13897 -17714 13881 -17629 13856 -17537 13824 +-17435 13788 -17331 13743 -17219 13694 -17105 13644 -16988 13579 -16868 13515 +-16751 13441 -16625 13366 -16500 13283 -16376 13196 -16256 13104 -16142 13013 +-16026 12916 -15908 12810 -15802 12707 -15693 12603 -15592 12499 -15499 12394 +-15412 12286 -15331 12173 -15259 12065 -15188 11960 -15126 11854 -15081 11758 +-15032 11660 -14992 11555 -14954 11451 -14927 11353 -14903 11264 -14893 11175 +-14881 11092 -14878 11015 -14879 10934 -14884 10862 -14888 10796 -14891 10734 +-14906 10674 -14912 10619 -14921 10571 -14931 10523 -14937 10478 -14945 10439 +-14946 10401 -14944 10371 -14942 10342 -14929 10310 -14923 10287 -14904 10263 +-14873 10241 -14844 10222 -14811 10206 -14766 10193 -14720 10179 -14665 10162 +-14608 10149 -14539 10137 -14465 10122 -14387 10109 -14303 10090 -14215 10081 +-14124 10067 -14022 10053 -13916 10036 -13815 10023 -13707 10006 -13596 9992 +-13483 9972 -13365 9954 -13245 9935 -13125 9912 -13007 9894 -12883 9867 +-12764 9848 -12641 9828 -12519 9806 -12399 9787 -12277 9761 -12156 9734 +-12040 9714 -11920 9687 -11802 9665 -11685 9642 -11571 9620 -11466 9601 +-11359 9570 -11250 9551 -11142 9526 -11039 9498 -10938 9466 -10837 9434 +-10744 9404 -10653 9374 -10565 9344 -10481 9314 -10396 9287 -10319 9259 +-10248 9233 -10174 9208 -10107 9178 -10045 9153 -9987 9129 -9931 9105 +-9879 9084 -9832 9062 -9789 9044 -9752 9022 -9717 9005 -9687 8987 -9656 8973 +-9631 8960 -9608 8949 -9588 8940 -9575 8933 -9563 8923 -9550 8916 -9536 8916 +-9530 8911 -9524 8909 -9517 8909 -9515 8912 -9510 8914 -9503 8916 -9499 8921 +-9495 8929 -9491 8933 -9487 8940 -9482 8949 -9479 8956 -9470 8965 -9462 8973 +-9454 8986 -9446 8996 -9437 9004 -9427 9015 -9415 9027 -9404 9038 -9393 9053 +-9381 9063 -9367 9079 -9353 9092 -9341 9106 -9329 9120 -9316 9134 -9303 9151 +-9288 9179 -9272 9197 -9260 9211 -9247 9223 -9233 9238 -9218 9256 -9203 9271 +-9184 9289 -9169 9308 -9154 9328 -9137 9344 -9118 9363 -9094 9379 -9067 9394 +-9040 9410 -9014 9426 -8983 9442 -8950 9455 -8910 9468 -8867 9478 -8821 9488 +-8771 9497 -8720 9505 -8662 9512 -8601 9518 -8536 9522 -8466 9526 -8389 9527 +-8311 9526 -8228 9525 -8146 9526 -8064 9524 -7973 9522 -7878 9516 -7779 9510 +-7685 9506 -7593 9500 -7502 9495 -7410 9487 -7311 9480 -7217 9472 -7128 9465 +-7046 9456 -6972 9447 -6898 9438 -6825 9432 -6758 9422 -6700 9412 -6650 9403 +-6608 9391 -6574 9381 -6548 9370 -6530 9360 -6517 9348 -6511 9336 -6512 9325 +-6526 9311 -6550 9296 -6580 9282 -6613 9268 -6643 9256 -6675 9243 -6720 9229 +-6775 9216 -6832 9200 -6881 9187 -6919 9180 -6953 9172 -6991 9164 -7035 9155 +-7073 9149 -7094 9147 -7099 9149 -7093 9155 -7080 9164 -7061 9173 -7027 9188 +-6981 9207 -6914 9227 -6832 9254 -6731 9287 -6617 9323 -6486 9365 -6340 9410 +-6191 9452 -6023 9501 -5833 9560 -5622 9620 -5397 9688 -5172 9750 -4957 9809 +-4734 9871 -4492 9940 -4229 10015 -3967 10085 -3718 10150 -3492 10208 +-3274 10262 -3048 10318 -2816 10374 -2597 10425 -2403 10467 -2239 10496 +-2096 10519 -1967 10535 -1850 10547 -1755 10548 -1688 10541 -1645 10522 +-1630 10497 -1645 10457 -1692 10405 -1763 10345 -1851 10279 -1943 10211 +-2056 10132 -2208 10038 -2402 9932 -2611 9819 -2806 9710 -2980 9606 -3158 9502 +-3375 9382 -3618 9253 -3851 9125 -4044 9013 -4184 8917 -4302 8829 -4434 8734 +-4568 8639 -4666 8554 -4697 8493 -4652 8459 -4554 8442 -4436 8431 -4285 8430 +-4070 8451 -3779 8501 -3400 8579 -2948 8683 -2434 8808 -1855 8954 -1199 9127 +-464 9327 341 9553 1226 9805 2206 10090 3273 10407 4415 10747 5610 11107 +6846 11483 8152 11882 9565 12318 11067 12784 12621 13272 14195 13764 15762 14256 +17368 14763 19067 15303 20843 15867 22635 16439 24394 17002 26095 17548 +27794 18095 29555 18661 31351 19241 33118 19815 34808 20362 36394 20878 +37924 21378 39467 21883 40994 22385 42450 22863 43783 23306 44982 23705 +46080 24074 47128 24428 48123 24767 48980 25062 49704 25312 50300 25525 +50765 25701 51091 25838 51278 25932 51330 25983 51241 25987 51002 25948 +50615 25869 50090 25742 49372 25565 48463 25336 47482 25057 46469 24741 +45213 24382 43498 23949 41468 23497 39609 23025 38166 22361 36737 21552 +34555 20950 31220 20594 27204 19998 23556 18754 21138 17138 19976 15919 +19174 15575 17398 15729 13467 15437 6743 13853 -3222 10368 -20000 3000 +-21000 4000 -20000 3000 -20000 3000 -20000 3000 -20000 4000 -20000 3000 +-21000 3000 -20000 4000 -20000 3000 -21000 4000 -20000 3000 -20000 3000 +-20000 4000 -21000 3000 -20000 4000 -20000 3000 -21000 4000 -20000 3000 +-20000 3000 -20000 4000 -21000 3000 -20000 3000 -20000 3000 +1: 7771340 -6419781 -4660 8832 -4698 8821 -4740 8799 -4794 8780 -4847 8762 +-4901 8743 -4958 8718 -5018 8696 -5077 8669 -5146 8646 -5209 8618 -5275 8597 +-5339 8575 -5407 8554 -5473 8536 -5540 8514 -5600 8492 -5662 8481 -5713 8461 +-5769 8449 -5828 8437 -5874 8429 -5914 8422 -5961 8422 -5997 8422 -6021 8425 +-6048 8428 -6069 8436 -6085 8445 -6092 8458 -6104 8476 -6100 8501 -6097 8524 +-6092 8554 -6074 8581 -6062 8609 -6043 8638 -6020 8674 -5993 8714 -5965 8745 +-5935 8788 -5905 8826 -5877 8864 -5842 8904 -5814 8945 -5781 8983 -5754 9022 +-5727 9055 -5707 9088 -5686 9121 -5672 9153 -5658 9185 -5650 9205 -5654 9230 +-5651 9245 -5660 9258 -5677 9272 -5701 9279 -5697 9277 -5737 9282 -5794 9273 +-5852 9266 -5910 9253 -5973 9237 -6040 9219 -6122 9189 -6203 9162 -6288 9131 +-6384 9098 -6482 9061 -6586 9018 -6701 8977 -6813 8934 -6932 8895 -7063 8845 +-7192 8802 -7323 8763 -7464 8714 -7606 8677 -7752 8635 -7901 8600 -8056 8563 +-8210 8538 -8367 8512 -8526 8491 -8692 8471 -8864 8456 -9029 8448 -9207 8452 +-9387 8457 -9571 8463 -9762 8487 -9950 8507 -10148 8543 -10351 8583 -10559 8633 +-10780 8693 -11003 8758 -11223 8831 -11455 8916 -11689 9002 -11936 9107 +-12187 9215 -12440 9334 -12694 9458 -12955 9589 -13222 9725 -13478 9868 +-13745 10019 -14009 10176 -14273 10337 -14538 10505 -14794 10672 -15039 10848 +-15277 11021 -15520 11194 -15769 11357 -16024 11530 -16255 11710 -16468 11884 +-16674 12059 -16866 12220 -17047 12385 -17218 12541 -17380 12689 -17531 12835 +-17674 12975 -17795 13104 -17908 13232 -18011 13347 -18101 13461 -18180 13565 +-18241 13659 -18294 13747 -18332 13826 -18364 13893 -18373 13960 -18385 14017 +-18380 14064 -18357 14102 -18329 14133 -18293 14156 -18250 14173 -18192 14182 +-18124 14183 -18046 14177 -17959 14163 -17874 14139 -17776 14108 -17677 14070 +-17569 14030 -17452 13978 -17331 13927 -17214 13862 -17092 13793 -16963 13718 +-16838 13638 -16714 13555 -16585 13465 -16456 13372 -16337 13274 -16220 13174 +-16103 13069 -15986 12956 -15884 12846 -15779 12738 -15685 12626 -15594 12513 +-15515 12399 -15443 12285 -15381 12172 -15319 12058 -15270 11950 -15230 11849 +-15200 11749 -15173 11643 -15146 11533 -15135 11436 -15126 11340 -15130 11255 +-15140 11173 -15154 11092 -15168 11013 -15191 10944 -15208 10880 -15232 10819 +-15257 10762 -15282 10709 -15313 10662 -15327 10617 -15351 10576 -15368 10540 +-15382 10509 -15390 10479 -15397 10451 -15392 10427 -15393 10406 -15377 10386 +-15356 10371 -15325 10354 -15293 10341 -15251 10327 -15203 10317 -15147 10303 +-15086 10293 -15009 10282 -14929 10267 -14847 10254 -14752 10238 -14657 10228 +-14552 10212 -14443 10195 -14325 10181 -14208 10163 -14090 10144 -13966 10126 +-13838 10104 -13705 10082 -13572 10056 -13436 10031 -13303 10003 -13166 9974 +-13029 9948 -12893 9923 -12757 9895 -12622 9870 -12486 9835 -12353 9803 +-12222 9774 -12089 9740 -11962 9711 -11830 9683 -11707 9653 -11590 9625 +-11477 9588 -11348 9551 -11235 9515 -11126 9486 -11018 9450 -10914 9412 +-10816 9380 -10721 9346 -10626 9313 -10539 9278 -10452 9248 -10370 9216 +-10295 9186 -10221 9156 -10151 9125 -10088 9096 -10031 9069 -9974 9043 +-9920 9020 -9874 8997 -9832 8977 -9795 8955 -9763 8935 -9733 8921 -9705 8907 +-9679 8892 -9660 8882 -9642 8876 -9633 8868 -9623 8859 -9611 8856 -9602 8855 +-9598 8855 -9595 8851 -9592 8856 -9592 8859 -9589 8863 -9586 8871 -9586 8879 +-9585 8887 -9584 8897 -9584 8907 -9580 8917 -9579 8926 -9574 8941 -9569 8951 +-9565 8966 -9557 8980 -9551 8990 -9542 9006 -9532 9021 -9521 9035 -9511 9053 +-9499 9067 -9485 9085 -9471 9101 -9458 9118 -9447 9135 -9431 9152 -9412 9169 +-9398 9194 -9381 9211 -9362 9231 -9346 9249 -9327 9270 -9307 9287 -9287 9306 +-9262 9326 -9239 9346 -9218 9365 -9194 9383 -9168 9402 -9135 9420 -9100 9433 +-9068 9450 -9032 9463 -8993 9480 -8950 9492 -8903 9503 -8851 9512 -8799 9519 +-8741 9527 -8680 9534 -8616 9538 -8548 9541 -8478 9543 -8400 9544 -8318 9542 +-8233 9541 -8146 9534 -8061 9532 -7975 9529 -7881 9523 -7782 9516 -7683 9506 +-7587 9499 -7493 9491 -7405 9483 -7311 9473 -7214 9464 -7123 9454 -7032 9445 +-6955 9434 -6885 9424 -6813 9414 -6745 9406 -6683 9394 -6628 9384 -6584 9376 +-6545 9362 -6518 9352 -6496 9342 -6484 9330 -6477 9319 -6477 9308 -6482 9295 +-6500 9283 -6529 9267 -6566 9255 -6603 9242 -6638 9229 -6674 9218 -6721 9205 +-6780 9192 -6840 9177 -6893 9163 -6932 9158 -6969 9152 -7006 9142 -7053 9137 +-7091 9131 -7114 9128 -7118 9132 -7110 9139 -7097 9148 -7076 9158 -7042 9173 +-6991 9191 -6923 9215 -6838 9241 -6736 9274 -6615 9312 -6482 9354 -6333 9399 +-6178 9442 -6008 9493 -5815 9550 -5596 9614 -5370 9678 -5140 9743 -4917 9804 +-4695 9865 -4448 9935 -4179 10010 -3914 10081 -3663 10146 -3431 10206 +-3212 10259 -2983 10316 -2749 10373 -2528 10425 -2332 10467 -2166 10497 +-2022 10519 -1895 10536 -1776 10550 -1680 10551 -1615 10544 -1574 10527 +-1560 10499 -1576 10460 -1627 10409 -1700 10348 -1789 10284 -1887 10215 +-2002 10136 -2158 10041 -2356 9936 -2570 9821 -2772 9712 -2948 9609 -3131 9503 +-3354 9384 -3598 9254 -3841 9125 -4040 9010 -4184 8914 -4306 8826 -4443 8729 +-4583 8632 -4687 8548 -4725 8483 -4685 8448 -4591 8429 -4475 8416 -4331 8414 +-4124 8432 -3835 8480 -3461 8555 -3013 8657 -2505 8779 -1928 8921 -1277 9091 +-548 9288 252 9510 1135 9759 2111 10041 3173 10352 4309 10688 5505 11045 +6734 11416 8036 11809 9443 12240 10941 12702 12494 13184 14066 13672 15626 14157 +17225 14658 18920 15190 20692 15750 22481 16316 24238 16874 25934 17413 +27626 17951 29381 18512 31173 19085 32938 19651 34625 20194 36206 20703 +37730 21197 39268 21694 40793 22189 42245 22662 43578 23099 44772 23492 +45863 23854 46907 24204 47880 24534 48730 24823 49453 25069 50048 25277 +50513 25448 50841 25583 51024 25674 51079 25722 50989 25723 50742 25683 +50358 25600 49837 25474 49108 25298 48174 25066 47190 24783 46196 24472 +44957 24115 43218 23671 41139 23226 39241 22771 37776 22101 36329 21283 +34124 20669 30792 20294 26827 19663 23261 18421 20878 16886 19641 15808 +18621 15556 16492 15626 12092 15030 4691 12934 -6082 8878 -20000 3000 +-20000 4000 -20000 3000 -21000 3000 -20000 4000 -20000 3000 -20000 3000 +-20000 4000 -21000 3000 -20000 4000 -20000 4000 -21000 3000 -20000 4000 +-20000 3000 -21000 4000 -20000 3000 -20000 4000 -20000 3000 -21000 4000 +-20000 3000 -20000 4000 -20000 3000 -20000 3000 -21000 3000 +2: 7807521 -6412057 -4525 8790 -4562 8780 -4599 8754 -4646 8736 -4688 8707 +-4734 8687 -4781 8667 -4835 8639 -4886 8611 -4943 8585 -4992 8552 -5046 8529 +-5097 8504 -5152 8482 -5207 8455 -5255 8434 -5305 8411 -5347 8395 -5389 8376 +-5427 8356 -5463 8345 -5497 8334 -5525 8321 -5551 8317 -5572 8316 -5583 8317 +-5592 8318 -5597 8324 -5596 8334 -5593 8341 -5586 8360 -5570 8380 -5554 8400 +-5532 8427 -5502 8453 -5478 8481 -5452 8511 -5418 8541 -5382 8582 -5344 8615 +-5305 8653 -5272 8687 -5239 8724 -5197 8765 -5164 8805 -5129 8841 -5100 8876 +-5072 8910 -5057 8940 -5038 8970 -5020 9001 -5012 9029 -5007 9052 -5015 9072 +-5022 9082 -5045 9092 -5065 9105 -5098 9106 -5081 9098 -5123 9099 -5190 9087 +-5262 9076 -5346 9062 -5432 9036 -5519 9016 -5616 8983 -5719 8955 -5823 8917 +-5940 8878 -6056 8835 -6182 8792 -6312 8746 -6451 8699 -6593 8651 -6736 8602 +-6891 8555 -7046 8511 -7202 8463 -7372 8419 -7537 8374 -7706 8340 -7884 8302 +-8058 8274 -8235 8250 -8420 8229 -8605 8212 -8797 8199 -8985 8195 -9179 8202 +-9383 8211 -9589 8224 -9796 8250 -10003 8279 -10226 8320 -10444 8369 -10669 8428 +-10911 8498 -11154 8574 -11391 8657 -11638 8753 -11895 8855 -12161 8970 +-12425 9098 -12691 9226 -12964 9369 -13239 9515 -13521 9667 -13798 9826 +-14073 9995 -14350 10167 -14628 10350 -14902 10529 -15167 10724 -15423 10912 +-15666 11104 -15911 11294 -16164 11475 -16434 11664 -16672 11852 -16885 12047 +-17087 12235 -17276 12415 -17450 12590 -17622 12760 -17778 12918 -17922 13078 +-18052 13225 -18170 13365 -18276 13497 -18370 13621 -18451 13739 -18519 13850 +-18570 13948 -18613 14037 -18637 14116 -18655 14191 -18659 14256 -18655 14311 +-18636 14358 -18604 14393 -18563 14424 -18518 14442 -18461 14456 -18390 14463 +-18313 14461 -18222 14448 -18127 14427 -18028 14401 -17920 14362 -17816 14319 +-17697 14271 -17571 14215 -17447 14153 -17316 14083 -17189 14008 -17056 13925 +-16927 13837 -16794 13741 -16663 13645 -16534 13546 -16414 13445 -16292 13333 +-16178 13221 -16066 13104 -15961 12988 -15862 12871 -15773 12751 -15686 12633 +-15616 12513 -15554 12395 -15500 12276 -15447 12156 -15409 12045 -15385 11936 +-15361 11838 -15352 11731 -15345 11615 -15346 11515 -15352 11421 -15377 11336 +-15396 11253 -15432 11172 -15464 11092 -15499 11026 -15538 10961 -15576 10904 +-15614 10850 -15660 10797 -15698 10756 -15737 10712 -15773 10675 -15801 10645 +-15826 10614 -15847 10589 -15858 10566 -15866 10546 -15870 10528 -15859 10513 +-15846 10500 -15820 10487 -15786 10478 -15743 10469 -15691 10457 -15637 10448 +-15570 10437 -15490 10429 -15401 10415 -15312 10402 -15208 10388 -15101 10378 +-14992 10358 -14865 10343 -14739 10325... [truncated message content]
Revision: 8668 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8668&view=rev Author: leejjoon Date: 2010年08月28日 15:56:48 +0000 (2010年8月28日) Log Message: ----------- Merged revisions 8652,8667 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8652 | efiring | 2010年08月21日 13:49:53 -0400 (2010年8月21日) | 2 lines Axis.set_view_interval: when updating, respect original orientation ........ r8667 | leejjoon | 2010年08月28日 11:54:32 -0400 (2010年8月28日) | 1 line fix gridspec bug that location is wrongly calculated for non-square grid ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/gridspec.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8650 /trunk/matplotlib:1-7315 + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 /branches/v1_0_maint:1-8667 Modified: svn:mergeinfo - /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/examples/misc/multiprocess.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Modified: trunk/matplotlib/lib/matplotlib/gridspec.py =================================================================== --- trunk/matplotlib/lib/matplotlib/gridspec.py 2010年08月28日 15:54:32 UTC (rev 8667) +++ trunk/matplotlib/lib/matplotlib/gridspec.py 2010年08月28日 15:56:48 UTC (rev 8668) @@ -156,8 +156,8 @@ col1, col2 = k2, k2+1 - num1 = row1*nrows + col1 - num2 = (row2-1)*nrows + (col2-1) + num1 = row1*ncols + col1 + num2 = (row2-1)*ncols + (col2-1) # single key else: Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8667 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8667&view=rev Author: leejjoon Date: 2010年08月28日 15:54:32 +0000 (2010年8月28日) Log Message: ----------- fix gridspec bug that location is wrongly calculated for non-square grid Modified Paths: -------------- branches/v1_0_maint/lib/matplotlib/gridspec.py Modified: branches/v1_0_maint/lib/matplotlib/gridspec.py =================================================================== --- branches/v1_0_maint/lib/matplotlib/gridspec.py 2010年08月27日 18:21:35 UTC (rev 8666) +++ branches/v1_0_maint/lib/matplotlib/gridspec.py 2010年08月28日 15:54:32 UTC (rev 8667) @@ -157,8 +157,8 @@ col1, col2 = k2, k2+1 - num1 = row1*nrows + col1 - num2 = (row2-1)*nrows + (col2-1) + num1 = row1*ncols + col1 + num2 = (row2-1)*ncols + (col2-1) # single key else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8666 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8666&view=rev Author: ryanmay Date: 2010年08月27日 18:21:35 +0000 (2010年8月27日) Log Message: ----------- Add some TODO's and remove some debug code. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/animation.py Modified: trunk/matplotlib/lib/matplotlib/animation.py =================================================================== --- trunk/matplotlib/lib/matplotlib/animation.py 2010年08月27日 18:13:22 UTC (rev 8665) +++ trunk/matplotlib/lib/matplotlib/animation.py 2010年08月27日 18:21:35 UTC (rev 8666) @@ -8,6 +8,8 @@ # * Currently broken with Qt4 for widgets that don't start on screen # * Still a few edge cases that aren't working correctly # * Can this integrate better with existing matplotlib animation artist flag? +# - If animated removes from default draw(), perhaps we could use this to +# simplify initial draw. # * Example # * Frameless animation - pure procedural with no loop # * Need example that uses something like inotify or subprocess @@ -15,17 +17,8 @@ # * Movies # * Library to make movies? # * RC parameter for config? +# * Can blit be enabled for movies? # * Need to consider event sources to allow clicking through multiple figures -from datetime import datetime - -def traceme(func): - def wrapper(*args): - print '%s -- Calling: %s %s' % (datetime.now(), func.__name__, str(args)) - ret = func(*args) - print 'Returned: %s' % func.__name__ - return ret - return wrapper - import itertools from matplotlib.cbook import iterable @@ -117,7 +110,11 @@ # Create a new sequence of frames for saved data. This is different # from new_frame_seq() to give the ability to save 'live' generated # frame information to be saved later. + # TODO: Right now, after closing the figure, saving a movie won't + # work since GUI widgets are gone. Either need to remove extra code + # to allow for this non-existant use case or find a way to make it work. for idx,data in enumerate(self.new_saved_frame_seq()): + #TODO: Need to see if turning off blit is really necessary self._draw_next_frame(data, blit=False) fname = '%s%04d.png' % (frame_prefix, idx) fnames.append(fname) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8665 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8665&view=rev Author: ryanmay Date: 2010年08月27日 18:13:22 +0000 (2010年8月27日) Log Message: ----------- Fix some issues with saving movies from FuncAnimation. The initialization draw was putting data in the saved sequence, which needed to be removed. Also, handle the case where there is no saved sequence. Make sure to disconnect signals for first draw, otherwise saving the movie will start the animation. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/animation.py Modified: trunk/matplotlib/lib/matplotlib/animation.py =================================================================== --- trunk/matplotlib/lib/matplotlib/animation.py 2010年08月27日 07:13:14 UTC (rev 8664) +++ trunk/matplotlib/lib/matplotlib/animation.py 2010年08月27日 18:13:22 UTC (rev 8665) @@ -26,6 +26,7 @@ return ret return wrapper +import itertools from matplotlib.cbook import iterable class Animation(object): @@ -78,6 +79,7 @@ self.event_source.add_callback(self._step) self.event_source.start() self._fig.canvas.mpl_disconnect(self._first_draw_id) + self._first_draw_id = None # So we can check on save def _stop(self, *args): # On stop we disconnect all of our events. @@ -103,6 +105,14 @@ image files. This prefix will have a frame number (i.e. 0001) appended when saving individual frames. ''' + # Need to disconnect the first draw callback, since we'll be doing + # draws. Otherwise, we'll end up starting the animation. + if self._first_draw_id is not None: + self._fig.canvas.mpl_disconnect(self._first_draw_id) + reconnect_first_draw = True + else: + reconnect_first_draw = False + fnames = [] # Create a new sequence of frames for saved data. This is different # from new_frame_seq() to give the ability to save 'live' generated @@ -121,6 +131,11 @@ for fname in fnames: os.remove(fname) + # Reconnect signal for first draw if necessary + if reconnect_first_draw: + self._first_draw_id = self._fig.canvas.mpl_connect('draw_event', + self._start) + def ffmpeg_cmd(self, fname, fps, codec, frame_prefix): # Returns the command line parameters for subprocess to use # ffmpeg to create a movie @@ -401,7 +416,6 @@ # be a generator. An iterable will be used as is, and anything else # will be treated as a number of frames. if frames is None: - import itertools self._iter_gen = itertools.count elif callable(frames): self._iter_gen = frames @@ -417,17 +431,28 @@ self.save_count = 100 self._init_func = init_func - self._save_seq = [] + # Needs to be initialized so the draw functions work without checking + self._save_seq = [] + TimedAnimation.__init__(self, fig, **kwargs) + # Need to reset the saved seq, since right now it will contain data + # for a single frame from init, which is not what we want. + self._save_seq = [] + def new_frame_seq(self): # Use the generating function to generate a new frame sequence return self._iter_gen() def new_saved_frame_seq(self): - # Generate an iterator for the sequence of saved data. - return iter(self._save_seq) + # Generate an iterator for the sequence of saved data. If there are + # no saved frames, generate a new frame sequence and take the first + # save_count entries in it. + if self._save_seq: + return iter(self._save_seq) + else: + return itertools.islice(self.new_frame_seq(), self.save_count) def _init_draw(self): # Initialize the drawing either using the given init_func or by This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8664 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8664&view=rev Author: efiring Date: 2010年08月27日 07:13:14 +0000 (2010年8月27日) Log Message: ----------- backend_qt4: don't make app if ipython already made it; patch by Brian Granger Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py =================================================================== --- trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py 2010年08月26日 03:49:17 UTC (rev 8663) +++ trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py 2010年08月27日 07:13:14 UTC (rev 8664) @@ -50,11 +50,16 @@ if QtGui.QApplication.startingUp(): if DEBUG: print "Starting up QApplication" global qApp - qApp = QtGui.QApplication( [" "] ) - QtCore.QObject.connect( qApp, QtCore.SIGNAL( "lastWindowClosed()" ), - qApp, QtCore.SLOT( "quit()" ) ) - #remember that matplotlib created the qApp - will be used by show() - _create_qApp.qAppCreatedHere = True + app = QtGui.QApplication.instance() + if app is None: + qApp = QtGui.QApplication( [" "] ) + QtCore.QObject.connect( qApp, QtCore.SIGNAL( "lastWindowClosed()" ), + qApp, QtCore.SLOT( "quit()" ) ) + #remember that matplotlib created the qApp - will be used by show() + _create_qApp.qAppCreatedHere = True + else: + qApp = app + _create_qApp.qAppCreatedHere = False _create_qApp.qAppCreatedHere = False This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8663 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8663&view=rev Author: ryanmay Date: 2010年08月26日 03:49:17 +0000 (2010年8月26日) Log Message: ----------- Hide old animation examples under the animation/ subdir. Added Paths: ----------- trunk/matplotlib/examples/animation/old_animation/ Removed Paths: ------------- trunk/matplotlib/examples/old_animation/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8662 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8662&view=rev Author: ryanmay Date: 2010年08月26日 03:40:09 +0000 (2010年8月26日) Log Message: ----------- Add another set of basic examples. Added Paths: ----------- trunk/matplotlib/examples/animation/basic_example.py Added: trunk/matplotlib/examples/animation/basic_example.py =================================================================== --- trunk/matplotlib/examples/animation/basic_example.py (rev 0) +++ trunk/matplotlib/examples/animation/basic_example.py 2010年08月26日 03:40:09 UTC (rev 8662) @@ -0,0 +1,34 @@ +import numpy as np +import matplotlib.pyplot as plt +import matplotlib.animation as animation + +def update_line(num, data, line): + line.set_data(data[...,:num]) + return line, + +fig1 = plt.figure() + +data = np.random.rand(2, 25) +l, = plt.plot([], [], 'r-') +plt.xlim(0, 1) +plt.ylim(0, 1) +plt.xlabel('x') +plt.title('test') +line_ani = animation.FuncAnimation(fig1, update_line, 25, fargs=(data, l), + interval=50, blit=True) +#line_ani.save('lines.mp4') + +fig2 = plt.figure() + +x = np.arange(-9, 10) +y = np.arange(-9, 10).reshape(-1, 1) +base = np.hypot(x, y) +ims = [] +for add in np.arange(15): + ims.append((plt.pcolor(x, y, base + add, norm=plt.Normalize(0, 30)),)) + +im_ani = animation.ArtistAnimation(fig2, ims, interval=50, repeat_delay=3000, + blit=True) +#im_ani.save('im.mp4') + +plt.show() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8661 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8661&view=rev Author: ryanmay Date: 2010年08月26日 03:30:38 +0000 (2010年8月26日) Log Message: ----------- Update examples to use proper imports. Modified Paths: -------------- trunk/matplotlib/examples/animation/animate_decay.py trunk/matplotlib/examples/animation/dynamic_image.py trunk/matplotlib/examples/animation/dynamic_image2.py trunk/matplotlib/examples/animation/histogram.py trunk/matplotlib/examples/animation/random_data.py trunk/matplotlib/examples/animation/simple_3danim.py trunk/matplotlib/examples/animation/simple_anim.py trunk/matplotlib/examples/animation/strip_chart_demo.py trunk/matplotlib/examples/animation/subplots.py Modified: trunk/matplotlib/examples/animation/animate_decay.py =================================================================== --- trunk/matplotlib/examples/animation/animate_decay.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/animate_decay.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -1,6 +1,6 @@ import numpy as np import matplotlib.pyplot as plt -from animation import FuncAnimation +import matplotlib.animation as animation def data_gen(): t = data_gen.t @@ -32,5 +32,6 @@ return line, -ani = FuncAnimation(fig, run, data_gen, blit=True, interval=10, repeat=False) +ani = animation.FuncAnimation(fig, run, data_gen, blit=True, interval=10, + repeat=False) plt.show() Modified: trunk/matplotlib/examples/animation/dynamic_image.py =================================================================== --- trunk/matplotlib/examples/animation/dynamic_image.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/dynamic_image.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -4,7 +4,7 @@ """ import numpy as np import matplotlib.pyplot as plt -from animation import FuncAnimation +import matplotlib.animation as animation fig = plt.figure() @@ -23,5 +23,5 @@ im.set_array(f(x,y)) return im, -ani = FuncAnimation(fig, updatefig, interval=50, blit=True) +ani = animation.FuncAnimation(fig, updatefig, interval=50, blit=True) plt.show() Modified: trunk/matplotlib/examples/animation/dynamic_image2.py =================================================================== --- trunk/matplotlib/examples/animation/dynamic_image2.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/dynamic_image2.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -4,7 +4,7 @@ """ import numpy as np import matplotlib.pyplot as plt -from animation import ArtistAnimation +import matplotlib.animation as animation fig = plt.figure() @@ -20,5 +20,6 @@ y += np.pi / 20. ims.append([plt.imshow(f(x, y), cmap=plt.get_cmap('jet'))]) -ani = ArtistAnimation(fig, ims, interval=50, blit=True, repeat_delay=1000) +ani = animation.ArtistAnimation(fig, ims, interval=50, blit=True, + repeat_delay=1000) plt.show() Modified: trunk/matplotlib/examples/animation/histogram.py =================================================================== --- trunk/matplotlib/examples/animation/histogram.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/histogram.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -7,7 +7,7 @@ import matplotlib.pyplot as plt import matplotlib.patches as patches import matplotlib.path as path -from animation import FuncAnimation +import matplotlib.animation as animation fig = plt.figure() ax = fig.add_subplot(111) @@ -58,5 +58,5 @@ verts[1::5,1] = top verts[2::5,1] = top -ani = FuncAnimation(fig, animate, 100, repeat=False) +ani = animation.FuncAnimation(fig, animate, 100, repeat=False) plt.show() Modified: trunk/matplotlib/examples/animation/random_data.py =================================================================== --- trunk/matplotlib/examples/animation/random_data.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/random_data.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -1,6 +1,6 @@ import numpy as np import matplotlib.pyplot as plt -from animation import FuncAnimation +import matplotlib.animation as animation fig = plt.figure() ax = fig.add_subplot(111) @@ -14,5 +14,5 @@ def data_gen(): while True: yield np.random.rand(10) -ani = FuncAnimation(fig, update, data_gen, interval=100) +ani = animation.FuncAnimation(fig, update, data_gen, interval=100) plt.show() Modified: trunk/matplotlib/examples/animation/simple_3danim.py =================================================================== --- trunk/matplotlib/examples/animation/simple_3danim.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/simple_3danim.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -4,9 +4,8 @@ import numpy as np import matplotlib.pyplot as plt import mpl_toolkits.mplot3d.axes3d as p3 +import matplotlib.animation as animation -from animation import FuncAnimation - def Gen_RandLine(length, dims=2) : """ Create a line using a random walk algorithm @@ -57,7 +56,7 @@ ax.set_title('3D Test') # Creating the Animation object -line_ani = FuncAnimation(fig, update_lines, 25, fargs=(data, lines), +line_ani = animation.FuncAnimation(fig, update_lines, 25, fargs=(data, lines), interval=50, blit=False) plt.show() Modified: trunk/matplotlib/examples/animation/simple_anim.py =================================================================== --- trunk/matplotlib/examples/animation/simple_anim.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/simple_anim.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -3,7 +3,7 @@ """ import numpy as np import matplotlib.pyplot as plt -from animation import FuncAnimation +import matplotlib.animation as animation fig = plt.figure() ax = fig.add_subplot(111) @@ -20,6 +20,6 @@ line.set_ydata(np.ma.array(x, mask=True)) return line, -ani = FuncAnimation(fig, animate, np.arange(1, 200), init_func=init, +ani = animation.FuncAnimation(fig, animate, np.arange(1, 200), init_func=init, interval=25, blit=True) plt.show() Modified: trunk/matplotlib/examples/animation/strip_chart_demo.py =================================================================== --- trunk/matplotlib/examples/animation/strip_chart_demo.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/strip_chart_demo.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -6,7 +6,7 @@ import numpy as np from matplotlib.lines import Line2D import matplotlib.pyplot as plt -from animation import FuncAnimation +import matplotlib.animation as animation class Scope: def __init__(self, ax, maxt=10, dt=0.01): @@ -45,5 +45,6 @@ fig = plt.figure() ax = fig.add_subplot(111) scope = Scope(ax) -ani = FuncAnimation(fig, scope.update, emitter, interval=10, blit=True) +ani = animation.FuncAnimation(fig, scope.update, emitter, interval=10, + blit=True) plt.show() Modified: trunk/matplotlib/examples/animation/subplots.py =================================================================== --- trunk/matplotlib/examples/animation/subplots.py 2010年08月26日 03:23:25 UTC (rev 8660) +++ trunk/matplotlib/examples/animation/subplots.py 2010年08月26日 03:30:38 UTC (rev 8661) @@ -1,14 +1,14 @@ import numpy as np import matplotlib.pyplot as plt from matplotlib.lines import Line2D -from animation import TimedAnimation +import matplotlib.animation as animation # This example uses subclassing, but there is no reason that the proper function # couldn't be set up and then use FuncAnimation. The code is long, but not # really complex. The length is due solely to the fact that there are a total # of 9 lines that need to be changed for the animation as well as 3 subplots # that need initial set up. -class SubplotAnimation(TimedAnimation): +class SubplotAnimation(animation.TimedAnimation): def __init__(self): fig = plt.figure() ax1 = fig.add_subplot(1, 2, 1) @@ -54,7 +54,7 @@ ax3.set_xlim(-1, 1) ax3.set_ylim(0, 800) - TimedAnimation.__init__(self, fig, interval=50, blit=True) + animation.TimedAnimation.__init__(self, fig, interval=50, blit=True) def _draw_frame(self, framedata): i = framedata This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8660 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8660&view=rev Author: ryanmay Date: 2010年08月26日 03:23:25 +0000 (2010年8月26日) Log Message: ----------- Add previous animation examples ported to new framework, as well as a few new ones. Added Paths: ----------- trunk/matplotlib/examples/animation/ trunk/matplotlib/examples/animation/animate_decay.py trunk/matplotlib/examples/animation/dynamic_image.py trunk/matplotlib/examples/animation/dynamic_image2.py trunk/matplotlib/examples/animation/histogram.py trunk/matplotlib/examples/animation/random_data.py trunk/matplotlib/examples/animation/simple_3danim.py trunk/matplotlib/examples/animation/simple_anim.py trunk/matplotlib/examples/animation/strip_chart_demo.py trunk/matplotlib/examples/animation/subplots.py Added: trunk/matplotlib/examples/animation/animate_decay.py =================================================================== --- trunk/matplotlib/examples/animation/animate_decay.py (rev 0) +++ trunk/matplotlib/examples/animation/animate_decay.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,36 @@ +import numpy as np +import matplotlib.pyplot as plt +from animation import FuncAnimation + +def data_gen(): + t = data_gen.t + cnt = 0 + while cnt < 1000: + cnt+=1 + t += 0.05 + yield t, np.sin(2*np.pi*t) * np.exp(-t/10.) +data_gen.t = 0 + +fig = plt.figure() +ax = fig.add_subplot(111) +line, = ax.plot([], [], lw=2) +ax.set_ylim(-1.1, 1.1) +ax.set_xlim(0, 5) +ax.grid() +xdata, ydata = [], [] +def run(data): + # update the data + t,y = data + xdata.append(t) + ydata.append(y) + xmin, xmax = ax.get_xlim() + + if t >= xmax: + ax.set_xlim(xmin, 2*xmax) + ax.figure.canvas.draw() + line.set_data(xdata, ydata) + + return line, + +ani = FuncAnimation(fig, run, data_gen, blit=True, interval=10, repeat=False) +plt.show() Added: trunk/matplotlib/examples/animation/dynamic_image.py =================================================================== --- trunk/matplotlib/examples/animation/dynamic_image.py (rev 0) +++ trunk/matplotlib/examples/animation/dynamic_image.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,27 @@ +#!/usr/bin/env python +""" +An animated image +""" +import numpy as np +import matplotlib.pyplot as plt +from animation import FuncAnimation + +fig = plt.figure() + +def f(x, y): + return np.sin(x) + np.cos(y) + +x = np.linspace(0, 2 * np.pi, 120) +y = np.linspace(0, 2 * np.pi, 100).reshape(-1, 1) + +im = plt.imshow(f(x, y), cmap=plt.get_cmap('jet')) + +def updatefig(*args): + global x,y + x += np.pi / 15. + y += np.pi / 20. + im.set_array(f(x,y)) + return im, + +ani = FuncAnimation(fig, updatefig, interval=50, blit=True) +plt.show() Added: trunk/matplotlib/examples/animation/dynamic_image2.py =================================================================== --- trunk/matplotlib/examples/animation/dynamic_image2.py (rev 0) +++ trunk/matplotlib/examples/animation/dynamic_image2.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,24 @@ +#!/usr/bin/env python +""" +An animated image +""" +import numpy as np +import matplotlib.pyplot as plt +from animation import ArtistAnimation + +fig = plt.figure() + +def f(x, y): + return np.sin(x) + np.cos(y) + +x = np.linspace(0, 2 * np.pi, 120) +y = np.linspace(0, 2 * np.pi, 100).reshape(-1, 1) + +ims = [] +for i in range(60): + x += np.pi / 15. + y += np.pi / 20. + ims.append([plt.imshow(f(x, y), cmap=plt.get_cmap('jet'))]) + +ani = ArtistAnimation(fig, ims, interval=50, blit=True, repeat_delay=1000) +plt.show() Added: trunk/matplotlib/examples/animation/histogram.py =================================================================== --- trunk/matplotlib/examples/animation/histogram.py (rev 0) +++ trunk/matplotlib/examples/animation/histogram.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,62 @@ +""" +This example shows how to use a path patch to draw a bunch of +rectangles for an animated histogram +""" +import numpy as np + +import matplotlib.pyplot as plt +import matplotlib.patches as patches +import matplotlib.path as path +from animation import FuncAnimation + +fig = plt.figure() +ax = fig.add_subplot(111) + +# histogram our data with numpy +data = np.random.randn(1000) +n, bins = np.histogram(data, 100) + +# get the corners of the rectangles for the histogram +left = np.array(bins[:-1]) +right = np.array(bins[1:]) +bottom = np.zeros(len(left)) +top = bottom + n +nrects = len(left) + +# here comes the tricky part -- we have to set up the vertex and path +# codes arrays using moveto, lineto and closepoly + +# for each rect: 1 for the MOVETO, 3 for the LINETO, 1 for the +# CLOSEPOLY; the vert for the closepoly is ignored but we still need +# it to keep the codes aligned with the vertices +nverts = nrects*(1+3+1) +verts = np.zeros((nverts, 2)) +codes = np.ones(nverts, int) * path.Path.LINETO +codes[0::5] = path.Path.MOVETO +codes[4::5] = path.Path.CLOSEPOLY +verts[0::5,0] = left +verts[0::5,1] = bottom +verts[1::5,0] = left +verts[1::5,1] = top +verts[2::5,0] = right +verts[2::5,1] = top +verts[3::5,0] = right +verts[3::5,1] = bottom + +barpath = path.Path(verts, codes) +patch = patches.PathPatch(barpath, facecolor='green', edgecolor='yellow', alpha=0.5) +ax.add_patch(patch) + +ax.set_xlim(left[0], right[-1]) +ax.set_ylim(bottom.min(), top.max()) + +def animate(i): + # simulate new data coming in + data = np.random.randn(1000) + n, bins = np.histogram(data, 100) + top = bottom + n + verts[1::5,1] = top + verts[2::5,1] = top + +ani = FuncAnimation(fig, animate, 100, repeat=False) +plt.show() Added: trunk/matplotlib/examples/animation/random_data.py =================================================================== --- trunk/matplotlib/examples/animation/random_data.py (rev 0) +++ trunk/matplotlib/examples/animation/random_data.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,18 @@ +import numpy as np +import matplotlib.pyplot as plt +from animation import FuncAnimation + +fig = plt.figure() +ax = fig.add_subplot(111) +line, = ax.plot(np.random.rand(10)) +ax.set_ylim(0, 1) + +def update(data): + line.set_ydata(data) + return line, + +def data_gen(): + while True: yield np.random.rand(10) + +ani = FuncAnimation(fig, update, data_gen, interval=100) +plt.show() Added: trunk/matplotlib/examples/animation/simple_3danim.py =================================================================== --- trunk/matplotlib/examples/animation/simple_3danim.py (rev 0) +++ trunk/matplotlib/examples/animation/simple_3danim.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,63 @@ +""" +A simple example of an animated plot... In 3D! +""" +import numpy as np +import matplotlib.pyplot as plt +import mpl_toolkits.mplot3d.axes3d as p3 + +from animation import FuncAnimation + +def Gen_RandLine(length, dims=2) : + """ + Create a line using a random walk algorithm + + length is the number of points for the line. + dims is the number of dimensions the line has. + """ + lineData = np.empty((dims, length)) + lineData[:, 0] = np.random.rand(1, dims) + for index in xrange(1, length) : + # scaling the random numbers by 0.1 so + # movement is small compared to position. + # subtraction by 0.5 is to change the range to [-0.5, 0.5] + # to allow a line to move backwards. + step = ((np.random.rand(1, dims) - 0.5) * 0.1) + lineData[:, index] = lineData[:, index-1] + step + + return lineData + +def update_lines(num, dataLines, lines) : + for line, data in zip(lines, dataLines) : + # NOTE: there is no .set_data() for 3 dim data... + line.set_data(data[0:2, :num]) + line.set_3d_properties(data[2,:num]) + return lines + +# Attaching 3D axis to the figure +fig = plt.figure() +ax = p3.Axes3D(fig) + +# Fifty lines of random 3-D lines +data = [Gen_RandLine(25, 3) for index in xrange(50)] + +# Creating fifty line objects. +# NOTE: Can't pass empty arrays into 3d version of plot() +lines = [ax.plot(dat[0, 0:1], dat[1, 0:1], dat[2, 0:1])[0] for dat in data] + +# Setting the axes properties +ax.set_xlim3d([0.0, 1.0]) +ax.set_xlabel('X') + +ax.set_ylim3d([0.0, 1.0]) +ax.set_ylabel('Y') + +ax.set_zlim3d([0.0, 1.0]) +ax.set_zlabel('Z') + +ax.set_title('3D Test') + +# Creating the Animation object +line_ani = FuncAnimation(fig, update_lines, 25, fargs=(data, lines), + interval=50, blit=False) + +plt.show() Added: trunk/matplotlib/examples/animation/simple_anim.py =================================================================== --- trunk/matplotlib/examples/animation/simple_anim.py (rev 0) +++ trunk/matplotlib/examples/animation/simple_anim.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,25 @@ +""" +A simple example of an animated plot +""" +import numpy as np +import matplotlib.pyplot as plt +from animation import FuncAnimation + +fig = plt.figure() +ax = fig.add_subplot(111) + +x = np.arange(0, 2*np.pi, 0.01) # x-array +line, = ax.plot(x, np.sin(x)) + +def animate(i): + line.set_ydata(np.sin(x+i/10.0)) # update the data + return line, + +#Init only required for blitting to give a clean slate. +def init(): + line.set_ydata(np.ma.array(x, mask=True)) + return line, + +ani = FuncAnimation(fig, animate, np.arange(1, 200), init_func=init, + interval=25, blit=True) +plt.show() Added: trunk/matplotlib/examples/animation/strip_chart_demo.py =================================================================== --- trunk/matplotlib/examples/animation/strip_chart_demo.py (rev 0) +++ trunk/matplotlib/examples/animation/strip_chart_demo.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,49 @@ +""" +Emulate an oscilloscope. Requires the animation API introduced in +matplotlib 1.0 SVN. +""" +import matplotlib +import numpy as np +from matplotlib.lines import Line2D +import matplotlib.pyplot as plt +from animation import FuncAnimation + +class Scope: + def __init__(self, ax, maxt=10, dt=0.01): + self.ax = ax + self.dt = dt + self.maxt = maxt + self.tdata = [0] + self.ydata = [0] + self.line = Line2D(self.tdata, self.ydata) + self.ax.add_line(self.line) + self.ax.set_ylim(-.1, 1.1) + self.ax.set_xlim(0, self.maxt) + + def update(self, y): + lastt = self.tdata[-1] + if lastt > self.tdata[0] + self.maxt: # reset the arrays + self.tdata = [self.tdata[-1]] + self.ydata = [self.ydata[-1]] + self.ax.set_xlim(self.tdata[0], self.tdata[0] + self.maxt) + + t = self.tdata[-1] + self.dt + self.tdata.append(t) + self.ydata.append(y) + self.line.set_data(self.tdata, self.ydata) + return self.line, + +def emitter(p=0.01): + 'return a random value with probability p, else 0' + while True: + v = np.random.rand(1) + if v > p: + yield 0. + else: + yield np.random.rand(1) + +fig = plt.figure() +ax = fig.add_subplot(111) +scope = Scope(ax) +ani = FuncAnimation(fig, scope.update, emitter, interval=10, blit=True) +plt.show() Added: trunk/matplotlib/examples/animation/subplots.py =================================================================== --- trunk/matplotlib/examples/animation/subplots.py (rev 0) +++ trunk/matplotlib/examples/animation/subplots.py 2010年08月26日 03:23:25 UTC (rev 8660) @@ -0,0 +1,93 @@ +import numpy as np +import matplotlib.pyplot as plt +from matplotlib.lines import Line2D +from animation import TimedAnimation + +# This example uses subclassing, but there is no reason that the proper function +# couldn't be set up and then use FuncAnimation. The code is long, but not +# really complex. The length is due solely to the fact that there are a total +# of 9 lines that need to be changed for the animation as well as 3 subplots +# that need initial set up. +class SubplotAnimation(TimedAnimation): + def __init__(self): + fig = plt.figure() + ax1 = fig.add_subplot(1, 2, 1) + ax2 = fig.add_subplot(2, 2, 2) + ax3 = fig.add_subplot(2, 2, 4) + + self.t = np.linspace(0, 80, 400) + self.x = np.cos(2 * np.pi * self.t / 10.) + self.y = np.sin(2 * np.pi * self.t / 10.) + self.z = 10 * self.t + + ax1.set_xlabel('x') + ax1.set_ylabel('y') + self.line1 = Line2D([], [], color='black') + self.line1a = Line2D([], [], color='red', linewidth=2) + self.line1e = Line2D([], [], color='red', marker='o', markeredgecolor='r') + ax1.add_line(self.line1) + ax1.add_line(self.line1a) + ax1.add_line(self.line1e) + ax1.set_xlim(-1, 1) + ax1.set_ylim(-2, 2) + ax1.set_aspect('equal', 'datalim') + + ax2.set_xlabel('y') + ax2.set_ylabel('z') + self.line2 = Line2D([], [], color='black') + self.line2a = Line2D([], [], color='red', linewidth=2) + self.line2e = Line2D([], [], color='red', marker='o', markeredgecolor='r') + ax2.add_line(self.line2) + ax2.add_line(self.line2a) + ax2.add_line(self.line2e) + ax2.set_xlim(-1, 1) + ax2.set_ylim(0, 800) + + ax3.set_xlabel('x') + ax3.set_ylabel('z') + self.line3 = Line2D([], [], color='black') + self.line3a = Line2D([], [], color='red', linewidth=2) + self.line3e = Line2D([], [], color='red', marker='o', markeredgecolor='r') + ax3.add_line(self.line3) + ax3.add_line(self.line3a) + ax3.add_line(self.line3e) + ax3.set_xlim(-1, 1) + ax3.set_ylim(0, 800) + + TimedAnimation.__init__(self, fig, interval=50, blit=True) + + def _draw_frame(self, framedata): + i = framedata + head = i - 1 + head_len = 10 + head_slice = (self.t > self.t[i] - 1.0) & (self.t < self.t[i]) + + self.line1.set_data(self.x[:i], self.y[:i]) + self.line1a.set_data(self.x[head_slice], self.y[head_slice]) + self.line1e.set_data(self.x[head], self.y[head]) + + self.line2.set_data(self.y[:i], self.z[:i]) + self.line2a.set_data(self.y[head_slice], self.z[head_slice]) + self.line2e.set_data(self.y[head], self.z[head]) + + self.line3.set_data(self.x[:i], self.z[:i]) + self.line3a.set_data(self.x[head_slice], self.z[head_slice]) + self.line3e.set_data(self.x[head], self.z[head]) + + self._drawn_artists = [self.line1, self.line1a, self.line1e, + self.line2, self.line2a, self.line2e, + self.line3, self.line3a, self.line3e] + + def new_frame_seq(self): + return iter(range(self.t.size)) + + def _init_draw(self): + lines = [self.line1, self.line1a, self.line1e, + self.line2, self.line2a, self.line2e, + self.line3, self.line3a, self.line3e] + for l in lines: + l.set_data([], []) + +ani = SubplotAnimation() +#ani.save('test_sub.mp4') +plt.show() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8659 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8659&view=rev Author: ryanmay Date: 2010年08月26日 03:19:14 +0000 (2010年8月26日) Log Message: ----------- Move previous animation examples to make room for new ones. Added Paths: ----------- trunk/matplotlib/examples/old_animation/ Removed Paths: ------------- trunk/matplotlib/examples/animation/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8658 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8658&view=rev Author: ryanmay Date: 2010年08月26日 03:11:42 +0000 (2010年8月26日) Log Message: ----------- Add new animation framework. Modified Paths: -------------- trunk/matplotlib/CHANGELOG Added Paths: ----------- trunk/matplotlib/lib/matplotlib/animation.py Modified: trunk/matplotlib/CHANGELOG =================================================================== --- trunk/matplotlib/CHANGELOG 2010年08月25日 22:13:56 UTC (rev 8657) +++ trunk/matplotlib/CHANGELOG 2010年08月26日 03:11:42 UTC (rev 8658) @@ -1,3 +1,5 @@ +2010年08月25日 Add new framework for doing animations with examples.- RM + 2010年08月21日 Remove unused and inappropriate methods from Tick classes: set_view_interval, get_minpos, and get_data_interval are properly found in the Axis class and don't need to be Added: trunk/matplotlib/lib/matplotlib/animation.py =================================================================== --- trunk/matplotlib/lib/matplotlib/animation.py (rev 0) +++ trunk/matplotlib/lib/matplotlib/animation.py 2010年08月26日 03:11:42 UTC (rev 8658) @@ -0,0 +1,451 @@ +# TODO: +# * Loop Delay is broken on GTKAgg. This is because source_remove() is not +# working as we want. PyGTK bug? +# * Documentation -- this will need a new section of the User's Guide. +# Both for Animations and just timers. +# - Also need to update http://www.scipy.org/Cookbook/Matplotlib/Animations +# * Blit +# * Currently broken with Qt4 for widgets that don't start on screen +# * Still a few edge cases that aren't working correctly +# * Can this integrate better with existing matplotlib animation artist flag? +# * Example +# * Frameless animation - pure procedural with no loop +# * Need example that uses something like inotify or subprocess +# * Complex syncing examples +# * Movies +# * Library to make movies? +# * RC parameter for config? +# * Need to consider event sources to allow clicking through multiple figures +from datetime import datetime + +def traceme(func): + def wrapper(*args): + print '%s -- Calling: %s %s' % (datetime.now(), func.__name__, str(args)) + ret = func(*args) + print 'Returned: %s' % func.__name__ + return ret + return wrapper + +from matplotlib.cbook import iterable + +class Animation(object): + ''' + This class wraps the creation of an animation using matplotlib. It is + only a base class which should be subclassed to provide needed behavior. + + *fig* is the figure object that is used to get draw, resize, and any + other needed events. + + *event_source* is a class that can run a callback when desired events + are generated, as well as be stopped and started. Examples include timers + (see :class:`TimedAnimation`) and file system notifications. + + *blit* is a boolean that controls whether blitting is used to optimize + drawing. + ''' + def __init__(self, fig, event_source=None, blit=False): + self._fig = fig + self._blit = blit + + # These are the basics of the animation. The frame sequence represents + # information for each frame of the animation and depends on how the + # drawing is handled by the subclasses. The event source fires events + # that cause the frame sequence to be iterated. + self.frame_seq = self.new_frame_seq() + self.event_source = event_source + + # Clear the initial frame + self._init_draw() + + # Instead of starting the event source now, we connect to the figure's + # draw_event, so that we only start once the figure has been drawn. + self._first_draw_id = fig.canvas.mpl_connect('draw_event', self._start) + + # Connect to the figure's close_event so that we don't continue to + # fire events and try to draw to a deleted figure. + self._close_id = self._fig.canvas.mpl_connect('close_event', self._stop) + if blit: + self._setup_blit() + + def _start(self, *args): + ''' + Starts interactive animation. Adds the draw frame command to the GUI + handler, calls show to start the event loop. + ''' + # On start, we add our callback for stepping the animation and + # actually start the event_source. We also disconnect _start + # from the draw_events + self.event_source.add_callback(self._step) + self.event_source.start() + self._fig.canvas.mpl_disconnect(self._first_draw_id) + + def _stop(self, *args): + # On stop we disconnect all of our events. + if self._blit: + self._fig.canvas.mpl_disconnect(self._resize_id) + self._fig.canvas.mpl_disconnect(self._close_id) + self.event_source.remove_callback(self._step) + self.event_source = None + + def save(self, filename, fps=5, codec='mpeg4', clear_temp=True, + frame_prefix='_tmp'): + ''' + Saves a movie file by drawing every frame. + + *fps* is the frames per second in the movie + + *codec* is the codec to be used,if it is supported by the output method. + + *clear_temp* specifies whether the temporary image files should be + deleted. + + *frame_prefix* gives the prefix that should be used for individual + image files. This prefix will have a frame number (i.e. 0001) appended + when saving individual frames. + ''' + fnames = [] + # Create a new sequence of frames for saved data. This is different + # from new_frame_seq() to give the ability to save 'live' generated + # frame information to be saved later. + for idx,data in enumerate(self.new_saved_frame_seq()): + self._draw_next_frame(data, blit=False) + fname = '%s%04d.png' % (frame_prefix, idx) + fnames.append(fname) + self._fig.savefig(fname) + + self._make_movie(filename, fps, codec, frame_prefix) + + #Delete temporary files + if clear_temp: + import os + for fname in fnames: + os.remove(fname) + + def ffmpeg_cmd(self, fname, fps, codec, frame_prefix): + # Returns the command line parameters for subprocess to use + # ffmpeg to create a movie + return ['ffmpeg', '-y', '-r', str(fps), '-b', '1800k', '-i', + '%s%%04d.png' % frame_prefix, fname] + + def mencoder_cmd(self, fname, fps, codec, frame_prefix): + # Returns the command line parameters for subprocess to use + # mencoder to create a movie + return ['mencoder', 'mf://%s*.png' % frame_prefix, '-mf', + 'type=png:fps=%d' % fps, '-ovc', 'lavc', '-lavcopts', + 'vcodec=%s' % codec, '-oac', 'copy', '-o', fname] + + def _make_movie(self, fname, fps, codec, frame_prefix, cmd_gen=None): + # Uses subprocess to call the program for assembling frames into a + # movie file. *cmd_gen* is a callable that generates the sequence + # of command line arguments from a few configuration options. + from subprocess import Popen, PIPE + if cmd_gen is None: + cmd_gen = self.ffmpeg_cmd + proc = Popen(cmd_gen(fname, fps, codec, frame_prefix), shell=False, + stdout=PIPE, stderr=PIPE) + proc.wait() + + def _step(self, *args): + ''' + Handler for getting events. By default, gets the next frame in the + sequence and hands the data off to be drawn. + ''' + # Returns True to indicate that the event source should continue to + # call _step, until the frame sequence reaches the end of iteration, + # at which point False will be returned. + try: + framedata = self.frame_seq.next() + self._draw_next_frame(framedata, self._blit) + return True + except StopIteration: + return False + + def new_frame_seq(self): + 'Creates a new sequence of frame information.' + # Default implementation is just an iterator over self._framedata + return iter(self._framedata) + + def new_saved_frame_seq(self): + 'Creates a new sequence of saved/cached frame information.' + # Default is the same as the regular frame sequence + return self.new_frame_seq() + + def _draw_next_frame(self, framedata, blit): + # Breaks down the drawing of the next frame into steps of pre- and + # post- draw, as well as the drawing of the frame itself. + self._pre_draw(framedata, blit) + self._draw_frame(framedata) + self._post_draw(framedata, blit) + + def _init_draw(self): + # Initial draw to clear the frame. Also used by the blitting code + # when a clean base is required. + pass + + def _pre_draw(self, framedata, blit): + # Perform any cleaning or whatnot before the drawing of the frame. + # This default implementation allows blit to clear the frame. + if blit: + self._blit_clear(self._drawn_artists, self._blit_cache) + + def _draw_frame(self, framedata): + # Performs actual drawing of the frame. + raise NotImplementedError('Needs to be implemented by subclasses to' + ' actually make an animation.') + + def _post_draw(self, framedata, blit): + # After the frame is rendered, this handles the actual flushing of + # the draw, which can be a direct draw_idle() or make use of the + # blitting. + if blit and self._drawn_artists: + self._blit_draw(self._drawn_artists, self._blit_cache) + else: + self._fig.canvas.draw_idle() + + # The rest of the code in this class is to facilitate easy blitting + def _blit_draw(self, artists, bg_cache): + # Handles blitted drawing, which renders only the artists given instead + # of the entire figure. + updated_ax = [] + for a in artists: + # If we haven't cached the background for this axes object, do + # so now. This might not always be reliable, but it's an attempt + # to automate the process. + if a.axes not in bg_cache: + bg_cache[a.axes] = a.figure.canvas.copy_from_bbox(a.axes.bbox) + a.axes.draw_artist(a) + updated_ax.append(a.axes) + + # After rendering all the needed artists, blit each axes individually. + for ax in set(updated_ax): + ax.figure.canvas.blit(ax.bbox) + + def _blit_clear(self, artists, bg_cache): + # Get a list of the axes that need clearing from the artists that + # have been drawn. Grab the appropriate saved background from the + # cache and restore. + axes = set(a.axes for a in artists) + for a in axes: + a.figure.canvas.restore_region(bg_cache[a]) + + def _setup_blit(self): + # Setting up the blit requires: a cache of the background for the + # axes + self._blit_cache = dict() + self._drawn_artists = [] + self._resize_id = self._fig.canvas.mpl_connect('resize_event', + self._handle_resize) + self._post_draw(None, self._blit) + + def _handle_resize(self, *args): + # On resize, we need to disable the resize event handling so we don't + # get too many events. Also stop the animation events, so that + # we're paused. Reset the cache and re-init. Set up an event handler + # to catch once the draw has actually taken place. + self._fig.canvas.mpl_disconnect(self._resize_id) + self.event_source.stop() + self._blit_cache.clear() + self._init_draw() + self._resize_id = self._fig.canvas.mpl_connect('draw_event', self._end_redraw) + + def _end_redraw(self, evt): + # Now that the redraw has happened, do the post draw flushing and + # blit handling. Then re-enable all of the original events. + self._post_draw(None, self._blit) + self.event_source.start() + self._fig.canvas.mpl_disconnect(self._resize_id) + self._resize_id = self._fig.canvas.mpl_connect('resize_event', + self._handle_resize) + + +class TimedAnimation(Animation): + ''' + :class:`Animation` subclass that supports time-based animation, drawing + a new frame every *interval* milliseconds. + + *repeat* controls whether the animation should repeat when the sequence + of frames is completed. + + *repeat_delay* optionally adds a delay in milliseconds before repeating + the animation. + ''' + def __init__(self, fig, interval=200, repeat_delay=None, repeat=True, + event_source=None, *args, **kwargs): + # Store the timing information + self._interval = interval + self._repeat_delay = repeat_delay + self.repeat = repeat + + # If we're not given an event source, create a new timer. This permits + # sharing timers between animation objects for syncing animations. + if event_source is None: + event_source = fig.canvas.new_timer() + event_source.interval = self._interval + + Animation.__init__(self, fig, event_source=event_source, *args, **kwargs) + + def _step(self, *args): + ''' + Handler for getting events. + ''' + # Extends the _step() method for the Animation class. If + # Animation._step signals that it reached the end and we want to repeat, + # we refresh the frame sequence and return True. If _repeat_delay is + # set, change the event_source's interval to our loop delay and set the + # callback to one which will then set the interval back. + still_going = Animation._step(self, *args) + if not still_going and self.repeat: + if self._repeat_delay: + self.event_source.remove_callback(self._step) + self.event_source.add_callback(self._loop_delay) + self.event_source.interval = self._repeat_delay + self.frame_seq = self.new_frame_seq() + return True + else: + return still_going + + def _stop(self, *args): + # If we stop in the middle of a loop delay (which is relatively likely + # given the potential pause here, remove the loop_delay callback as + # well. + self.event_source.remove_callback(self._loop_delay) + Animation._stop(self) + + def _loop_delay(self, *args): + # Reset the interval and change callbacks after the delay. + self.event_source.remove_callback(self._loop_delay) + self.event_source.interval = self._interval + self.event_source.add_callback(self._step) + + +class ArtistAnimation(TimedAnimation): + ''' + Before calling this function, all plotting should have taken place + and the relevant artists saved. + + frame_info is a list, with each list entry a collection of artists that + represent what needs to be enabled on each frame. These will be disabled + for other frames. + ''' + def __init__(self, fig, artists, *args, **kwargs): + # Internal list of artists drawn in the most recent frame. + self._drawn_artists = [] + + # Use the list of artists as the framedata, which will be iterated + # over by the machinery. + self._framedata = artists + TimedAnimation.__init__(self, fig, *args, **kwargs) + + def _init_draw(self): + # Make all the artists involved in *any* frame invisible + axes = [] + for f in self.new_frame_seq(): + for artist in f: + artist.set_visible(False) + # Assemble a list of unique axes that need flushing + if artist.axes not in axes: + axes.append(artist.axes) + + # Flush the needed axes + for ax in axes: + ax.figure.canvas.draw() + + def _pre_draw(self, framedata, blit): + ''' + Clears artists from the last frame. + ''' + if blit: + # Let blit handle clearing + self._blit_clear(self._drawn_artists, self._blit_cache) + else: + # Otherwise, make all the artists from the previous frame invisible + for artist in self._drawn_artists: + artist.set_visible(False) + + def _draw_frame(self, artists): + # Save the artists that were passed in as framedata for the other + # steps (esp. blitting) to use. + self._drawn_artists = artists + + # Make all the artists from the current frame visible + for artist in artists: + artist.set_visible(True) + +class FuncAnimation(TimedAnimation): + ''' + Makes an animation by repeatedly calling a function *func*, passing in + (optional) arguments in *fargs*. + + *frames* can be a generator, an iterable, or a number of frames. + + *init_func* is a function used to draw a clear frame. If not given, the + results of drawing from the first item in the frames sequence will be + used. + ''' + def __init__(self, fig, func, frames=None ,init_func=None, fargs=None, + save_count=None, **kwargs): + if fargs: + self._args = fargs + else: + self._args = () + self._func = func + + # Amount of framedata to keep around for saving movies. This is only + # used if we don't know how many frames there will be: in the case + # of no generator or in the case of a callable. + self.save_count = save_count + + # Set up a function that creates a new iterable when needed. If nothing + # is passed in for frames, just use itertools.count, which will just + # keep counting from 0. A callable passed in for frames is assumed to + # be a generator. An iterable will be used as is, and anything else + # will be treated as a number of frames. + if frames is None: + import itertools + self._iter_gen = itertools.count + elif callable(frames): + self._iter_gen = frames + elif iterable(frames): + self._iter_gen = lambda: iter(frames) + self.save_count = len(frames) + else: + self._iter_gen = lambda: iter(range(frames)) + self.save_count = frames + + # If we're passed in and using the default, set it to 100. + if self.save_count is None: + self.save_count = 100 + + self._init_func = init_func + self._save_seq = [] + + TimedAnimation.__init__(self, fig, **kwargs) + + def new_frame_seq(self): + # Use the generating function to generate a new frame sequence + return self._iter_gen() + + def new_saved_frame_seq(self): + # Generate an iterator for the sequence of saved data. + return iter(self._save_seq) + + def _init_draw(self): + # Initialize the drawing either using the given init_func or by + # calling the draw function with the first item of the frame sequence. + # For blitting, the init_func should return a sequence of modified + # artists. + if self._init_func is None: + self._draw_frame(self.new_frame_seq().next()) + else: + self._drawn_artists = self._init_func() + + def _draw_frame(self, framedata): + # Save the data for potential saving of movies. + self._save_seq.append(framedata) + + # Make sure to respect save_count (keep only the last save_count around) + self._save_seq = self._save_seq[-self.save_count:] + + # Call the func with framedata and args. If blitting is desired, + # func needs to return a sequence of any artists that were modified. + self._drawn_artists = self._func(framedata, *self._args) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8657 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8657&view=rev Author: fer_perez Date: 2010年08月25日 22:13:56 +0000 (2010年8月25日) Log Message: ----------- Fix small bug where module names were being incorrectly lowercased in backend specifications. Thanks to Evan Patterson and Brian Granger for spotting the problem and fix. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/__init__.py Modified: trunk/matplotlib/lib/matplotlib/__init__.py =================================================================== --- trunk/matplotlib/lib/matplotlib/__init__.py 2010年08月25日 07:15:15 UTC (rev 8656) +++ trunk/matplotlib/lib/matplotlib/__init__.py 2010年08月25日 22:13:56 UTC (rev 8657) @@ -880,10 +880,11 @@ if 'matplotlib.backends' in sys.modules: if warn: warnings.warn(_use_error_msg) return - arg = arg.lower() if arg.startswith('module://'): name = arg else: + # Lowercase only non-module backend names (modules are case-sensitive) + arg = arg.lower() be_parts = arg.split('.') name = validate_backend(be_parts[0]) if len(be_parts) > 1: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8656 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8656&view=rev Author: heeres Date: 2010年08月25日 07:15:15 +0000 (2010年8月25日) Log Message: ----------- Fix ticks/limit setting, add tricontour(f), make it easier to set pane colors Modified Paths: -------------- trunk/matplotlib/examples/mplot3d/contour3d_demo2.py trunk/matplotlib/examples/mplot3d/surface3d_radial_demo.py trunk/matplotlib/lib/mpl_toolkits/mplot3d/art3d.py trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py Modified: trunk/matplotlib/examples/mplot3d/contour3d_demo2.py =================================================================== --- trunk/matplotlib/examples/mplot3d/contour3d_demo2.py 2010年08月23日 18:24:25 UTC (rev 8655) +++ trunk/matplotlib/examples/mplot3d/contour3d_demo2.py 2010年08月25日 07:15:15 UTC (rev 8656) @@ -4,7 +4,7 @@ fig = plt.figure() ax = fig.gca(projection='3d') X, Y, Z = axes3d.get_test_data(0.05) -cset = ax.contour(X, Y, Z, 16, extend3d=True) +cset = ax.contour(X, Y, Z, extend3d=True) ax.clabel(cset, fontsize=9, inline=1) plt.show() Modified: trunk/matplotlib/examples/mplot3d/surface3d_radial_demo.py =================================================================== --- trunk/matplotlib/examples/mplot3d/surface3d_radial_demo.py 2010年08月23日 18:24:25 UTC (rev 8655) +++ trunk/matplotlib/examples/mplot3d/surface3d_radial_demo.py 2010年08月25日 07:15:15 UTC (rev 8656) @@ -23,5 +23,4 @@ ax.set_xlabel(r'$\phi_\mathrm{real}$') ax.set_ylabel(r'$\phi_\mathrm{im}$') ax.set_zlabel(r'$V(\phi)$') -ax.set_xticks([]) plt.show() Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/art3d.py =================================================================== --- trunk/matplotlib/lib/mpl_toolkits/mplot3d/art3d.py 2010年08月23日 18:24:25 UTC (rev 8655) +++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/art3d.py 2010年08月25日 07:15:15 UTC (rev 8656) @@ -291,8 +291,17 @@ PatchCollection.__init__(self, *args, **kwargs) self._old_draw = lambda x: PatchCollection.draw(self, x) + def set_sort_zpos(self,val): + '''Set the position to use for z-sorting.''' + self._sort_zpos = val + def set_3d_properties(self, zs, zdir): - xs, ys = zip(*self.get_offsets()) + offsets = self.get_offsets() + if len(offsets) > 0: + xs, ys = zip(*self.get_offsets()) + else: + xs = [0] * len(zs) + ys = [0] * len(zs) self._offsets3d = juggle_axes(xs, ys, zs, zdir) self._facecolor3d = self.get_facecolor() self._edgecolor3d = self.get_edgecolor() Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py =================================================================== --- trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py 2010年08月23日 18:24:25 UTC (rev 8655) +++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/axes3d.py 2010年08月25日 07:15:15 UTC (rev 8656) @@ -58,7 +58,6 @@ if rect is None: rect = [0.0, 0.0, 1.0, 1.0] - self.fig = fig self._cids = [] self.initial_azim = kwargs.pop('azim', -60) @@ -72,20 +71,28 @@ # they can't be defined until Axes.__init__ has been called self.view_init(self.initial_elev, self.initial_azim) self._ready = 0 - Axes.__init__(self, self.fig, rect, + + Axes.__init__(self, fig, rect, frameon=True, - xticks=[], yticks=[], *args, **kwargs) - + *args, **kwargs) + # Disable drawing of axes by base class + Axes.set_axis_off(self) + self._axis3don = True self.M = None self._ready = 1 self.mouse_init() - self.create_axes() self.set_top_view() self.axesPatch.set_linewidth(0) - self.fig.add_axes(self) + self.figure.add_axes(self) + def set_axis_off(self): + self._axis3don = False + + def set_axis_on(self): + self._axis3don = True + def set_top_view(self): # this happens to be the right view for the viewing coordinates # moved up and to the left slightly to fit labels and axes @@ -97,14 +104,24 @@ Axes.set_xlim(self, -xdwl, xdw, auto=None) Axes.set_ylim(self, -ydwl, ydw, auto=None) - def create_axes(self): + def _init_axis(self): + '''Init 3d axes; overrides creation of regular X/Y axes''' self.w_xaxis = axis3d.XAxis('x', self.xy_viewLim.intervalx, self.xy_dataLim.intervalx, self) + self.xaxis = self.w_xaxis self.w_yaxis = axis3d.YAxis('y', self.xy_viewLim.intervaly, self.xy_dataLim.intervaly, self) + self.yaxis = self.w_yaxis self.w_zaxis = axis3d.ZAxis('z', self.zz_viewLim.intervalx, self.zz_dataLim.intervalx, self) + self.zaxis = self.w_zaxis + for ax in self.xaxis, self.yaxis, self.zaxis: + ax.init3d() + + def get_children(self): + return [self.zaxis,] + Axes.get_children(self) + def unit_cube(self, vals=None): minx, maxx, miny, maxy, minz, maxz = vals or self.get_w_lims() xs, ys, zs = ([minx, maxx, maxx, minx, minx, maxx, maxx, minx], @@ -165,12 +182,16 @@ for i, (z, patch) in enumerate(zlist): patch.zorder = i - axes = (self.w_xaxis, self.w_yaxis, self.w_zaxis) - for ax in axes: - ax.draw_pane(renderer) - for ax in axes: - ax.draw(renderer) + if self._axis3don: + axes = (self.w_xaxis, self.w_yaxis, self.w_zaxis) + # Draw panes first + for ax in axes: + ax.draw_pane(renderer) + # Then axes + for ax in axes: + ax.draw(renderer) + # Then rest Axes.draw(self, renderer) def get_axis_position(self): @@ -240,18 +261,21 @@ lims = self._determine_lims(*args, **kwargs) self.xy_viewLim.intervalx = lims return lims + set_xlim = set_xlim3d def set_ylim3d(self, *args, **kwargs): '''Set 3D y limits.''' lims = self._determine_lims(*args, **kwargs) self.xy_viewLim.intervaly = lims return lims + set_ylim = set_ylim3d def set_zlim3d(self, *args, **kwargs): '''Set 3D z limits.''' lims = self._determine_lims(*args, **kwargs) self.zz_viewLim.intervalx = lims return lims + set_zlim = set_zlim3d def get_xlim3d(self): '''Get 3D x limits.''' @@ -264,7 +288,18 @@ def get_zlim3d(self): '''Get 3D z limits.''' return self.zz_viewLim.intervalx + get_zlim = get_zlim3d + def set_zticks(self,*args,**kwargs): + """ + Set 3d z tick locations and (optionally labels). + See set_xticks3d for more details. + """ + return self.w_zaxis.set_ticks(*args, **kwargs) + + def get_zticks(self): + return self.w_zaxis.get_ticks() + def clabel(self, *args, **kwargs): return None @@ -722,8 +757,9 @@ # Only need vectors to shade if no cmap if cmap is None and shade: - v1 = np.array(ps2[0]) - np.array(ps2[1]) - v2 = np.array(ps2[2]) - np.array(ps2[0]) + i1, i2, i3 = 0, int(len(ps2)/3), int(2*len(ps2)/3) + v1 = np.array(ps2[i1]) - np.array(ps2[i2]) + v2 = np.array(ps2[i2]) - np.array(ps2[i3]) normals.append(np.cross(v1, v2)) polyc = art3d.Poly3DCollection(polys, *args, **kwargs) @@ -896,6 +932,16 @@ for col in colls: self.collections.remove(col) + def add_contour_set(self, cset, extend3d=False, stride=5, zdir='z', offset=None): + zdir = '-' + zdir + if extend3d: + self._3d_extend_contour(cset, stride) + else: + for z, linec in zip(cset.levels, cset.collections): + if offset is not None: + z = offset + art3d.line_collection_2d_to_3d(linec, z, zdir=zdir) + def contour(self, X, Y, Z, *args, **kwargs): ''' Create a 3D contour plot. @@ -927,21 +973,49 @@ jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir) cset = Axes.contour(self, jX, jY, jZ, *args, **kwargs) + self.add_contour_set(cset, extend3d, stride, zdir, offset) - zdir = '-' + zdir - if extend3d: - self._3d_extend_contour(cset, stride) - else: - for z, linec in zip(cset.levels, cset.collections): - if offset is not None: - z = offset - art3d.line_collection_2d_to_3d(linec, z, zdir=zdir) - self.auto_scale_xyz(X, Y, Z, had_data) return cset contour3D = contour + def tricontour(self, X, Y, Z, *args, **kwargs): + ''' + Create a 3D contour plot. + + ========== ================================================ + Argument Description + ========== ================================================ + *X*, *Y*, Data values as numpy.arrays + *Z* + *extend3d* Whether to extend contour in 3D (default: False) + *stride* Stride (step size) for extending contour + *zdir* The direction to use: x, y or z (default) + *offset* If specified plot a projection of the contour + lines on this position in plane normal to zdir + ========== ================================================ + + Other keyword arguments are passed on to + :func:`~matplotlib.axes.Axes.tricontour` + + Returns a :class:`~matplotlib.axes.Axes.contour` + ''' + + extend3d = kwargs.pop('extend3d', False) + stride = kwargs.pop('stride', 5) + zdir = kwargs.pop('zdir', 'z') + offset = kwargs.pop('offset', None) + + had_data = self.has_data() + + jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir) + cset = Axes.tricontour(self, jX, jY, jZ, *args, **kwargs) + self.add_contour_set(cset, extend3d, stride, zdir, offset) + + self.auto_scale_xyz(X, Y, Z, had_data) + return cset + def contourf(self, X, Y, Z, *args, **kwargs): ''' Plot filled 3D contours. @@ -968,6 +1042,43 @@ contourf3D = contourf + def tricontourf(self, X, Y, Z, offset=None, zdir='z', *args, **kwargs): + ''' + Create a 3D contourf plot. + + ========== ================================================ + Argument Description + ========== ================================================ + *X*, *Y*, Data values as numpy.arrays + *Z* + *extend3d* Whether to extend contour in 3D (default: False) + *stride* Stride (step size) for extending contour + *zdir* The direction to use: x, y or z (default) + *offset* If specified plot a projection of the contour + lines on this position in plane normal to zdir + ========== ================================================ + + Other keyword arguments are passed on to + :func:`~matplotlib.axes.Axes.tricontour` + + Returns a :class:`~matplotlib.axes.Axes.contour` + ''' + + zdir = '-' + zdir + had_data = self.has_data() + + cset = Axes.tricontourf(self, X, Y, Z, *args, **kwargs) + levels = cset.levels + colls = cset.collections + for z1, linec in zip(levels, colls): + if offset is not None: + z1 = offset + art3d.poly_collection_2d_to_3d(linec, z1, zdir=zdir) + linec.set_sort_zpos(z1) + + self.auto_scale_xyz(X, Y, Z, had_data) + return cset + def add_collection3d(self, col, zs=0, zdir='z'): ''' Add a 3d collection object to the plot. @@ -993,21 +1104,32 @@ Axes.add_collection(self, col) - def scatter(self, xs, ys, zs=0, zdir='z', *args, **kwargs): + def scatter(self, xs, ys, zs=0, zdir='z', s=20, c='b', *args, **kwargs): ''' Create a scatter plot. ========== ================================================ Argument Description - ========== ================================================ + ========== ========================================================== *xs*, *ys* Positions of data points. *zs* Either an array of the same length as *xs* and *ys* or a single value to place all points in the same plane. Default is 0. *zdir* Which direction to use as z ('x', 'y' or 'z') when plotting a 2d set. - ========== ================================================ + *s* size in points^2. It is a scalar or an array of the same + length as *x* and *y*. + *c* a color. *c* can be a single color format string, or a + sequence of color specifications of length *N*, or a + sequence of *N* numbers to be mapped to colors using the + *cmap* and *norm* specified via kwargs (see below). Note + that *c* should not be a single numeric RGB or RGBA + sequence because that is indistinguishable from an array + of values to be colormapped. *c* can be a 2-D array in + which the rows are RGB or RGBA, however. + ========== ========================================================== + Keyword arguments are passed on to :func:`~matplotlib.axes.Axes.scatter`. @@ -1016,7 +1138,25 @@ had_data = self.has_data() - patches = Axes.scatter(self, xs, ys, *args, **kwargs) + xs = np.ma.ravel(xs) + ys = np.ma.ravel(ys) + zs = np.ma.ravel(zs) + if xs.size != ys.size: + raise ValueError("x and y must be the same size") + if xs.size != zs.size and zs.size == 1: + zs = np.array(zs[0] * xs.size) + + s = np.ma.ravel(s) # This doesn't have to match x, y in size. + + cstr = cbook.is_string_like(c) or cbook.is_sequence_of_strings(c) + if not cstr: + c = np.asanyarray(c) + if c.size == xs.size: + c = np.ma.ravel(c) + + xs, ys, zs, s, c = cbook.delete_masked_points(xs, ys, zs, s, c) + + patches = Axes.scatter(self, xs, ys, s=s, c=c, *args, **kwargs) if not cbook.iterable(zs): is_2d = True zs = np.ones(len(xs)) * zs Modified: trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py =================================================================== --- trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py 2010年08月23日 18:24:25 UTC (rev 8655) +++ trunk/matplotlib/lib/mpl_toolkits/mplot3d/axis3d.py 2010年08月25日 07:15:15 UTC (rev 8656) @@ -73,6 +73,11 @@ self.v_interval = v_intervalx maxis.XAxis.__init__(self, axes, *args, **kwargs) + + self.set_rotate_label(kwargs.get('rotate_label', None)) + + + def init3d(self): self.line = mlines.Line2D(xdata=(0, 0), ydata=(0, 0), linewidth=0.75, color=(0, 0, 0, 1), @@ -80,11 +85,11 @@ ) # Store dummy data in Polygon object - self.has_pane = True self.pane = mpatches.Polygon(np.array([[0,0], [0,1], [1,0], [0,0]]), alpha=0.8, facecolor=(1,1,1,0), edgecolor=(1,1,1,0)) + self.set_pane_color(self._AXINFO[self.adir]['color']) self.axes._set_artist_props(self.line) self.axes._set_artist_props(self.pane) @@ -92,7 +97,6 @@ self.axes._set_artist_props(self.gridlines) self.axes._set_artist_props(self.label) self.label._transform = self.axes.transData - self.set_rotate_label(kwargs.get('rotate_label', None)) def get_tick_positions(self): majorLocs = self.major.locator() @@ -110,15 +114,17 @@ t.label2.set_transform(self.axes.transData) return ticks - def set_pane(self, xys, color): - if self.has_pane: - xys = np.asarray(xys) - xys = xys[:,:2] - self.pane.xy = xys - self.pane.set_edgecolor(color) - self.pane.set_facecolor(color) - self.pane.set_alpha(color[-1]) + def set_pane_pos(self, xys): + xys = np.asarray(xys) + xys = xys[:,:2] + self.pane.xy = xys + def set_pane_color(self, color): + '''Set pane color to a RGBA tuple''' + self.pane.set_edgecolor(color) + self.pane.set_facecolor(color) + self.pane.set_alpha(color[-1]) + def set_rotate_label(self, val): ''' Whether to rotate the axis label: True, False or None. @@ -161,7 +167,7 @@ else: plane = self._PLANES[2 * index + 1] xys = [tc[p] for p in plane] - self.set_pane(xys, info['color']) + self.set_pane_pos(xys) self.pane.draw(renderer) renderer.close_group('pane3d') @@ -225,25 +231,26 @@ self.label.set_va('center') self.label.draw(renderer) - # Grid points at end of one plane - xyz1 = copy.deepcopy(xyz0) - newindex = (index + 1) % 3 - newval = get_flip_min_max(xyz1[0], newindex, mins, maxs) - for i in range(len(majorLocs)): - xyz1[i][newindex] = newval + if len(xyz0) > 0: + # Grid points at end of one plane + xyz1 = copy.deepcopy(xyz0) + newindex = (index + 1) % 3 + newval = get_flip_min_max(xyz1[0], newindex, mins, maxs) + for i in range(len(majorLocs)): + xyz1[i][newindex] = newval - # Grid points at end of the other plane - xyz2 = copy.deepcopy(xyz0) - newindex = (index + 2) % 3 - newval = get_flip_min_max(xyz2[0], newindex, mins, maxs) - for i in range(len(majorLocs)): - xyz2[i][newindex] = newval + # Grid points at end of the other plane + xyz2 = copy.deepcopy(xyz0) + newindex = (index + 2) % 3 + newval = get_flip_min_max(xyz2[0], newindex, mins, maxs) + for i in range(len(majorLocs)): + xyz2[i][newindex] = newval - lines = zip(xyz1, xyz0, xyz2) - if self.axes._draw_grid: - self.gridlines.set_segments(lines) - self.gridlines.set_color([(0.9,0.9,0.9,1)] * len(lines)) - self.gridlines.draw(renderer, project=True) + lines = zip(xyz1, xyz0, xyz2) + if self.axes._draw_grid: + self.gridlines.set_segments(lines) + self.gridlines.set_color([(0.9,0.9,0.9,1)] * len(lines)) + self.gridlines.draw(renderer, project=True) # Draw ticks tickdir = info['tickdir'] @@ -284,19 +291,23 @@ renderer.close_group('axis3d') def get_view_interval(self): - """return the Interval instance for this axis view limits""" + """return the Interval instance for this 3d axis view limits""" return self.v_interval + + def set_view_interval(self, vmin, vmax, ignore=False): + if ignore: + self.v_interval = vmin, vmax + else: + Vmin, Vmax = self.get_view_interval() + self.v_interval = min(vmin, Vmin), max(vmax, Vmax) -# Each type of axis should be looking in a different place for its -# current data limits so we do this with classes. I think there is -# a lot more that I can and should move down into these classes also. +# Use classes to look at different data limits class XAxis(Axis): def get_data_interval(self): 'return the Interval instance for this axis data limits' return self.axes.xy_dataLim.intervalx - class YAxis(Axis): def get_data_interval(self): 'return the Interval instance for this axis data limits' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8655 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8655&view=rev Author: efiring Date: 2010年08月23日 18:24:25 +0000 (2010年8月23日) Log Message: ----------- Remove 3 unused Tick methods Modified Paths: -------------- trunk/matplotlib/CHANGELOG trunk/matplotlib/lib/matplotlib/axis.py Modified: trunk/matplotlib/CHANGELOG =================================================================== --- trunk/matplotlib/CHANGELOG 2010年08月23日 17:56:38 UTC (rev 8654) +++ trunk/matplotlib/CHANGELOG 2010年08月23日 18:24:25 UTC (rev 8655) @@ -1,3 +1,8 @@ +2010年08月21日 Remove unused and inappropriate methods from Tick classes: + set_view_interval, get_minpos, and get_data_interval are + properly found in the Axis class and don't need to be + duplicated in XTick and YTick. - EF + 2010年08月21日 Change Axis.set_view_interval() so that when updating an existing interval, it respects the orientation of that interval, and can enlarge but not reduce the interval. Modified: trunk/matplotlib/lib/matplotlib/axis.py =================================================================== --- trunk/matplotlib/lib/matplotlib/axis.py 2010年08月23日 17:56:38 UTC (rev 8654) +++ trunk/matplotlib/lib/matplotlib/axis.py 2010年08月23日 18:24:25 UTC (rev 8655) @@ -262,9 +262,6 @@ 'return the view Interval instance for the axis this tick is ticking' raise NotImplementedError('Derived must override') - def set_view_interval(self, vmin, vmax, ignore=False): - raise NotImplementedError('Derived must override') - def _apply_params(self, **kw): switchkw = ['gridOn', 'tick1On', 'tick2On', 'label1On', 'label2On'] switches = [k for k in kw if k in switchkw] @@ -445,21 +442,7 @@ 'return the Interval instance for this axis view limits' return self.axes.viewLim.intervalx - def set_view_interval(self, vmin, vmax, ignore = False): - if ignore: - self.axes.viewLim.intervalx = vmin, vmax - else: - Vmin, Vmax = self.get_view_interval() - self.axes.viewLim.intervalx = min(vmin, Vmin), max(vmax, Vmax) - def get_minpos(self): - return self.axes.dataLim.minposx - - def get_data_interval(self): - 'return the Interval instance for this axis data limits' - return self.axes.dataLim.intervalx - - class YTick(Tick): """ Contains all the Artists needed to make a Y tick - the tick line, @@ -595,21 +578,7 @@ 'return the Interval instance for this axis view limits' return self.axes.viewLim.intervaly - def set_view_interval(self, vmin, vmax, ignore = False): - if ignore: - self.axes.viewLim.intervaly = vmin, vmax - else: - Vmin, Vmax = self.get_view_interval() - self.axes.viewLim.intervaly = min(vmin, Vmin), max(vmax, Vmax) - def get_minpos(self): - return self.axes.dataLim.minposy - - def get_data_interval(self): - 'return the Interval instance for this axis data limits' - return self.axes.dataLim.intervaly - - class Ticker: locator = None formatter = None This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8654 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8654&view=rev Author: astraw Date: 2010年08月23日 17:56:38 +0000 (2010年8月23日) Log Message: ----------- build docs with Sphinx latest (1.0.3 fixes bug with 1.0.2) Modified Paths: -------------- trunk/matplotlib/test/_buildbot_doc.sh Modified: trunk/matplotlib/test/_buildbot_doc.sh =================================================================== --- trunk/matplotlib/test/_buildbot_doc.sh 2010年08月21日 18:10:24 UTC (rev 8653) +++ trunk/matplotlib/test/_buildbot_doc.sh 2010年08月23日 17:56:38 UTC (rev 8654) @@ -8,8 +8,8 @@ echo "removing MPL config dir" python -c "import shutil,matplotlib; x=matplotlib.get_configdir(); shutil.rmtree(x)" -echo "calling 'easy_install Sphinx==1.0.1'" -easy_install "Sphinx==1.0.1" +echo "calling 'easy_install Sphinx'" +easy_install Sphinx echo "calling 'cd doc'" cd doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8653 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8653&view=rev Author: efiring Date: 2010年08月21日 18:10:24 +0000 (2010年8月21日) Log Message: ----------- Merged revisions 8647,8649-8650,8652 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8647 | mdboom | 2010年08月18日 06:07:37 -1000 (2010年8月18日) | 2 lines Fix bug in regular polygon handling ........ r8649 | mdboom | 2010年08月18日 07:00:29 -1000 (2010年8月18日) | 2 lines Fix positions of r axis labels when rmin != 0.0 in polar plots. ........ r8650 | mdboom | 2010年08月18日 07:35:26 -1000 (2010年8月18日) | 2 lines Fix unit tests for polar rmin changes in last commit. ........ r8652 | efiring | 2010年08月21日 07:49:53 -1000 (2010年8月21日) | 2 lines Axis.set_view_interval: when updating, respect original orientation ........ Modified Paths: -------------- trunk/matplotlib/CHANGELOG trunk/matplotlib/lib/matplotlib/axis.py Property Changed: ---------------- trunk/matplotlib/ trunk/matplotlib/doc/pyplots/README trunk/matplotlib/doc/sphinxext/gen_gallery.py trunk/matplotlib/doc/sphinxext/gen_rst.py trunk/matplotlib/examples/misc/multiprocess.py trunk/matplotlib/examples/mplot3d/contour3d_demo.py trunk/matplotlib/examples/mplot3d/contourf3d_demo.py trunk/matplotlib/examples/mplot3d/polys3d_demo.py trunk/matplotlib/examples/mplot3d/scatter3d_demo.py trunk/matplotlib/examples/mplot3d/surface3d_demo.py trunk/matplotlib/examples/mplot3d/wire3d_demo.py trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint:5753-5771 /branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Modified: trunk/matplotlib/CHANGELOG =================================================================== --- trunk/matplotlib/CHANGELOG 2010年08月21日 17:49:53 UTC (rev 8652) +++ trunk/matplotlib/CHANGELOG 2010年08月21日 18:10:24 UTC (rev 8653) @@ -1,3 +1,11 @@ +2010年08月21日 Change Axis.set_view_interval() so that when updating an + existing interval, it respects the orientation of that + interval, and can enlarge but not reduce the interval. + This fixes a bug in which Axis.set_ticks would + change the view limits of an inverted axis. Whether + set_ticks should be affecting the viewLim at all remains + an open question. - EF + 2010年08月16日 Handle NaN's correctly in path analysis routines. Fixes a bug where the best location for a legend was not calculated correctly when the line contains NaNs. - MGD Property changes on: trunk/matplotlib/doc/pyplots/README ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771 /branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/examples/misc/multiprocess.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/examples/misc/log.py:5753-5771 /branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771 /branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080 /branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Modified: trunk/matplotlib/lib/matplotlib/axis.py =================================================================== --- trunk/matplotlib/lib/matplotlib/axis.py 2010年08月21日 17:49:53 UTC (rev 8652) +++ trunk/matplotlib/lib/matplotlib/axis.py 2010年08月21日 18:10:24 UTC (rev 8653) @@ -1696,11 +1696,21 @@ return self.axes.viewLim.intervalx def set_view_interval(self, vmin, vmax, ignore=False): + """ + If *ignore* is *False*, the order of vmin, vmax + does not matter; the original axis orientation will + be preserved. + """ if ignore: self.axes.viewLim.intervalx = vmin, vmax else: Vmin, Vmax = self.get_view_interval() - self.axes.viewLim.intervalx = min(vmin, Vmin), max(vmax, Vmax) + if Vmin < Vmax: + self.axes.viewLim.intervalx = (min(vmin, vmax, Vmin), + max(vmin, vmax, Vmax)) + else: + self.axes.viewLim.intervalx = (max(vmin, vmax, Vmin), + min(vmin, vmax, Vmax)) def get_minpos(self): return self.axes.dataLim.minposx @@ -1947,11 +1957,21 @@ return self.axes.viewLim.intervaly def set_view_interval(self, vmin, vmax, ignore=False): + """ + If *ignore* is *False*, the order of vmin, vmax + does not matter; the original axis orientation will + be preserved. + """ if ignore: self.axes.viewLim.intervaly = vmin, vmax else: Vmin, Vmax = self.get_view_interval() - self.axes.viewLim.intervaly = min(vmin, Vmin), max(vmax, Vmax) + if Vmin < Vmax: + self.axes.viewLim.intervaly = (min(vmin, vmax, Vmin), + max(vmin, vmax, Vmax)) + else: + self.axes.viewLim.intervaly = (max(vmin, vmax, Vmin), + min(vmin, vmax, Vmax)) def get_minpos(self): return self.axes.dataLim.minposy Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771 /branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245 /branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135 /branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8652 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8652 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8652&view=rev Author: efiring Date: 2010年08月21日 17:49:53 +0000 (2010年8月21日) Log Message: ----------- Axis.set_view_interval: when updating, respect original orientation Modified Paths: -------------- branches/v1_0_maint/CHANGELOG branches/v1_0_maint/lib/matplotlib/axis.py Modified: branches/v1_0_maint/CHANGELOG =================================================================== --- branches/v1_0_maint/CHANGELOG 2010年08月18日 17:36:51 UTC (rev 8651) +++ branches/v1_0_maint/CHANGELOG 2010年08月21日 17:49:53 UTC (rev 8652) @@ -1,3 +1,11 @@ +2010年08月21日 Change Axis.set_view_interval() so that when updating an + existing interval, it respects the orientation of that + interval, and can enlarge but not reduce the interval. + This fixes a bug in which Axis.set_ticks would + change the view limits of an inverted axis. Whether + set_ticks should be affecting the viewLim at all remains + an open question. - EF + 2010年08月16日 Handle NaN's correctly in path analysis routines. Fixes a bug where the best location for a legend was not calculated correctly when the line contains NaNs. - MGD Modified: branches/v1_0_maint/lib/matplotlib/axis.py =================================================================== --- branches/v1_0_maint/lib/matplotlib/axis.py 2010年08月18日 17:36:51 UTC (rev 8651) +++ branches/v1_0_maint/lib/matplotlib/axis.py 2010年08月21日 17:49:53 UTC (rev 8652) @@ -1696,11 +1696,21 @@ return self.axes.viewLim.intervalx def set_view_interval(self, vmin, vmax, ignore=False): + """ + If *ignore* is *False*, the order of vmin, vmax + does not matter; the original axis orientation will + be preserved. + """ if ignore: self.axes.viewLim.intervalx = vmin, vmax else: Vmin, Vmax = self.get_view_interval() - self.axes.viewLim.intervalx = min(vmin, Vmin), max(vmax, Vmax) + if Vmin < Vmax: + self.axes.viewLim.intervalx = (min(vmin, vmax, Vmin), + max(vmin, vmax, Vmax)) + else: + self.axes.viewLim.intervalx = (max(vmin, vmax, Vmin), + min(vmin, vmax, Vmax)) def get_minpos(self): return self.axes.dataLim.minposx @@ -1947,11 +1957,21 @@ return self.axes.viewLim.intervaly def set_view_interval(self, vmin, vmax, ignore=False): + """ + If *ignore* is *False*, the order of vmin, vmax + does not matter; the original axis orientation will + be preserved. + """ if ignore: self.axes.viewLim.intervaly = vmin, vmax else: Vmin, Vmax = self.get_view_interval() - self.axes.viewLim.intervaly = min(vmin, Vmin), max(vmax, Vmax) + if Vmin < Vmax: + self.axes.viewLim.intervaly = (min(vmin, vmax, Vmin), + max(vmin, vmax, Vmax)) + else: + self.axes.viewLim.intervaly = (max(vmin, vmax, Vmin), + min(vmin, vmax, Vmax)) def get_minpos(self): return self.axes.dataLim.minposy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8651 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8651&view=rev Author: mdboom Date: 2010年08月18日 17:36:51 +0000 (2010年8月18日) Log Message: ----------- Merged revisions 8649-8650 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8649 | mdboom | 2010年08月18日 13:00:29 -0400 (2010年8月18日) | 2 lines Fix positions of r axis labels when rmin != 0.0 in polar plots. ........ r8650 | mdboom | 2010年08月18日 13:35:26 -0400 (2010年8月18日) | 2 lines Fix unit tests for polar rmin changes in last commit. ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/projections/polar.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.png trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.svg trunk/matplotlib/lib/matplotlib/transforms.py Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8647 /trunk/matplotlib:1-7315 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8650 /trunk/matplotlib:1-7315 Modified: trunk/matplotlib/lib/matplotlib/projections/polar.py =================================================================== --- trunk/matplotlib/lib/matplotlib/projections/polar.py 2010年08月18日 17:35:26 UTC (rev 8650) +++ trunk/matplotlib/lib/matplotlib/projections/polar.py 2010年08月18日 17:36:51 UTC (rev 8651) @@ -14,7 +14,7 @@ from matplotlib.ticker import Formatter, Locator, FormatStrFormatter from matplotlib.transforms import Affine2D, Affine2DBase, Bbox, \ BboxTransformTo, IdentityTransform, Transform, TransformWrapper, \ - ScaledTranslation, blended_transform_factory + ScaledTranslation, blended_transform_factory, BboxTransformToMaxOnly import matplotlib.spines as mspines class PolarAxes(Axes): @@ -41,16 +41,16 @@ self._axis = axis def transform(self, tr): - xy = np.zeros(tr.shape, np.float_) + xy = np.empty(tr.shape, np.float_) if self._axis is not None: rmin = self._axis.viewLim.ymin else: rmin = 0 - t = tr[:, 0:1] - r = tr[:, 1:2] - x = xy[:, 0:1] - y = xy[:, 1:2] + t = tr[:, 0:1] + r = tr[:, 1:2] + x = xy[:, 0:1] + y = xy[:, 1:2] if rmin != 0: r = r - rmin @@ -291,7 +291,8 @@ # The r-axis labels are put at an angle and padded in the r-direction self._r_label1_position = ScaledTranslation( 22.5, self._rpad, - blended_transform_factory(Affine2D(), BboxTransformTo(self.viewLim))) + blended_transform_factory( + Affine2D(), BboxTransformToMaxOnly(self.viewLim))) self._yaxis_text1_transform = ( self._r_label1_position + Affine2D().scale(1.0 / 360.0, 1.0) + @@ -299,7 +300,8 @@ ) self._r_label2_position = ScaledTranslation( 22.5, -self._rpad, - blended_transform_factory(Affine2D(), BboxTransformTo(self.viewLim))) + blended_transform_factory( + Affine2D(), BboxTransformToMaxOnly(self.viewLim))) self._yaxis_text2_transform = ( self._r_label2_position + Affine2D().scale(1.0 / 360.0, 1.0) + Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf 2010年08月18日 17:35:26 UTC (rev 8650) +++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf 2010年08月18日 17:36:51 UTC (rev 8651) @@ -15,113 +15,118 @@ 9 0 obj << /Filter /FlateDecode /Length 11 0 R >> stream -x\x9C\xED\x9DϮ<?n\xDD\xF7\xF5\xB5L6 \xFDWik 1\xE0]\xE2\xB2\xB2r\x90\xC6u\x80\xAC\xFCZyĜշKE]; ;?\xAF\xAE1\xE3\xF9ޮ\xAE\xAE\x92D R$Ͽ=\xD2\xF9Wg<\xFF\x87\xFE\xFB\x97G8\xC3\xF9wg\xEDM\xFF\xFBe\xFF[rҿ\xC2\xE7\xF5\xF9\xF1\xFA\xDE\xDF\xEB_y\xA4\xEBҕW\xD2M9\xE7וz\xB5\xBD?˽\xBF\xFA\x95K\x88\xAD\xC7v\xB6\xF8*\xA1\xA7q\x85\x91\xF5\xBB1\xBC\xE2u\x85\xFB5\x8E\xA1{c \xE5J1\x9Es\x96\x92^u\xE8\xC7\xE2\xAD\x9C1\xB5W\x8A\xAD\x8E+\xA7\xAB\x9C\xA5\x85\xD7uƮ \xD0\xCF\xDEl~\xA4\xEF\x9Cs\xBC\xFF\xAD\xC7ݯ\xF3\xFC\xBD \xEA\xFAb\xCFW\xC9\xF9\xBA\xFFһ\xB8Qd=v\xFD\xA9u\xD4\xF9\xBAx\xF2\xF5\xFE\xD7\xF17g҃?/9/\xC7q\xAD\x83q\xBF\xA7 \xF7Ll\xEF\xF5\xB4e\xDD8b\xAC\x9A\xF5\xC7\xC0\xDF Ŧw\x99\xFF~L\x9B\xFB=7\xCF\xCFwqK\xE4\x86\xF1\\xDCǰM>\x82\xF27\xE7\xFF<\xFE\xFB\xF1\xBF\xCF_\xC9\xF9\x95\x9C?_r\xFE\xF3\xF9\xBF\x84So8\xCF\xFF4\x88\xC5\xFB;}\xAF\xBD\xAER\xCF)h\xC8I\xEF\xAC\xC9i\xADf\xFDSЕ. -9 -\xB8\xA7+\xD9\xF5 c\xCA)\xA51jz\x97W U\x9Fk \xAA]\xCF5i\x85c\xD7tp~\xD5\xDC\xF4G \x99\xEBE\x8F+!\xB71\xDE\xF7KRR \xB1\x94֢]O)\x84\xA6A\xA7b\xF7\xC7W\xEDZ\x972\xD2\xE0~M`\xAD5\xE50\xE2e\xF7\x87W\xB9\xF4Ҋ\xBD\xBF~No k ɞ߇\x94\x87@Yo\xA1\xEB\xFA\xB9b\xBD\xA2>\xE3~]O\x92\xE0p\x85\xA6iM\xCDRJ-]\xD0\xED\xFE\xEBծ\xA0\x97I\xA9h҂\xBE\x9E\xAE \xF3żs\xBF\x96%kZ\xBC\xBA\xDE/t=.զ\xE9\x8C\xC3\xEE\xB7z\xEEm\xAE7\xA6\xE3\xD2d\x87>k\x8Du\x8F&Y\xD7\xEB+\i\xB4z\xE5\xDA\xDF\xF7\xF78Z\xAAz`\xD6\xF5\xCCtĦ\xF7 \xF5}\xFFUr\xE8\xE1*A\xEF \xD2+\xE8\xD1W˹\xA7\xF7\xFBk\xB9Z\x91L\xCDO\xD0\xF8r\xD7|iA\xE3\xFB\xFD\xABV[C(\xA8\x83\xA4\xEC\xD2d\x871\xFA\xF7\xF4\xC5 C MK\xAA\xCB]\xA3\xEDU\xEB#%xO\xDF(\x9A\x99\xD1G@\xD7!y\x90 \xD9\xF0\xB5<\xD2'}\xA1\x94!\x81 E\xC3\xEB\xAD\xF6\xAB\xBE\x96W\xDD\xF8 -\xCDw ,\xDF%\xA5'\xD5B -\xF3\xF8\xF8һ \xA9E\xEC\xF5[\xFA\xBA\xFE\x90*K\xBA\xE254YI+\xF5)<ү\x96c\x95pI\xB3\xA54\xAD\xD6 \xBE\x85K\xAF|iH\xF6S\x837\xD5%\xCD\xD5\xD0\xC7M\x8F\xD2ȳ&7\xF2]=\xFB\xE2U5V]z!\xB5Hzn\x99\xFBZ)\x9A\xACvi\xA1\xA2\xDE,ǚ5\xAEL\x91F{e-m֛k\xA1\xA2F֊\xC4T\xB39o\xBFICk\xB3\xCB1\xC7r\xF1 \xA1\x97\xD0\xF34i%\xA4\xCAHӫ\x8F*\xB9\x89&\x86z\x87W\xE0\xDA% \xB0\xCB -9\xAE5\xF7a\xB7\xEB\xE9\xB1غ\x97>\xAFKFR\xD5\xECV\xBB\xFF\xD2:t&+\xD4y]\xFA\x96[FO\xB8_z#\x95\xAD!J\xAC\xE6\xDBg\x9ET\xB4\x90\xA8\xA1~[r%\xC5\xEF=\xA4a\xA3\xA5&=K\xB0h\xF7wɑ~\xACJX\xA3]\xD7*i\xBAL\xAB\xB8_r\x8F\xA1\xE5b\x93 rN҂\xEC\xF1I\xEF+D\xD1 \x8Cl\xCD$"\x97$\xFA\xBAl\xF8IP\xABG\x85,Y\xB9l\xA1\x85(\x97\x86\xDFK\xB1\xFB\xA5%B\xE9U4 -\xF2\xBA\xA4Zܟ\xC3+\xE9iTM \x9B\xE49]\xE6\xFE\x9C\x84\xF1\xB1FTߤXW됰d\xBB[\xB2 \xA0\x8Cұ\xD6MId#\xAA\xAD\xE7jw냀Fhy\xAE\xB1\xCA\xC6\xD4b\x9CO /\xBD\xA1@Ib[M\x87\xF5\xB0"D\xC3h\xED\x80-\x8C
Revision: 8650 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8650&view=rev Author: mdboom Date: 2010年08月18日 17:35:26 +0000 (2010年8月18日) Log Message: ----------- Fix unit tests for polar rmin changes in last commit. Modified Paths: -------------- branches/v1_0_maint/lib/matplotlib/projections/polar.py branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.png branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.svg Modified: branches/v1_0_maint/lib/matplotlib/projections/polar.py =================================================================== --- branches/v1_0_maint/lib/matplotlib/projections/polar.py 2010年08月18日 17:00:29 UTC (rev 8649) +++ branches/v1_0_maint/lib/matplotlib/projections/polar.py 2010年08月18日 17:35:26 UTC (rev 8650) @@ -188,7 +188,7 @@ def view_limits(self, vmin, vmax): vmin, vmax = self.base.view_limits(vmin, vmax) - return vmin, vmax + return 0, vmax def __init__(self, *args, **kwargs): Modified: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf =================================================================== --- branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf 2010年08月18日 17:00:29 UTC (rev 8649) +++ branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/polar_rmin.pdf 2010年08月18日 17:35:26 UTC (rev 8650) @@ -15,113 +15,118 @@ 9 0 obj << /Filter /FlateDecode /Length 11 0 R >> stream -x\x9C\xED\x9DϮ<?n\xDD\xF7\xF5\xB5L6 \xFDWik 1\xE0]\xE2\xB2\xB2r\x90\xC6u\x80\xAC\xFCZyĜշKE]; ;?\xAF\xAE1\xE3\xF9ޮ\xAE\xAE\x92D R$Ͽ=\xD2\xF9Wg<\xFF\x87\xFE\xFB\x97G8\xC3\xF9wg\xEDM\xFF\xFBe\xFF[rҿ\xC2\xE7\xF5\xF9\xF1\xFA\xDE\xDF\xEB_y\xA4\xEBҕW\xD2M9\xE7וz\xB5\xBD?˽\xBF\xFA\x95K\x88\xAD\xC7v\xB6\xF8*\xA1\xA7q\x85\x91\xF5\xBB1\xBC\xE2u\x85\xFB5\x8E\xA1{c \xE5J1\x9Es\x96\x92^u\xE8\xC7\xE2\xAD\x9C1\xB5W\x8A\xAD\x8E+\xA7\xAB\x9C\xA5\x85\xD7uƮ \xD0\xCF\xDEl~\xA4\xEF\x9Cs\xBC\xFF\xAD\xC7ݯ\xF3\xFC\xBD \xEA\xFAb\xCFW\xC9\xF9\xBA\xFFһ\xB8Qd=v\xFD\xA9u\xD4\xF9\xBAx\xF2\xF5\xFE\xD7\xF17g҃?/9/\xC7q\xAD\x83q\xBF\xA7 \xF7Ll\xEF\xF5\xB4e\xDD8b\xAC\x9A\xF5\xC7\xC0\xDF Ŧw\x99\xFF~L\x9B\xFB=7\xCF\xCFwqK\xE4\x86\xF1\\xDCǰM>\x82\xF27\xE7\xFF<\xFE\xFB\xF1\xBF\xCF_\xC9\xF9\x95\x9C?_r\xFE\xF3\xF9\xBF\x84So8\xCF\xFF4\x88\xC5\xFB;}\xAF\xBD\xAER\xCF)h\xC8I\xEF\xAC\xC9i\xADf\xFDSЕ. -9 -\xB8\xA7+\xD9\xF5 c\xCA)\xA51jz\x97W U\x9Fk \xAA]\xCF5i\x85c\xD7tp~\xD5\xDC\xF4G \x99\xEBE\x8F+!\xB71\xDE\xF7KRR \xB1\x94֢]O)\x84\xA6A\xA7b\xF7\xC7W\xEDZ\x972\xD2\xE0~M`\xAD5\xE50\xE2e\xF7\x87W\xB9\xF4Ҋ\xBD\xBF~No k ɞ߇\x94\x87@Yo\xA1\xEB\xFA\xB9b\xBD\xA2>\xE3~]O\x92\xE0p\x85\xA6iM\xCDRJ-]\xD0\xED\xFE\xEBծ\xA0\x97I\xA9h҂\xBE\x9E\xAE \xF3żs\xBF\x96%kZ\xBC\xBA\xDE/t=.զ\xE9\x8C\xC3\xEE\xB7z\xEEm\xAE7\xA6\xE3\xD2d\x87>k\x8Du\x8F&Y\xD7\xEB+\i\xB4z\xE5\xDA\xDF\xF7\xF78Z\xAAz`\xD6\xF5\xCCtĦ\xF7 \xF5}\xFFUr\xE8\xE1*A\xEF \xD2+\xE8\xD1W˹\xA7\xF7\xFBk\xB9Z\x91L\xCDO\xD0\xF8r\xD7|iA\xE3\xFB\xFD\xABV[C(\xA8\x83\xA4\xEC\xD2d\x871\xFA\xF7\xF4\xC5 C MK\xAA\xCB]\xA3\xEDU\xEB#%xO\xDF(\x9A\x99\xD1G@\xD7!y\x90 \xD9\xF0\xB5<\xD2'}\xA1\x94!\x81 E\xC3\xEB\xAD\xF6\xAB\xBE\x96W\xDD\xF8 -\xCDw ,\xDF%\xA5'\xD5B -\xF3\xF8\xF8һ \xA9E\xEC\xF5[\xFA\xBA\xFE\x90*K\xBA\xE254YI+\xF5)<ү\x96c\x95pI\xB3\xA54\xAD\xD6 \xBE\x85K\xAF|iH\xF6S\x837\xD5%\xCD\xD5\xD0\xC7M\x8F\xD2ȳ&7\xF2]=\xFB\xE2U5V]z!\xB5Hzn\x99\xFBZ)\x9A\xACvi\xA1\xA2\xDE,ǚ5\xAEL\x91F{e-m֛k\xA1\xA2F֊\xC4T\xB39o\xBFICk\xB3\xCB1\xC7r\xF1 \xA1\x97\xD0\xF34i%\xA4\xCAHӫ\x8F*\xB9\x89&\x86z\x87W\xE0\xDA% \xB0\xCB -9\xAE5\xF7a\xB7\xEB\xE9\xB1غ\x97>\xAFKFR\xD5\xECV\xBB\xFF\xD2:t&+\xD4y]\xFA\x96[FO\xB8_z#\x95\xAD!J\xAC\xE6\xDBg\x9ET\xB4\x90\xA8\xA1~[r%\xC5\xEF=\xA4a\xA3\xA5&=K\xB0h\xF7wɑ~\xACJX\xA3]\xD7*i\xBAL\xAB\xB8_r\x8F\xA1\xE5b\x93 rN҂\xEC\xF1I\xEF+D\xD1 \x8Cl\xCD$"\x97$\xFA\xBAl\xF8IP\xABG\x85,Y\xB9l\xA1\x85(\x97\x86\xDFK\xB1\xFB\xA5%B\xE9U4 -\xF2\xBA\xA4Zܟ\xC3+\xE9iTM \x9B\xE49]\xE6\xFE\x9C\x84\xF1\xB1FTߤXW됰d\xBB[\xB2 \xA0\x8Cұ\xD6MId#\xAA\xAD\xE7jw냀Fhy\xAE\xB1\xCA\xC6\xD4b\x9CO /\xBD\xA1@Ib[M\x87\xF5\xB0"D\xC3h\xED\x80-\x8C
Revision: 8649 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8649&view=rev Author: mdboom Date: 2010年08月18日 17:00:29 +0000 (2010年8月18日) Log Message: ----------- Fix positions of r axis labels when rmin != 0.0 in polar plots. Modified Paths: -------------- branches/v1_0_maint/lib/matplotlib/projections/polar.py branches/v1_0_maint/lib/matplotlib/transforms.py Modified: branches/v1_0_maint/lib/matplotlib/projections/polar.py =================================================================== --- branches/v1_0_maint/lib/matplotlib/projections/polar.py 2010年08月18日 16:09:19 UTC (rev 8648) +++ branches/v1_0_maint/lib/matplotlib/projections/polar.py 2010年08月18日 17:00:29 UTC (rev 8649) @@ -14,7 +14,7 @@ from matplotlib.ticker import Formatter, Locator, FormatStrFormatter from matplotlib.transforms import Affine2D, Affine2DBase, Bbox, \ BboxTransformTo, IdentityTransform, Transform, TransformWrapper, \ - ScaledTranslation, blended_transform_factory + ScaledTranslation, blended_transform_factory, BboxTransformToMaxOnly import matplotlib.spines as mspines class PolarAxes(Axes): @@ -41,16 +41,16 @@ self._axis = axis def transform(self, tr): - xy = np.zeros(tr.shape, np.float_) + xy = np.empty(tr.shape, np.float_) if self._axis is not None: rmin = self._axis.viewLim.ymin else: rmin = 0 - t = tr[:, 0:1] - r = tr[:, 1:2] - x = xy[:, 0:1] - y = xy[:, 1:2] + t = tr[:, 0:1] + r = tr[:, 1:2] + x = xy[:, 0:1] + y = xy[:, 1:2] if rmin != 0: r = r - rmin @@ -188,7 +188,7 @@ def view_limits(self, vmin, vmax): vmin, vmax = self.base.view_limits(vmin, vmax) - return 0, vmax + return vmin, vmax def __init__(self, *args, **kwargs): @@ -290,7 +290,8 @@ # The r-axis labels are put at an angle and padded in the r-direction self._r_label1_position = ScaledTranslation( 22.5, self._rpad, - blended_transform_factory(Affine2D(), BboxTransformTo(self.viewLim))) + blended_transform_factory( + Affine2D(), BboxTransformToMaxOnly(self.viewLim))) self._yaxis_text1_transform = ( self._r_label1_position + Affine2D().scale(1.0 / 360.0, 1.0) + @@ -298,7 +299,8 @@ ) self._r_label2_position = ScaledTranslation( 22.5, -self._rpad, - blended_transform_factory(Affine2D(), BboxTransformTo(self.viewLim))) + blended_transform_factory( + Affine2D(), BboxTransformToMaxOnly(self.viewLim))) self._yaxis_text2_transform = ( self._r_label2_position + Affine2D().scale(1.0 / 360.0, 1.0) + Modified: branches/v1_0_maint/lib/matplotlib/transforms.py =================================================================== --- branches/v1_0_maint/lib/matplotlib/transforms.py 2010年08月18日 16:09:19 UTC (rev 8648) +++ branches/v1_0_maint/lib/matplotlib/transforms.py 2010年08月18日 17:00:29 UTC (rev 8649) @@ -2107,6 +2107,31 @@ get_matrix.__doc__ = Affine2DBase.get_matrix.__doc__ +class BboxTransformToMaxOnly(BboxTransformTo): + """ + :class:`BboxTransformTo` is a transformation that linearly + transforms points from the unit bounding box to a given + :class:`Bbox` with a fixed upper left of (0, 0). + """ + def __repr__(self): + return "BboxTransformToMaxOnly(%s)" % (self._boxout) + __str__ = __repr__ + + def get_matrix(self): + if self._invalid: + xmax, ymax = self._boxout.max + if DEBUG and (xmax == 0 or ymax == 0): + raise ValueError("Transforming to a singular bounding box.") + self._mtx = np.array([[xmax, 0.0, 0.0], + [ 0.0, ymax, 0.0], + [ 0.0, 0.0, 1.0]], + np.float_) + self._inverted = None + self._invalid = 0 + return self._mtx + get_matrix.__doc__ = Affine2DBase.get_matrix.__doc__ + + class BboxTransformFrom(Affine2DBase): """ :class:`BboxTransformFrom` linearly transforms points from a given This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8648 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8648&view=rev Author: mdboom Date: 2010年08月18日 16:09:19 +0000 (2010年8月18日) Log Message: ----------- Merged revisions 8647 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8647 | mdboom | 2010年08月18日 12:07:37 -0400 (2010年8月18日) | 2 lines Fix bug in regular polygon handling ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/path.py Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8645 /trunk/matplotlib:1-7315 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8647 /trunk/matplotlib:1-7315 Modified: trunk/matplotlib/lib/matplotlib/path.py =================================================================== --- trunk/matplotlib/lib/matplotlib/path.py 2010年08月18日 16:07:37 UTC (rev 8647) +++ trunk/matplotlib/lib/matplotlib/path.py 2010年08月18日 16:09:19 UTC (rev 8648) @@ -408,7 +408,7 @@ # "points-up" theta += np.pi / 2.0 verts = np.concatenate((np.cos(theta), np.sin(theta)), 1) - codes = np.empty((numVertices,)) + codes = np.empty((numVertices + 1,)) codes[0] = cls.MOVETO codes[1:-1] = cls.LINETO codes[-1] = cls.CLOSEPOLY This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.