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
(1) |
2
(5) |
3
(14) |
4
(7) |
5
|
6
(9) |
7
(2) |
|
8
|
9
|
10
(1) |
11
(1) |
12
(10) |
13
(3) |
14
(2) |
|
15
(3) |
16
(2) |
17
|
18
(3) |
19
|
20
(1) |
21
(3) |
|
22
|
23
(4) |
24
(3) |
25
|
26
(1) |
27
|
28
|
|
29
|
30
(7) |
|
|
|
|
|
Revision: 7943 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7943&view=rev Author: jdh2358 Date: 2009年11月06日 15:06:28 +0000 (2009年11月06日) Log Message: ----------- Merged revisions 7942 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7942 | jdh2358 | 2009年11月06日 09:04:33 -0600 (2009年11月06日) | 1 line backport afm fix to branch ........ Property Changed: ---------------- trunk/matplotlib/ Property changes on: trunk/matplotlib ___________________________________________________________________ Modified: svnmerge-integrated - /branches/mathtex:1-7263 /branches/v0_99_maint:1-7929 + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7942 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7942 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7942&view=rev Author: jdh2358 Date: 2009年11月06日 15:04:33 +0000 (2009年11月06日) Log Message: ----------- backport afm fix to branch Modified Paths: -------------- branches/v0_99_maint/lib/matplotlib/afm.py Modified: branches/v0_99_maint/lib/matplotlib/afm.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/afm.py 2009年11月06日 15:02:19 UTC (rev 7941) +++ branches/v0_99_maint/lib/matplotlib/afm.py 2009年11月06日 15:04:33 UTC (rev 7942) @@ -37,8 +37,16 @@ import sys, os, re from _mathtext_data import uni2type1 -#Convert string the a python type -_to_int = int +# Convert string the a python type +# some afm files have floats where we are expecting ints -- there is +# probably a better way to handle this (support floats, round rather +# than truncate). But I don't know what the best approach is now and +# this change to _to_int should at least prevent mpl from crashing on +# these JDH (2009年11月06日) +def _to_int(x): + return int(float(x)) + + _to_float = float _to_str = str This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7941 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7941&view=rev Author: jdh2358 Date: 2009年11月06日 15:02:19 +0000 (2009年11月06日) Log Message: ----------- fix to int in afm to not crash on floats Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/afm.py Modified: trunk/matplotlib/lib/matplotlib/afm.py =================================================================== --- trunk/matplotlib/lib/matplotlib/afm.py 2009年11月06日 15:00:57 UTC (rev 7940) +++ trunk/matplotlib/lib/matplotlib/afm.py 2009年11月06日 15:02:19 UTC (rev 7941) @@ -44,7 +44,10 @@ # than truncate). But I don't know what the best approach is now and # this change to _to_int should at least prevent mpl from crashing on # these JDH (2009年11月06日) -_to_int = lambda x: return int(float(x)) + +def _to_int(x): + return int(float(x)) + _to_float = float _to_str = str This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7940 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7940&view=rev Author: jdh2358 Date: 2009年11月06日 15:00:57 +0000 (2009年11月06日) Log Message: ----------- fix to int in afm to not crash on floats Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/afm.py Modified: trunk/matplotlib/lib/matplotlib/afm.py =================================================================== --- trunk/matplotlib/lib/matplotlib/afm.py 2009年11月06日 13:05:13 UTC (rev 7939) +++ trunk/matplotlib/lib/matplotlib/afm.py 2009年11月06日 15:00:57 UTC (rev 7940) @@ -38,7 +38,13 @@ from _mathtext_data import uni2type1 #Convert string the a python type -_to_int = int + +# some afm files have floats where we are expecting ints -- there is +# probably a better way to handle this (support floats, round rather +# than truncate). But I don't know what the best approach is now and +# this change to _to_int should at least prevent mpl from crashing on +# these JDH (2009年11月06日) +_to_int = lambda x: return int(float(x)) _to_float = float _to_str = str This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7939 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7939&view=rev Author: jswhit Date: 2009年11月06日 13:05:13 +0000 (2009年11月06日) Log Message: ----------- patch for drawmapscale from Stephane Raynaud. Modified Paths: -------------- trunk/toolkits/basemap/Changelog trunk/toolkits/basemap/README trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2009年11月04日 20:22:35 UTC (rev 7938) +++ trunk/toolkits/basemap/Changelog 2009年11月06日 13:05:13 UTC (rev 7939) @@ -1,4 +1,6 @@ version 0.99.5 (not yet released) + * patch from Stephane Raynaud to pass format string to + drawmapscale, and allow units='m'. * updated proj4 source to version 4.7.0, pyproj to 1.8.6. * add "is_land" method to check whether a point is over land or water. Modified: trunk/toolkits/basemap/README =================================================================== --- trunk/toolkits/basemap/README 2009年11月04日 20:22:35 UTC (rev 7938) +++ trunk/toolkits/basemap/README 2009年11月06日 13:05:13 UTC (rev 7939) @@ -141,5 +141,6 @@ Pierre Gerard-Marchant Christoph Gohlke Eric Bruning +Stephane Raynaud for valuable contributions. Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年11月04日 20:22:35 UTC (rev 7938) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年11月06日 13:05:13 UTC (rev 7939) @@ -3319,7 +3319,8 @@ def drawmapscale(self,lon,lat,lon0,lat0,length,barstyle='simple',\ units='km',fontsize=9,yoffset=None,labelstyle='simple',\ - fontcolor='k',fillcolor1='w',fillcolor2='k',ax=None): + fontcolor='k',fillcolor1='w',fillcolor2='k',ax=None,\ + format='%d'): """ Draw a map scale at ``lon,lat`` of length ``length`` representing distance in the map @@ -3343,6 +3344,8 @@ displayed on the top of the scale bar. For ``simple``, just the units are display on top and the distance below the scale bar. + If equal to False, plot an empty label. + format a string formatter to format numeric values yoffset yoffset controls how tall the scale bar is, and how far the annotations are offset from the scale bar. Default is 0.02 times the height of @@ -3360,17 +3363,15 @@ if self.projection == 'cyl': raise ValueError("cannot draw map scale for projection='cyl'") # convert length to meters + lenlab = length if units == 'km': - lenlab = length length = length*1000 elif units == 'mi': - lenlab = length length = length*1609.344 elif units == 'nmi': - lenlab = length length = length*1852 - else: - msg = "units must be 'km' (kilometers), "\ + elif units != 'm': + msg = "units must be 'm' (meters), 'km' (kilometers), "\ "'mi' (miles) or 'nmi' (nautical miles)" raise KeyError(msg) # reference point and center of scale. @@ -3411,6 +3412,8 @@ labelstr = units elif labelstyle == 'fancy': labelstr = units+" (scale factor %4.2f at %s)"%(scalefact,lonlatstr) + elif labelstyle == False: + labelstr = '' else: raise KeyError("labelstyle must be 'simple' or 'fancy'") # default y offset is 2 percent of map height. @@ -3456,15 +3459,15 @@ rets.append(self.plot([xc,xc],[ytick,ybottom],color=fontcolor)[0]) rets.append(self.plot([x4,x4],[ytick,ybottom],color=fontcolor)[0]) #label 3 tick marks - rets.append(ax.text(x1,ytext,'%d' % (0),\ + rets.append(ax.text(x1,ytext,format % (0),\ horizontalalignment='center',\ verticalalignment='top',\ fontsize=fontsize,color=fontcolor)) - rets.append(ax.text(xc,ytext,'%d' % (0.5*lenlab),\ + rets.append(ax.text(xc,ytext,format % (0.5*lenlab),\ horizontalalignment='center',\ verticalalignment='top',\ fontsize=fontsize,color=fontcolor)) - rets.append(ax.text(x4,ytext,'%d' % (lenlab),\ + rets.append(ax.text(x4,ytext,format % (lenlab),\ horizontalalignment='center',\ verticalalignment='top',\ fontsize=fontsize,color=fontcolor)) @@ -3478,7 +3481,7 @@ rets.append(self.plot([x1,x4],[yc,yc],color=fontcolor)[0]) rets.append(self.plot([x1,x1],[yc-yoffset,yc+yoffset],color=fontcolor)[0]) rets.append(self.plot([x4,x4],[yc-yoffset,yc+yoffset],color=fontcolor)[0]) - rets.append(ax.text(xc,yc-yoffset,'%d' % lenlab,\ + rets.append(ax.text(xc,yc-yoffset,format % lenlab,\ verticalalignment='top',horizontalalignment='center',\ fontsize=fontsize,color=fontcolor)) #put units, scale factor on top This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7938 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7938&view=rev Author: jswhit Date: 2009年11月04日 20:22:35 +0000 (2009年11月04日) Log Message: ----------- don't try to create _geoslib Polygon instances if resolution=None Modified Paths: -------------- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年11月04日 17:53:25 UTC (rev 7937) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年11月04日 20:22:35 UTC (rev 7938) @@ -805,15 +805,16 @@ # currently only used in is_land method. self.landpolygons=[] self.lakepolygons=[] - #self.islandinlakepolygons=[] - #self.lakeinislandinlakepolygons=[] - x, y = zip(*self.coastpolygons) - for x,y,type in zip(x,y,self.coastpolygontypes): - b = np.asarray([x,y]).T - if type == 1: self.landpolygons.append(_geoslib.Polygon(b)) - if type == 2: self.lakepolygons.append(_geoslib.Polygon(b)) - #if type == 3: self.islandinlakepolygons.append(_geoslib.Polygon(b)) - #if type == 4: self.lakeinislandinlakepolygons.append(_geoslib.Polygon(b)) + if resolution is not None: + #self.islandinlakepolygons=[] + #self.lakeinislandinlakepolygons=[] + x, y = zip(*self.coastpolygons) + for x,y,type in zip(x,y,self.coastpolygontypes): + b = np.asarray([x,y]).T + if type == 1: self.landpolygons.append(_geoslib.Polygon(b)) + if type == 2: self.lakepolygons.append(_geoslib.Polygon(b)) + #if type == 3: self.islandinlakepolygons.append(_geoslib.Polygon(b)) + #if type == 4: self.lakeinislandinlakepolygons.append(_geoslib.Polygon(b)) # set __init__'s docstring __init__.__doc__ = _Basemap_init_doc @@ -1558,6 +1559,7 @@ the GSHHS coastline polygons associated with the class instance. Points over lakes inside land regions are not counted as land points. """ + if resolution is None: return None landpt = False for poly in self.landpolygons: landpt = _geoslib.Point((xpt,ypt)).within(poly) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7937 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7937&view=rev Author: leejjoon Date: 2009年11月04日 17:53:25 +0000 (2009年11月04日) Log Message: ----------- add bbox_extra_artists keyword for savefig Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/backend_bases.py trunk/matplotlib/lib/matplotlib/figure.py Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py =================================================================== --- trunk/matplotlib/lib/matplotlib/backend_bases.py 2009年11月04日 17:30:12 UTC (rev 7936) +++ trunk/matplotlib/lib/matplotlib/backend_bases.py 2009年11月04日 17:53:25 UTC (rev 7937) @@ -1536,11 +1536,26 @@ *edgecolor* the edgecolor of the figure - *orientation* ' + *orientation* landscape' | 'portrait' (not supported on all backends) *format* when set, forcibly set the file format to save to + + + *bbox_inches* + Bbox in inches. Only the given portion of the figure is + saved. If 'tight', try to figure out the tight bbox of + the figure. + + *pad_inches* + Amount of padding around the figure when bbox_inches is + 'tight'. + + *bbox_extra_artists* + A list of extra artists that will be considered when the + tight bbox is calculated. + """ if format is None: if cbook.is_string_like(filename): @@ -1597,6 +1612,18 @@ **kwargs) renderer = self.figure._cachedRenderer bbox_inches = self.figure.get_tightbbox(renderer) + + bb = [a.get_window_extent(renderer) for a in kwargs.pop("bbox_extra_artists", []) \ + if a.get_visible()] + if bb: + _bbox = Bbox.union([b for b in bb if b.width!=0 or b.height!=0]) + + bbox_inches1 = TransformedBbox(_bbox, + Affine2D().scale(1./self.figure.dpi)) + + bbox_inches = Bbox.union([bbox_inches, bbox_inches1]) + + pad = kwargs.pop("pad_inches", 0.1) bbox_inches = bbox_inches.padded(pad) Modified: trunk/matplotlib/lib/matplotlib/figure.py =================================================================== --- trunk/matplotlib/lib/matplotlib/figure.py 2009年11月04日 17:30:12 UTC (rev 7936) +++ trunk/matplotlib/lib/matplotlib/figure.py 2009年11月04日 17:53:25 UTC (rev 7937) @@ -1031,6 +1031,10 @@ Amount of padding around the figure when bbox_inches is 'tight'. + *bbox_extra_artists*: + A list of extra artists that will be considered when the + tight bbox is calculated. + """ for key in ('dpi', 'facecolor', 'edgecolor'): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7936 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7936&view=rev Author: jdh2358 Date: 2009年11月04日 17:30:12 +0000 (2009年11月04日) Log Message: ----------- added levels kwarg to contour Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/contour.py trunk/matplotlib/lib/matplotlib/mlab.py trunk/matplotlib/lib/matplotlib/widgets.py Modified: trunk/matplotlib/lib/matplotlib/contour.py =================================================================== --- trunk/matplotlib/lib/matplotlib/contour.py 2009年11月04日 16:26:37 UTC (rev 7935) +++ trunk/matplotlib/lib/matplotlib/contour.py 2009年11月04日 17:30:12 UTC (rev 7936) @@ -1066,6 +1066,11 @@ scaling data values to colors. If *norm* is *None* and *colors* is *None*, the default linear scaling is used. + *levels* [level0, level1, ..., leveln] + A list of floating point numbers indicating the level + curves to draw; eg to draw just the zero contour pass + ``levels=[0]`` + *origin*: [ None | 'upper' | 'lower' | 'image' ] If *None*, the first value of *Z* will correspond to the lower left corner, location (0,0). If 'image', the rc Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月04日 16:26:37 UTC (rev 7935) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月04日 17:30:12 UTC (rev 7936) @@ -2576,6 +2576,10 @@ *withheader*: if withheader is False, do not write the attribute names in the first row + for formatd type FormatFloat, we override the precision to store + full precision floats in the CSV file + + .. seealso:: :func:`csv2rec` Modified: trunk/matplotlib/lib/matplotlib/widgets.py =================================================================== --- trunk/matplotlib/lib/matplotlib/widgets.py 2009年11月04日 16:26:37 UTC (rev 7935) +++ trunk/matplotlib/lib/matplotlib/widgets.py 2009年11月04日 17:30:12 UTC (rev 7936) @@ -669,6 +669,8 @@ self.vertOn = True self.useblit = useblit + if useblit: + lineprops['animated'] = True self.lineh = ax.axhline(ax.get_ybound()[0], visible=False, **lineprops) self.linev = ax.axvline(ax.get_xbound()[0], visible=False, **lineprops) @@ -741,10 +743,14 @@ """ def __init__(self, canvas, axes, useblit=True, **lineprops): + self.canvas = canvas self.axes = axes xmin, xmax = axes[-1].get_xlim() xmid = 0.5*(xmin+xmax) + if useblit: + lineprops['animated'] = True + self.lines = [ax.axvline(xmid, visible=False, **lineprops) for ax in axes] self.visible = True This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7935 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7935&view=rev Author: jswhit Date: 2009年11月04日 16:26:37 +0000 (2009年11月04日) Log Message: ----------- new files in proj4 4.7.0 Added Paths: ----------- trunk/toolkits/basemap/src/PJ_gstmerc.c trunk/toolkits/basemap/src/pj_initcache.c trunk/toolkits/basemap/src/pj_mutex.c Added: trunk/toolkits/basemap/src/PJ_gstmerc.c =================================================================== --- trunk/toolkits/basemap/src/PJ_gstmerc.c (rev 0) +++ trunk/toolkits/basemap/src/PJ_gstmerc.c 2009年11月04日 16:26:37 UTC (rev 7935) @@ -0,0 +1,48 @@ +#define PROJ_PARMS__ \ + double lamc;\ + double phic;\ + double c;\ + double n1;\ + double n2;\ + double XS;\ + double YS; + +#define PJ_LIB__ +# include <projects.h> +PROJ_HEAD(gstmerc, "Gauss-Schreiber Transverse Mercator (aka Gauss-Laborde Reunion)") + "\n\tCyl, Sph&Ell\n\tlat_0= lon_0= k_0="; +FORWARD(s_forward); /* spheroid */ + double L, Ls, sinLs1, Ls1; + L= P->n1*lp.lam; + Ls= P->c+P->n1*log(pj_tsfn(-1.0*lp.phi,-1.0*sin(lp.phi),P->e)); + sinLs1= sin(L)/cosh(Ls); + Ls1= log(pj_tsfn(-1.0*asin(sinLs1),0.0,0.0)); + xy.x= (P->XS + P->n2*Ls1)*P->ra; + xy.y= (P->YS + P->n2*atan(sinh(Ls)/cos(L)))*P->ra; + /*fprintf(stderr,"fwd:\nL =%16.13f\nLs =%16.13f\nLs1 =%16.13f\nLP(%16.13f,%16.13f)=XY(%16.4f,%16.4f)\n",L,Ls,Ls1,lp.lam+P->lam0,lp.phi,(xy.x*P->a + P->x0)*P->to_meter,(xy.y*P->a + P->y0)*P->to_meter);*/ + return (xy); +} +INVERSE(s_inverse); /* spheroid */ + double L, LC, sinC; + L= atan(sinh((xy.x*P->a - P->XS)/P->n2)/cos((xy.y*P->a - P->YS)/P->n2)); + sinC= sin((xy.y*P->a - P->YS)/P->n2)/cosh((xy.x*P->a - P->XS)/P->n2); + LC= log(pj_tsfn(-1.0*asin(sinC),0.0,0.0)); + lp.lam= L/P->n1; + lp.phi= -1.0*pj_phi2(exp((LC-P->c)/P->n1),P->e); + /*fprintf(stderr,"inv:\nL =%16.13f\nsinC =%16.13f\nLC =%16.13f\nXY(%16.4f,%16.4f)=LP(%16.13f,%16.13f)\n",L,sinC,LC,((xy.x/P->ra)+P->x0)/P->to_meter,((xy.y/P->ra)+P->y0)/P->to_meter,lp.lam+P->lam0,lp.phi);*/ + return (lp); +} +FREEUP; if (P) pj_dalloc(P); } +ENTRY0(gstmerc) + P->lamc= P->lam0; + P->n1= sqrt(1.0+P->es*pow(cos(P->phi0),4.0)/(1.0-P->es)); + P->phic= asin(sin(P->phi0)/P->n1); + P->c= log(pj_tsfn(-1.0*P->phic,0.0,0.0)) + -P->n1*log(pj_tsfn(-1.0*P->phi0,-1.0*sin(P->phi0),P->e)); + P->n2= P->k0*P->a*sqrt(1.0-P->es)/(1.0-P->es*sin(P->phi0)*sin(P->phi0)); + P->XS= 0;/* -P->x0 */ + P->YS= -1.0*P->n2*P->phic;/* -P->y0 */ + P->inv= s_inverse; + P->fwd= s_forward; + /*fprintf(stderr,"a (m) =%16.4f\ne =%16.13f\nl0(rad)=%16.13f\np0(rad)=%16.13f\nk0 =%16.4f\nX0 (m)=%16.4f\nY0 (m)=%16.4f\n\nlC(rad)=%16.13f\npC(rad)=%16.13f\nc =%16.13f\nn1 =%16.13f\nn2 (m) =%16.4f\nXS (m) =%16.4f\nYS (m) =%16.4f\n", P->a, P->e, P->lam0, P->phi0, P->k0, P->x0, P->y0, P->lamc, P->phic, P->c, P->n1, P->n2, P->XS +P->x0, P->YS + P->y0);*/ +ENDENTRY(P) Added: trunk/toolkits/basemap/src/pj_initcache.c =================================================================== --- trunk/toolkits/basemap/src/pj_initcache.c (rev 0) +++ trunk/toolkits/basemap/src/pj_initcache.c 2009年11月04日 16:26:37 UTC (rev 7935) @@ -0,0 +1,181 @@ +/****************************************************************************** + * $Id: pj_transform.c 1504 2009年01月06日 02:11:57Z warmerdam $ + * + * Project: PROJ.4 + * Purpose: init file definition cache. + * Author: Frank Warmerdam, war...@po... + * + ****************************************************************************** + * Copyright (c) 2009, Frank Warmerdam + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + *****************************************************************************/ + +#include <projects.h> +#include <string.h> + +PJ_CVSID("$Id: pj_transform.c 1504 2009年01月06日 02:11:57Z warmerdam $"); + +static int cache_count = 0; +static int cache_alloc = 0; +static char **cache_key = NULL; +static paralist **cache_paralist = NULL; + +/************************************************************************/ +/* pj_clone_paralist() */ +/* */ +/* Allocate a copy of a parameter list. */ +/************************************************************************/ + +paralist *pj_clone_paralist( const paralist *list) +{ + paralist *list_copy = NULL, *next_copy = NULL; + + for( ; list != NULL; list = list->next ) + { + paralist *newitem = (paralist *) + pj_malloc(sizeof(paralist) + strlen(list->param)); + + newitem->used = 0; + newitem->next = 0; + strcpy( newitem->param, list->param ); + + if( list_copy == NULL ) + list_copy = newitem; + else + next_copy->next = newitem; + + next_copy = newitem; + } + + return list_copy; +} + +/************************************************************************/ +/* pj_clear_initcache() */ +/* */ +/* Clear out all memory held in the init file cache. */ +/************************************************************************/ + +void pj_clear_initcache() +{ + if( cache_alloc > 0 ) + { + int i; + + pj_acquire_lock(); + + for( i = 0; i < cache_count; i++ ) + { + paralist *n, *t = cache_paralist[i]; + + pj_dalloc( cache_key[i] ); + + /* free parameter list elements */ + for (; t != NULL; t = n) { + n = t->next; + pj_dalloc(t); + } + } + + pj_dalloc( cache_key ); + pj_dalloc( cache_paralist ); + cache_count = 0; + cache_alloc= 0; + cache_key = NULL; + cache_paralist = NULL; + + pj_release_lock(); + } +} + +/************************************************************************/ +/* pj_search_initcache() */ +/* */ +/* Search for a matching definition in the init cache. */ +/************************************************************************/ + +paralist *pj_search_initcache( const char *filekey ) + +{ + int i; + paralist *result = NULL; + + pj_acquire_lock(); + + for( i = 0; result == NULL && i < cache_count; i++) + { + if( strcmp(filekey,cache_key[i]) == 0 ) + { + result = pj_clone_paralist( cache_paralist[i] ); + } + } + + pj_release_lock(); + + return result; +} + +/************************************************************************/ +/* pj_insert_initcache() */ +/* */ +/* Insert a paralist definition in the init file cache. */ +/************************************************************************/ + +void pj_insert_initcache( const char *filekey, const paralist *list ) + +{ + pj_acquire_lock(); + + /* + ** Grow list if required. + */ + if( cache_count == cache_alloc ) + { + char **cache_key_new; + paralist **cache_paralist_new; + + cache_alloc = cache_alloc * 2 + 15; + + cache_key_new = (char **) pj_malloc(sizeof(char*) * cache_alloc); + memcpy( cache_key, cache_key_new, sizeof(char*) * cache_count); + pj_dalloc( cache_key ); + cache_key = cache_key_new; + + cache_paralist_new = (paralist **) + pj_malloc(sizeof(paralist*) * cache_alloc); + memcpy( cache_paralist_new, cache_paralist, + sizeof(paralist*) * cache_count ); + pj_dalloc( cache_paralist ); + cache_paralist = cache_paralist_new; + } + + /* + ** Duplicate the filekey and paralist, and insert in cache. + */ + cache_key[cache_count] = (char *) pj_malloc(strlen(filekey)+1); + strcpy( cache_key[cache_count], filekey ); + + cache_paralist[cache_count] = pj_clone_paralist( list ); + + cache_count++; + + pj_release_lock(); +} + Added: trunk/toolkits/basemap/src/pj_mutex.c =================================================================== --- trunk/toolkits/basemap/src/pj_mutex.c (rev 0) +++ trunk/toolkits/basemap/src/pj_mutex.c 2009年11月04日 16:26:37 UTC (rev 7935) @@ -0,0 +1,212 @@ +/****************************************************************************** + * $Id: pj_transform.c 1504 2009年01月06日 02:11:57Z warmerdam $ + * + * Project: PROJ.4 + * Purpose: Mutex (thread lock) functions. + * Author: Frank Warmerdam, war...@po... + * + ****************************************************************************** + * Copyright (c) 2009, Frank Warmerdam + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + *****************************************************************************/ + + +/* projects.h and windows.h conflict - avoid this! */ + +#ifndef _WIN32 +#include <projects.h> +PJ_CVSID("$Id: pj_transform.c 1504 2009年01月06日 02:11:57Z warmerdam $"); +#else +#include <proj_api.h> +#endif + +#ifdef _WIN32 +# define MUTEX_win32 +#endif + +#if !defined(MUTEX_stub) && !defined(MUTEX_pthread) && !defined(MUTEX_win32) +# define MUTEX_stub +#endif + +static void pj_init_lock(); + +/************************************************************************/ +/* ==================================================================== */ +/* stub mutex implementation */ +/* ==================================================================== */ +/************************************************************************/ + +#ifdef MUTEX_stub + +/************************************************************************/ +/* pj_acquire_lock() */ +/* */ +/* Acquire the PROJ.4 lock. */ +/************************************************************************/ + +void pj_acquire_lock() +{ +} + +/************************************************************************/ +/* pj_release_lock() */ +/* */ +/* Release the PROJ.4 lock. */ +/************************************************************************/ + +void pj_release_lock() +{ +} + +/************************************************************************/ +/* pj_cleanup_lock() */ +/************************************************************************/ +void pj_cleanup_lock() +{ +} + +/************************************************************************/ +/* pj_init_lock() */ +/************************************************************************/ + +static void pj_init_lock() + +{ +} + +#endif // def MUTEX_stub + +/************************************************************************/ +/* ==================================================================== */ +/* pthread mutex implementation */ +/* ==================================================================== */ +/************************************************************************/ + +#ifdef MUTEX_pthread + +#include "pthread.h" + +static pthread_mutex_t core_lock = PTHREAD_MUTEX_INITIALIZER; + +/************************************************************************/ +/* pj_acquire_lock() */ +/* */ +/* Acquire the PROJ.4 lock. */ +/************************************************************************/ + +void pj_acquire_lock() +{ + pthread_mutex_lock( &core_lock); +} + +/************************************************************************/ +/* pj_release_lock() */ +/* */ +/* Release the PROJ.4 lock. */ +/************************************************************************/ + +void pj_release_lock() +{ + pthread_mutex_unlock( &core_lock ); +} + +/************************************************************************/ +/* pj_cleanup_lock() */ +/************************************************************************/ +void pj_cleanup_lock() +{ +} + +/************************************************************************/ +/* pj_init_lock() */ +/************************************************************************/ + +static void pj_init_lock() + +{ +} + +#endif // def MUTEX_pthread + +/************************************************************************/ +/* ==================================================================== */ +/* win32 mutex implementation */ +/* ==================================================================== */ +/************************************************************************/ + +#ifdef MUTEX_win32 + +#include <windows.h> + +static HANDLE mutex_lock = NULL; + +/************************************************************************/ +/* pj_acquire_lock() */ +/* */ +/* Acquire the PROJ.4 lock. */ +/************************************************************************/ + +void pj_acquire_lock() +{ + if( mutex_lock == NULL ) + pj_init_lock(); + + WaitForSingleObject( mutex_lock, INFINITE ); +} + +/************************************************************************/ +/* pj_release_lock() */ +/* */ +/* Release the PROJ.4 lock. */ +/************************************************************************/ + +void pj_release_lock() +{ + if( mutex_lock == NULL ) + pj_init_lock(); + + ReleaseMutex( mutex_lock ); +} + +/************************************************************************/ +/* pj_cleanup_lock() */ +/************************************************************************/ +void pj_cleanup_lock() +{ + if( mutex_lock != NULL ) + { + CloseHandle( mutex_lock ); + mutex_lock = NULL; + } +} + +/************************************************************************/ +/* pj_init_lock() */ +/************************************************************************/ + +static void pj_init_lock() + +{ + if( mutex_lock == NULL ) + mutex_lock = CreateMutex( NULL, TRUE, NULL ); +} + +#endif // def MUTEX_win32 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7934 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7934&view=rev Author: jswhit Date: 2009年11月04日 16:26:06 +0000 (2009年11月04日) Log Message: ----------- updated proj4 source to 4.7.0, pyproj to 1.8.6 Modified Paths: -------------- trunk/toolkits/basemap/Changelog trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/README trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/epsg trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/td_out.dist trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/testvarious trunk/toolkits/basemap/src/PJ_aea.c trunk/toolkits/basemap/src/PJ_aeqd.c trunk/toolkits/basemap/src/PJ_airy.c trunk/toolkits/basemap/src/PJ_aitoff.c trunk/toolkits/basemap/src/PJ_august.c trunk/toolkits/basemap/src/PJ_bacon.c trunk/toolkits/basemap/src/PJ_bipc.c trunk/toolkits/basemap/src/PJ_boggs.c trunk/toolkits/basemap/src/PJ_bonne.c trunk/toolkits/basemap/src/PJ_cass.c trunk/toolkits/basemap/src/PJ_cc.c trunk/toolkits/basemap/src/PJ_cea.c trunk/toolkits/basemap/src/PJ_chamb.c trunk/toolkits/basemap/src/PJ_collg.c trunk/toolkits/basemap/src/PJ_crast.c trunk/toolkits/basemap/src/PJ_denoy.c trunk/toolkits/basemap/src/PJ_eck1.c trunk/toolkits/basemap/src/PJ_eck2.c trunk/toolkits/basemap/src/PJ_eck3.c trunk/toolkits/basemap/src/PJ_eck4.c trunk/toolkits/basemap/src/PJ_eck5.c trunk/toolkits/basemap/src/PJ_eqc.c trunk/toolkits/basemap/src/PJ_eqdc.c trunk/toolkits/basemap/src/PJ_fahey.c trunk/toolkits/basemap/src/PJ_fouc_s.c trunk/toolkits/basemap/src/PJ_gall.c trunk/toolkits/basemap/src/PJ_geos.c trunk/toolkits/basemap/src/PJ_gins8.c trunk/toolkits/basemap/src/PJ_gn_sinu.c trunk/toolkits/basemap/src/PJ_gnom.c trunk/toolkits/basemap/src/PJ_goode.c trunk/toolkits/basemap/src/PJ_hammer.c trunk/toolkits/basemap/src/PJ_hatano.c trunk/toolkits/basemap/src/PJ_imw_p.c trunk/toolkits/basemap/src/PJ_krovak.c trunk/toolkits/basemap/src/PJ_labrd.c trunk/toolkits/basemap/src/PJ_laea.c trunk/toolkits/basemap/src/PJ_lagrng.c trunk/toolkits/basemap/src/PJ_larr.c trunk/toolkits/basemap/src/PJ_lask.c trunk/toolkits/basemap/src/PJ_lcc.c trunk/toolkits/basemap/src/PJ_lcca.c trunk/toolkits/basemap/src/PJ_loxim.c trunk/toolkits/basemap/src/PJ_lsat.c trunk/toolkits/basemap/src/PJ_mbt_fps.c trunk/toolkits/basemap/src/PJ_mbtfpp.c trunk/toolkits/basemap/src/PJ_mbtfpq.c trunk/toolkits/basemap/src/PJ_merc.c trunk/toolkits/basemap/src/PJ_mill.c trunk/toolkits/basemap/src/PJ_mod_ster.c trunk/toolkits/basemap/src/PJ_moll.c trunk/toolkits/basemap/src/PJ_nell.c trunk/toolkits/basemap/src/PJ_nell_h.c trunk/toolkits/basemap/src/PJ_nocol.c trunk/toolkits/basemap/src/PJ_nsper.c trunk/toolkits/basemap/src/PJ_nzmg.c trunk/toolkits/basemap/src/PJ_ob_tran.c trunk/toolkits/basemap/src/PJ_ocea.c trunk/toolkits/basemap/src/PJ_oea.c trunk/toolkits/basemap/src/PJ_omerc.c trunk/toolkits/basemap/src/PJ_ortho.c trunk/toolkits/basemap/src/PJ_poly.c trunk/toolkits/basemap/src/PJ_putp2.c trunk/toolkits/basemap/src/PJ_putp3.c trunk/toolkits/basemap/src/PJ_putp4p.c trunk/toolkits/basemap/src/PJ_putp5.c trunk/toolkits/basemap/src/PJ_putp6.c trunk/toolkits/basemap/src/PJ_robin.c trunk/toolkits/basemap/src/PJ_rpoly.c trunk/toolkits/basemap/src/PJ_sconics.c trunk/toolkits/basemap/src/PJ_somerc.c trunk/toolkits/basemap/src/PJ_stere.c trunk/toolkits/basemap/src/PJ_sterea.c trunk/toolkits/basemap/src/PJ_sts.c trunk/toolkits/basemap/src/PJ_tcc.c trunk/toolkits/basemap/src/PJ_tcea.c trunk/toolkits/basemap/src/PJ_tmerc.c trunk/toolkits/basemap/src/PJ_tpeqd.c trunk/toolkits/basemap/src/PJ_urm5.c trunk/toolkits/basemap/src/PJ_urmfps.c trunk/toolkits/basemap/src/PJ_vandg.c trunk/toolkits/basemap/src/PJ_vandg2.c trunk/toolkits/basemap/src/PJ_vandg4.c trunk/toolkits/basemap/src/PJ_wag2.c trunk/toolkits/basemap/src/PJ_wag3.c trunk/toolkits/basemap/src/PJ_wag7.c trunk/toolkits/basemap/src/PJ_wink1.c trunk/toolkits/basemap/src/PJ_wink2.c trunk/toolkits/basemap/src/_geod.c trunk/toolkits/basemap/src/_geod.pyx trunk/toolkits/basemap/src/_proj.c trunk/toolkits/basemap/src/_proj.pyx trunk/toolkits/basemap/src/_pyproj.pxi trunk/toolkits/basemap/src/aasincos.c trunk/toolkits/basemap/src/adjlon.c trunk/toolkits/basemap/src/bch2bps.c trunk/toolkits/basemap/src/bchgen.c trunk/toolkits/basemap/src/biveval.c trunk/toolkits/basemap/src/dmstor.c trunk/toolkits/basemap/src/emess.c trunk/toolkits/basemap/src/gen_cheb.c trunk/toolkits/basemap/src/geocent.c trunk/toolkits/basemap/src/geod.c trunk/toolkits/basemap/src/geod_for.c trunk/toolkits/basemap/src/geod_inv.c trunk/toolkits/basemap/src/geod_set.c trunk/toolkits/basemap/src/mk_cheby.c trunk/toolkits/basemap/src/nad_cvt.c trunk/toolkits/basemap/src/nad_init.c trunk/toolkits/basemap/src/nad_intr.c trunk/toolkits/basemap/src/p_series.c trunk/toolkits/basemap/src/pj_apply_gridshift.c trunk/toolkits/basemap/src/pj_auth.c trunk/toolkits/basemap/src/pj_datum_set.c trunk/toolkits/basemap/src/pj_datums.c trunk/toolkits/basemap/src/pj_deriv.c trunk/toolkits/basemap/src/pj_ell_set.c trunk/toolkits/basemap/src/pj_ellps.c trunk/toolkits/basemap/src/pj_errno.c trunk/toolkits/basemap/src/pj_factors.c trunk/toolkits/basemap/src/pj_fwd.c trunk/toolkits/basemap/src/pj_gauss.c trunk/toolkits/basemap/src/pj_geocent.c trunk/toolkits/basemap/src/pj_gridinfo.c trunk/toolkits/basemap/src/pj_gridlist.c trunk/toolkits/basemap/src/pj_init.c trunk/toolkits/basemap/src/pj_inv.c trunk/toolkits/basemap/src/pj_latlong.c trunk/toolkits/basemap/src/pj_list.c trunk/toolkits/basemap/src/pj_list.h trunk/toolkits/basemap/src/pj_malloc.c trunk/toolkits/basemap/src/pj_mlfn.c trunk/toolkits/basemap/src/pj_msfn.c trunk/toolkits/basemap/src/pj_open_lib.c trunk/toolkits/basemap/src/pj_param.c trunk/toolkits/basemap/src/pj_phi2.c trunk/toolkits/basemap/src/pj_pr_list.c trunk/toolkits/basemap/src/pj_qsfn.c trunk/toolkits/basemap/src/pj_release.c trunk/toolkits/basemap/src/pj_strerrno.c trunk/toolkits/basemap/src/pj_transform.c trunk/toolkits/basemap/src/pj_tsfn.c trunk/toolkits/basemap/src/pj_units.c trunk/toolkits/basemap/src/pj_utils.c trunk/toolkits/basemap/src/pj_zpoly1.c trunk/toolkits/basemap/src/proj_api.h trunk/toolkits/basemap/src/proj_mdist.c trunk/toolkits/basemap/src/proj_rouss.c trunk/toolkits/basemap/src/projects.h trunk/toolkits/basemap/src/rtodms.c trunk/toolkits/basemap/src/vector1.c Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2009年11月04日 16:18:11 UTC (rev 7933) +++ trunk/toolkits/basemap/Changelog 2009年11月04日 16:26:06 UTC (rev 7934) @@ -1,4 +1,5 @@ version 0.99.5 (not yet released) + * updated proj4 source to version 4.7.0, pyproj to 1.8.6. * add "is_land" method to check whether a point is over land or water. * geos-3.1.1 now required. 3.1.1 source included (instead of 2.2.3). Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/README =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/README 2009年11月04日 16:18:11 UTC (rev 7933) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/README 2009年11月04日 16:26:06 UTC (rev 7934) @@ -1,5 +1,72 @@ -To install the 'h' (high) resolution data files, manually copy them -to basmap's data directory. To find out where this is, run + @(#)README 4.4 93/09/26 GIE REL" -python -c "from matplotlib.toolkits.basemap import basemap_datadir; print basemap_datadir" +The files in this directory are support data for PROJ.4 programs +as well as test scripts for testing proj installation. +File Contents: + +README --- This file + +proj_def.dat --- basic default file used by proj. + +epsg --- Translation of EPSG GCS/PCS codes into PROJ.4 via init= mechanism. + +epsg-deprecated --- EPSG definitions that have been deprecated. They are + not part of 'epsg' anymore, but may have been delivered + with earlier versions of 'epsg'. + Thus, they might occur e.g. in WMS (Web Mapping Services) + running with old EPSG definitions. + This file is not complete at all - it contains just + definitions that were individually reported. + +nad27 --- North American Datum 1927 for "init=" definition of + State Plane Coordinate Systems (SPCS). + +nad83 --- North American Datum 1983 for "init=" definition of SPCS. + +GL27 --- Great Lakes Survey grids, NAD27 + +world --- Proj specifications for several international grid systems. + +nad.lst --- Reference list of SPCS States and NGS datum identifiers + +IGNF --- Translation of French Mapping Agency codes into PROJ.4 via init= mechanism. + +nad2bin.c --- C program to convert above ASCII files into binary + files usable by program nad2nad. Compiled and used in + install script only. + +install --- Unix shell (sh) script to install nad2nad file and proj + init files. Read beginning for usage instructions. + +test27 --- Unix shell (sh) scripts to test installation of +test83 proj and nad27/nad83 init files. These scripts + expect release 4 proj to reside in ../src. + +pj_out27 --- Comparison files for above test procedures. +pj_out83 + +The following NADCON conversion files are distributed in separate, +uncompressed distibution file(s). + + Ascii source (in delta format) of grid data to convert geographic + coordinates from NAD27 to NAD83 +alaska.lla.Z --- Alaska +conus.lla.Z --- Conterminous U.S. +hawaii.lla.Z --- Hawaii +prvi.lla.Z --- Puerto Rico, Virgin Is. +stgeorge.lla.Z --- St. George Is, Alaska +stlrnc.lla.Z --- St. Lawrence Is., Alaska +stpaul.lla.Z --- St. Paul Is., Alaska + + Ascii source (in delta format) of grid data for high precision + conversion of geographic coordinates from NAD83 to NAD83 +FL.lla.Z --- Florida +MD.lla.Z --- Maryland +TN.lla.Z --- Tennessee +WI.lla.Z --- Wisconsin +WO.lla.Z --- Washington, Oregon, N. California + + Other grid shift files +ntv1_can.dat --- Canadian NTv1 grid shift file (NAD27-->NAD83) +ntf_r93.gsb --- French NTv2 grid shift file (NTF-->RGF93) Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/epsg =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/epsg 2009年11月04日 16:18:11 UTC (rev 7933) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/data/epsg 2009年11月04日 16:26:06 UTC (rev 7934) @@ -1,7 +1,17 @@ +# HD1909 +<3819> +proj=longlat +ellps=bessel +towgs84=595.48,121.69,515.35,4.115,-2.9383,0.853,-3.408 +no_defs <> +# TWD67 +<3821> +proj=longlat +ellps=aust_SA +no_defs <> +# TWD97 +<3824> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# IGRS +<3889> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# MGI 1901 +<3906> +proj=longlat +ellps=bessel +no_defs <> # Unknown datum based upon the Airy 1830 ellipsoid <4001> +proj=longlat +ellps=airy +no_defs <> # Unknown datum based upon the Airy Modified 1849 ellipsoid -<4002> +proj=longlat +a=6377340.189 +b=6356034.447938534 +no_defs <> +<4002> +proj=longlat +ellps=mod_airy +no_defs <> # Unknown datum based upon the Australian National Spheroid <4003> +proj=longlat +ellps=aust_SA +no_defs <> # Unknown datum based upon the Bessel 1841 ellipsoid @@ -15,7 +25,7 @@ # Unknown datum based upon the Clarke 1866 ellipsoid <4008> +proj=longlat +ellps=clrk66 +no_defs <> # Unknown datum based upon the Clarke 1866 Michigan ellipsoid -<4009> +proj=longlat +a=6378450.047548897 +b=6356826.621488445 +no_defs <> +<4009> +proj=longlat +a=6378450.047548896 +b=6356826.621488444 +no_defs <> # Unknown datum based upon the Clarke 1880 (Benoit) ellipsoid <4010> +proj=longlat +a=6378300.789 +b=6356566.435 +no_defs <> # Unknown datum based upon the Clarke 1880 (IGN) ellipsoid @@ -23,7 +33,7 @@ # Unknown datum based upon the Clarke 1880 (RGS) ellipsoid <4012> +proj=longlat +ellps=clrk80 +no_defs <> # Unknown datum based upon the Clarke 1880 (Arc) ellipsoid -<4013> +proj=longlat +a=6378249.145 +b=6356514.966398754 +no_defs <> +<4013> +proj=longlat +a=6378249.145 +b=6356514.966398753 +no_defs <> # Unknown datum based upon the Clarke 1880 (SGA 1922) ellipsoid <4014> +proj=longlat +a=6378249.2 +b=6356514.996941779 +no_defs <> # Unknown datum based upon the Everest 1830 (1937 Adjustment) ellipsoid @@ -40,6 +50,8 @@ <4021> +proj=longlat +a=6378160 +b=6356774.50408554 +no_defs <> # Unknown datum based upon the International 1924 ellipsoid <4022> +proj=longlat +ellps=intl +no_defs <> +# MOLDREF99 +<4023> +proj=longlat +ellps=GRS80 +no_defs <> # Unknown datum based upon the Krassowsky 1940 ellipsoid <4024> +proj=longlat +ellps=krass +no_defs <> # Unknown datum based upon the NWL 9D ellipsoid @@ -47,7 +59,7 @@ # Unknown datum based upon the Plessis 1817 ellipsoid <4027> +proj=longlat +a=6376523 +b=6355862.933255573 +no_defs <> # Unknown datum based upon the Struve 1860 ellipsoid -<4028> +proj=longlat +a=6378298.300000001 +b=6356657.142669562 +no_defs <> +<4028> +proj=longlat +a=6378298.3 +b=6356657.142669561 +no_defs <> # Unknown datum based upon the War Office ellipsoid <4029> +proj=longlat +a=6378300 +b=6356751.689189189 +no_defs <> # Unknown datum based upon the WGS 84 ellipsoid @@ -57,9 +69,9 @@ # Unknown datum based upon the OSU86F ellipsoid <4032> +proj=longlat +a=6378136.2 +b=6356751.516927429 +no_defs <> # Unknown datum based upon the OSU91A ellipsoid -<4033> +proj=longlat +a=6378136.300000001 +b=6356751.616592147 +no_defs <> +<4033> +proj=longlat +a=6378136.3 +b=6356751.616592146 +no_defs <> # Unknown datum based upon the Clarke 1880 ellipsoid -<4034> +proj=longlat +ellps=clrk80 +no_defs <> +<4034> +proj=longlat +a=6378249.144808011 +b=6356514.966204134 +no_defs <> # Unknown datum based upon the Authalic Sphere <4035> +proj=longlat +a=6371000 +b=6371000 +no_defs <> # Unknown datum based upon the GRS 1967 ellipsoid @@ -67,13 +79,15 @@ # Unknown datum based upon the Average Terrestrial System 1977 ellipsoid <4041> +proj=longlat +a=6378135 +b=6356750.304921594 +no_defs <> # Unknown datum based upon the Everest (1830 Definition) ellipsoid -<4042> +proj=longlat +a=6377299.36559538 +b=6356098.357204818 +no_defs <> +<4042> +proj=longlat +a=6377299.36559538 +b=6356098.359005156 +no_defs <> # Unknown datum based upon the WGS 72 ellipsoid <4043> +proj=longlat +ellps=WGS72 +no_defs <> # Unknown datum based upon the Everest 1830 (1962 Definition) ellipsoid <4044> +proj=longlat +a=6377301.243 +b=6356100.230165384 +no_defs <> # Unknown datum based upon the Everest 1830 (1975 Definition) ellipsoid -<4045> +proj=longlat +a=6377299.151000001 +b=6356098.145120133 +no_defs <> +<4045> +proj=longlat +a=6377299.151 +b=6356098.145120132 +no_defs <> +# RGRDC 2005 +<4046> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Unspecified datum based upon the GRS 1980 Authalic Sphere <4047> +proj=longlat +a=6371007 +b=6371007 +no_defs <> # Unspecified datum based upon the Clarke 1866 Authalic Sphere @@ -82,14 +96,20 @@ <4053> +proj=longlat +a=6371228 +b=6371228 +no_defs <> # Unspecified datum based upon the Hughes 1980 ellipsoid <4054> +proj=longlat +a=6378273 +b=6356889.449 +no_defs <> +# Popular Visualisation CRS +<4055> +proj=longlat +a=6378137 +b=6378137 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# SREF98 +<4075> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# REGCAN95 +<4081> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Greek <4120> +proj=longlat +ellps=bessel +no_defs <> # GGRS87 -<4121> +proj=longlat +ellps=GRS80 +towgs84=-199.87,74.79,246.62,0,0,0,0 +no_defs <> +<4121> +proj=longlat +ellps=GRS80 +datum=GGRS87 +no_defs <> # ATS77 <4122> +proj=longlat +a=6378135 +b=6356750.304921594 +no_defs <> # KKJ -<4123> +proj=longlat +ellps=intl +towgs84=-96.0617,-82.4278,-121.743,4.80107,0.34543,-1.37646,1.4964 +no_defs <> +<4123> +proj=longlat +ellps=intl +no_defs <> # RT90 <4124> +proj=longlat +ellps=bessel +no_defs <> # Samboja @@ -110,7 +130,7 @@ <4132> +proj=longlat +ellps=clrk80 +no_defs <> # EST92 <4133> +proj=longlat +ellps=GRS80 +towgs84=0.055,-0.541,-0.185,0.0183,-0.0003,-0.007,-0.014 +no_defs <> -# PDO Survey Datum 1993 +# PSD93 <4134> +proj=longlat +ellps=clrk80 +no_defs <> # Old Hawaiian <4135> +proj=longlat +ellps=clrk66 +no_defs <> @@ -135,7 +155,7 @@ # Kalianpur 1962 <4145> +proj=longlat +a=6377301.243 +b=6356100.230165384 +no_defs <> # Kalianpur 1975 -<4146> +proj=longlat +a=6377299.151000001 +b=6356098.145120133 +towgs84=295,736,257,0,0,0,0 +no_defs <> +<4146> +proj=longlat +a=6377299.151 +b=6356098.145120132 +towgs84=295,736,257,0,0,0,0 +no_defs <> # Hanoi 1972 <4147> +proj=longlat +ellps=krass +towgs84=-17.51,-108.32,-62.39,0,0,0,0 +no_defs <> # Hartebeesthoek94 @@ -179,10 +199,10 @@ # NZGD2000 <4167> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Accra -<4168> +proj=longlat +a=6378300 +b=6356751.689189189 +towgs84=-199,32,322,0,0,0,0 +no_defs <> +<4168> +proj=longlat +a=6378300 +b=6356751.689189189 +no_defs <> # American Samoa 1962 <4169> +proj=longlat +ellps=clrk66 +towgs84=-115,118,426,0,0,0,0 +no_defs <> -# SIRGAS +# SIRGAS 1995 <4170> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # RGF93 <4171> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> @@ -197,9 +217,9 @@ # Australian Antarctic <4176> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Pulkovo 1942(83) -<4178> +proj=longlat +ellps=krass +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +no_defs <> +<4178> +proj=longlat +ellps=krass +no_defs <> # Pulkovo 1942(58) -<4179> +proj=longlat +ellps=krass +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +no_defs <> +<4179> +proj=longlat +ellps=krass +no_defs <> # EST97 <4180> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Luxembourg 1930 @@ -237,7 +257,7 @@ # Egypt 1930 <4199> +proj=longlat +ellps=intl +no_defs <> # Pulkovo 1995 -<4200> +proj=longlat +ellps=krass +no_defs <> +<4200> +proj=longlat +ellps=krass +towgs84=24.82,-131.21,-82.66,-0,-0,0.16,-0.12 +no_defs <> # Adindan <4201> +proj=longlat +ellps=clrk80 +no_defs <> # AGD66 @@ -255,7 +275,7 @@ # Aratu <4208> +proj=longlat +ellps=intl +no_defs <> # Arc 1950 -<4209> +proj=longlat +a=6378249.145 +b=6356514.966398754 +no_defs <> +<4209> +proj=longlat +a=6378249.145 +b=6356514.966398753 +no_defs <> # Arc 1960 <4210> +proj=longlat +ellps=clrk80 +no_defs <> # Batavia @@ -269,7 +289,7 @@ # Belge 1950 <4215> +proj=longlat +ellps=intl +no_defs <> # Bermuda 1957 -<4216> +proj=longlat +ellps=clrk66 +towgs84=-73,213,296,0,0,0,0 +no_defs <> +<4216> +proj=longlat +ellps=clrk66 +no_defs <> # Bogota 1975 <4218> +proj=longlat +ellps=intl +towgs84=307,304,-318,0,0,0,0 +no_defs <> # Bukit Rimpah @@ -279,11 +299,11 @@ # Campo Inchauspe <4221> +proj=longlat +ellps=intl +no_defs <> # Cape -<4222> +proj=longlat +a=6378249.145 +b=6356514.966398754 +no_defs <> +<4222> +proj=longlat +a=6378249.145 +b=6356514.966398753 +no_defs <> # Carthage -<4223> +proj=longlat +a=6378249.2 +b=6356515 +no_defs <> +<4223> +proj=longlat +a=6378249.2 +b=6356515 +datum=carthage +no_defs <> # Chua -<4224> +proj=longlat +ellps=intl +towgs84=-134,229,-29,0,0,0,0 +no_defs <> +<4224> +proj=longlat +ellps=intl +no_defs <> # Corrego Alegre <4225> +proj=longlat +ellps=intl +towgs84=-206,172,-6,0,0,0,0 +no_defs <> # Cote d'Ivoire @@ -306,7 +326,7 @@ <4234> +proj=longlat +a=6378249.2 +b=6356515 +no_defs <> # Guyane Francaise <4235> +proj=longlat +ellps=intl +no_defs <> -# Hu Tzu Shan +# Hu Tzu Shan 1950 <4236> +proj=longlat +ellps=intl +towgs84=-637,-549,-203,0,0,0,0 +no_defs <> # HD72 <4237> +proj=longlat +ellps=GRS67 +no_defs <> @@ -317,11 +337,11 @@ # Indian 1975 <4240> +proj=longlat +a=6377276.345 +b=6356075.41314024 +no_defs <> # Jamaica 1875 -<4241> +proj=longlat +ellps=clrk80 +no_defs <> +<4241> +proj=longlat +a=6378249.144808011 +b=6356514.966204134 +no_defs <> # JAD69 <4242> +proj=longlat +ellps=clrk66 +no_defs <> # Kalianpur 1880 -<4243> +proj=longlat +a=6377299.36559538 +b=6356098.357204818 +no_defs <> +<4243> +proj=longlat +a=6377299.36559538 +b=6356098.359005156 +no_defs <> # Kandawala <4244> +proj=longlat +a=6377276.345 +b=6356075.41314024 +towgs84=-97,787,86,0,0,0,0 +no_defs <> # Kertau 1968 @@ -371,7 +391,7 @@ # NAD27 <4267> +proj=longlat +ellps=clrk66 +datum=NAD27 +no_defs <> # NAD27 Michigan -<4268> +proj=longlat +a=6378450.047548897 +b=6356826.621488445 +no_defs <> +<4268> +proj=longlat +a=6378450.047548896 +b=6356826.621488444 +no_defs <> # NAD83 <4269> +proj=longlat +ellps=GRS80 +datum=NAD83 +no_defs <> # Nahrwan 1967 @@ -389,7 +409,7 @@ # NSWC 9Z-2 <4276> +proj=longlat +ellps=WGS66 +no_defs <> # OSGB 1936 -<4277> +proj=longlat +datum=OSGB36 +no_defs <> +<4277> +proj=longlat +ellps=airy +datum=OSGB36 +no_defs <> # OSGB70 <4278> +proj=longlat +ellps=airy +no_defs <> # OS(SN)80 @@ -431,9 +451,9 @@ # Timbalai 1948 <4298> +proj=longlat +ellps=evrstSS +no_defs <> # TM65 -<4299> +proj=longlat +a=6377340.189 +b=6356034.447938534 +no_defs <> +<4299> +proj=longlat +ellps=mod_airy +datum=ire65 +no_defs <> # TM75 -<4300> +proj=longlat +a=6377340.189 +b=6356034.447938534 +no_defs <> +<4300> +proj=longlat +ellps=mod_airy +no_defs <> # Tokyo <4301> +proj=longlat +ellps=bessel +no_defs <> # Trinidad 1903 @@ -455,14 +475,14 @@ # Zanderij <4311> +proj=longlat +ellps=intl +towgs84=-265,120,-358,0,0,0,0 +no_defs <> # MGI -<4312> +proj=longlat +ellps=bessel +towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232 +no_defs <> +<4312> +proj=longlat +ellps=bessel +datum=hermannskogel +no_defs <> # Belge 1972 <4313> +proj=longlat +ellps=intl +towgs84=106.869,-52.2978,103.724,-0.33657,0.456955,-1.84218,1 +no_defs <> # DHDN <4314> +proj=longlat +ellps=bessel +datum=potsdam +no_defs <> # Conakry 1905 <4315> +proj=longlat +a=6378249.2 +b=6356515 +towgs84=-23,259,-9,0,0,0,0 +no_defs <> -# Dealul Piscului 1933 +# Dealul Piscului 1930 <4316> +proj=longlat +ellps=intl +no_defs <> # Dealul Piscului 1970 <4317> +proj=longlat +ellps=krass +no_defs <> @@ -571,7 +591,7 @@ # Grand Comoros <4646> +proj=longlat +ellps=intl +no_defs <> # Reykjavik 1900 -<4657> +proj=longlat +a=6377019.27 +b=6355762.539100001 +towgs84=-28,199,5,0,0,0,0 +no_defs <> +<4657> +proj=longlat +a=6377019.27 +b=6355762.5391 +towgs84=-28,199,5,0,0,0,0 +no_defs <> # Hjorsey 1955 <4658> +proj=longlat +ellps=intl +towgs84=-73,46,-86,0,0,0,0 +no_defs <> # ISN93 @@ -600,9 +620,9 @@ <4670> +proj=longlat +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Voirol 1879 <4671> +proj=longlat +a=6378249.2 +b=6356515 +no_defs <> -# CI1971 +# Chatham Islands 1971 <4672> +proj=longlat +ellps=intl +towgs84=175,-38,113,0,0,0,0 +no_defs <> -# CI1979 +# Chatham Islands 1979 <4673> +proj=longlat +ellps=intl +towgs84=174.05,-25.49,112.57,-0,-0,0.554,0.2263 +no_defs <> # SIRGAS 2000 <4674> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> @@ -645,9 +665,9 @@ # Nakhl-e Ghanem <4693> +proj=longlat +ellps=WGS84 +towgs84=0,-0.15,0.68,0,0,0,0 +no_defs <> # POSGAR 94 -<4694> +proj=longlat +ellps=GRS80 +no_defs <> +<4694> +proj=longlat +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Katanga 1955 -<4695> +proj=longlat +ellps=clrk66 +no_defs <> +<4695> +proj=longlat +ellps=clrk66 +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +no_defs <> # Kasai 1953 <4696> +proj=longlat +ellps=clrk80 +no_defs <> # IGC 1962 6th Parallel South @@ -712,7 +732,7 @@ <4726> +proj=longlat +ellps=clrk66 +no_defs <> # Midway 1961 <4727> +proj=longlat +ellps=intl +no_defs <> -# Pico de la Nieves +# Pico de las Nieves 1984 <4728> +proj=longlat +ellps=intl +towgs84=-307,-92,127,0,0,0,0 +no_defs <> # Pitcairn 1967 <4729> +proj=longlat +ellps=intl +towgs84=185,165,42,0,0,0,0 +no_defs <> @@ -737,12 +757,12 @@ # Hong Kong 1963(67) <4739> +proj=longlat +ellps=intl +towgs84=-156,-271,-189,0,0,0,0 +no_defs <> # PZ-90 -<4740> +proj=longlat +a=6378136 +b=6356751.361745712 +towgs84=0,0,1.5,-0,-0,0.076,0 +no_defs <> +<4740> +proj=longlat +a=6378136 +b=6356751.361745712 +no_defs <> # FD54 <4741> +proj=longlat +ellps=intl +no_defs <> # GDM2000 <4742> +proj=longlat +ellps=GRS80 +no_defs <> -# Karbala 1979 (Polservice) +# Karbala 1979 <4743> +proj=longlat +ellps=clrk80 +towgs84=84.1,-320.1,218.7,0,0,0,0 +no_defs <> # Nahrwan 1934 <4744> +proj=longlat +ellps=clrk80 +no_defs <> @@ -778,6 +798,16 @@ <4759> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # WGS 66 <4760> +proj=longlat +ellps=WGS66 +no_defs <> +# HTRS96 +<4761> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# BDA2000 +<4762> +proj=longlat +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# Pitcairn 2006 +<4763> +proj=longlat +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# RSRGD2000 +<4764> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> +# Slovenia 1996 +<4765> +proj=longlat +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +no_defs <> # Bern 1898 (Bern) <4801> +proj=longlat +ellps=bessel +pm=bern +no_defs <> # Bogota 1975 (Bogota) @@ -818,12 +848,12 @@ <4820> +proj=longlat +ellps=bessel +pm=jakarta +no_defs <> # Voirol 1879 (Paris) <4821> +proj=longlat +a=6378249.2 +b=6356515 +pm=paris +no_defs <> -# ATF (Paris) -<4901> +proj=longlat +a=6376523 +b=6355862.933255573 +pm=paris +no_defs <> +# unnamed ellipse +<4901> +proj=longlat +a=6376523 +b=6355862.933255573 +pm=2.3372291666985 +no_defs <> # NDG (Paris) <4902> +proj=longlat +a=6376523 +b=6355862.933255573 +pm=paris +no_defs <> # Madrid 1870 (Madrid) -<4903> +proj=longlat +a=6378298.300000001 +b=6356657.142669562 +pm=madrid +no_defs <> +<4903> +proj=longlat +a=6378298.3 +b=6356657.142669561 +pm=madrid +no_defs <> # Lisbon 1890 (Lisbon) <4904> +proj=longlat +ellps=bessel +pm=lisbon +no_defs <> # Anguilla 1957 / British West Indies Grid @@ -899,7 +929,7 @@ # NAD27(CGQ77) / UTM zone 21N <2035> +proj=utm +zone=21 +ellps=clrk66 +units=m +no_defs <> # NAD83(CSRS98) / New Brunswick Stereo (deprecated) -<2036> +proj=sterea +lat_0=46.5 +lon_0=-66.5 +k=0.9999119999999999 +x_0=2500000 +y_0=7500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> +<2036> +proj=sterea +lat_0=46.5 +lon_0=-66.5 +k=0.999912 +x_0=2500000 +y_0=7500000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # NAD83(CSRS98) / UTM zone 19N (deprecated) <2037> +proj=utm +zone=19 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # NAD83(CSRS98) / UTM zone 20N (deprecated) @@ -949,9 +979,9 @@ # Unable to translate coordinate system EPSG:2055 into PROJ.4 format. # # CH1903+ / LV95 -<2056> +proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +x_0=2600000 +y_0=1200000 +ellps=bessel +towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +no_defs <> +<2056> +proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=2600000 +y_0=1200000 +ellps=bessel +towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +no_defs <> # Rassadiran / Nakhl e Taqi -<2057> +proj=omerc +lat_0=27.51882880555555 +lonc=52.60353916666667 +alpha=0.5716611944444444 +k=0.9998959340000001 +x_0=658377.437 +y_0=3044969.194 +ellps=intl +towgs84=-133.63,-157.5,-158.62,0,0,0,0 +units=m +no_defs <> +<2057> +proj=omerc +lat_0=27.51882880555555 +lonc=52.60353916666667 +alpha=0.5716611944444444 +k=0.999895934 +x_0=658377.437 +y_0=3044969.194 +ellps=intl +towgs84=-133.63,-157.5,-158.62,0,0,0,0 +units=m +no_defs <> # ED50(ED77) / UTM zone 38N <2058> +proj=utm +zone=38 +ellps=intl +units=m +no_defs <> # ED50(ED77) / UTM zone 39N @@ -961,7 +991,7 @@ # ED50(ED77) / UTM zone 41N <2061> +proj=utm +zone=41 +ellps=intl +units=m +no_defs <> # Madrid 1870 (Madrid) / Spain -<2062> +proj=lcc +lat_1=40 +lat_0=40 +lon_0=0 +k_0=0.9988085293000001 +x_0=600000 +y_0=600000 +a=6378298.300000001 +b=6356657.142669562 +pm=madrid +units=m +no_defs <> +<2062> +proj=lcc +lat_1=40 +lat_0=40 +lon_0=0 +k_0=0.9988085293 +x_0=600000 +y_0=600000 +a=6378298.3 +b=6356657.142669561 +pm=madrid +units=m +no_defs <> # Dabola 1981 / UTM zone 28N (deprecated) <2063> +proj=utm +zone=28 +a=6378249.2 +b=6356515 +towgs84=-23,259,-9,0,0,0,0 +units=m +no_defs <> # Dabola 1981 / UTM zone 29N (deprecated) @@ -1006,14 +1036,14 @@ <2083> +proj=tmerc +lat_0=-90 +lon_0=-69 +k=1 +x_0=2500000 +y_0=0 +ellps=intl +units=m +no_defs <> # Hito XVIII 1963 / UTM zone 19S <2084> +proj=utm +zone=19 +south +ellps=intl +units=m +no_defs <> -# NAD27 / Cuba Norte +# NAD27 / Cuba Norte (deprecated) <2085> +proj=lcc +lat_1=22.35 +lat_0=22.35 +lon_0=-81 +k_0=0.99993602 +x_0=500000 +y_0=280296.016 +ellps=clrk66 +datum=NAD27 +units=m +no_defs <> -# NAD27 / Cuba Sur +# NAD27 / Cuba Sur (deprecated) <2086> +proj=lcc +lat_1=20.71666666666667 +lat_0=20.71666666666667 +lon_0=-76.83333333333333 +k_0=0.99994848 +x_0=500000 +y_0=229126.939 +ellps=clrk66 +datum=NAD27 +units=m +no_defs <> # ELD79 / TM 12 NE <2087> +proj=tmerc +lat_0=0 +lon_0=12 +k=0.9996 +x_0=500000 +y_0=0 +ellps=intl +units=m +no_defs <> # Carthage / TM 11 NE -<2088> +proj=tmerc +lat_0=0 +lon_0=11 +k=0.9996 +x_0=500000 +y_0=0 +a=6378249.2 +b=6356515 +units=m +no_defs <> +<2088> +proj=tmerc +lat_0=0 +lon_0=11 +k=0.9996 +x_0=500000 +y_0=0 +a=6378249.2 +b=6356515 +datum=carthage +units=m +no_defs <> # Yemen NGN96 / UTM zone 38N <2089> +proj=utm +zone=38 +ellps=WGS84 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # Yemen NGN96 / UTM zone 39N @@ -1037,7 +1067,7 @@ # Qatar 1948 / Qatar Grid <2099> +proj=cass +lat_0=25.38236111111111 +lon_0=50.76138888888889 +x_0=100000 +y_0=100000 +ellps=helmert +units=m +no_defs <> # GGRS87 / Greek Grid -<2100> +proj=tmerc +lat_0=0 +lon_0=24 +k=0.9996 +x_0=500000 +y_0=0 +ellps=GRS80 +towgs84=-199.87,74.79,246.62,0,0,0,0 +units=m +no_defs <> +<2100> +proj=tmerc +lat_0=0 +lon_0=24 +k=0.9996 +x_0=500000 +y_0=0 +ellps=GRS80 +datum=GGRS87 +units=m +no_defs <> # Lake / Maracaibo Grid M1 <2101> +proj=lcc +lat_1=10.16666666666667 +lat_0=10.16666666666667 +lon_0=-71.60561777777777 +k_0=1 +x_0=0 +y_0=-52684.972 +ellps=intl +units=m +no_defs <> # Lake / Maracaibo Grid @@ -1046,61 +1076,61 @@ <2103> +proj=lcc +lat_1=10.16666666666667 +lat_0=10.16666666666667 +lon_0=-71.60561777777777 +k_0=1 +x_0=500000 +y_0=447315.028 +ellps=intl +units=m +no_defs <> # Lake / Maracaibo La Rosa Grid <2104> +proj=lcc +lat_1=10.16666666666667 +lat_0=10.16666666666667 +lon_0=-71.60561777777777 +k_0=1 +x_0=-17044 +y_0=-23139.97 +ellps=intl +units=m +no_defs <> -# NZGD2000 / Mount Eden Circuit 2000 +# NZGD2000 / Mount Eden 2000 <2105> +proj=tmerc +lat_0=-36.87972222222222 +lon_0=174.7641666666667 +k=0.9999 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Bay of Plenty Circuit 2000 +# NZGD2000 / Bay of Plenty 2000 <2106> +proj=tmerc +lat_0=-37.76111111111111 +lon_0=176.4661111111111 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Poverty Bay Circuit 2000 +# NZGD2000 / Poverty Bay 2000 <2107> +proj=tmerc +lat_0=-38.62444444444444 +lon_0=177.8855555555556 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Hawkes Bay Circuit 2000 +# NZGD2000 / Hawkes Bay 2000 <2108> +proj=tmerc +lat_0=-39.65083333333333 +lon_0=176.6736111111111 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Taranaki Circuit 2000 +# NZGD2000 / Taranaki 2000 <2109> +proj=tmerc +lat_0=-39.13555555555556 +lon_0=174.2277777777778 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Tuhirangi Circuit 2000 +# NZGD2000 / Tuhirangi 2000 <2110> +proj=tmerc +lat_0=-39.51222222222222 +lon_0=175.64 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Wanganui Circuit 2000 +# NZGD2000 / Wanganui 2000 <2111> +proj=tmerc +lat_0=-40.24194444444444 +lon_0=175.4880555555555 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Wairarapa Circuit 2000 +# NZGD2000 / Wairarapa 2000 <2112> +proj=tmerc +lat_0=-40.92527777777777 +lon_0=175.6472222222222 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Wellington Circuit 2000 +# NZGD2000 / Wellington 2000 <2113> +proj=tmerc +lat_0=-41.3011111111111 +lon_0=174.7763888888889 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Collingwood Circuit 2000 +# NZGD2000 / Collingwood 2000 <2114> +proj=tmerc +lat_0=-40.71472222222223 +lon_0=172.6719444444444 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Nelson Circuit 2000 +# NZGD2000 / Nelson 2000 <2115> +proj=tmerc +lat_0=-41.27444444444444 +lon_0=173.2991666666667 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Karamea Circuit 2000 +# NZGD2000 / Karamea 2000 <2116> +proj=tmerc +lat_0=-41.28972222222222 +lon_0=172.1088888888889 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Buller Circuit 2000 +# NZGD2000 / Buller 2000 <2117> +proj=tmerc +lat_0=-41.81055555555555 +lon_0=171.5811111111111 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Grey Circuit 2000 +# NZGD2000 / Grey 2000 <2118> +proj=tmerc +lat_0=-42.33361111111111 +lon_0=171.5497222222222 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Amuri Circuit 2000 +# NZGD2000 / Amuri 2000 <2119> +proj=tmerc +lat_0=-42.68888888888888 +lon_0=173.01 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Marlborough Circuit 2000 +# NZGD2000 / Marlborough 2000 <2120> +proj=tmerc +lat_0=-41.54444444444444 +lon_0=173.8019444444444 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Hokitika Circuit 2000 +# NZGD2000 / Hokitika 2000 <2121> +proj=tmerc +lat_0=-42.88611111111111 +lon_0=170.9797222222222 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Okarito Circuit 2000 +# NZGD2000 / Okarito 2000 <2122> +proj=tmerc +lat_0=-43.11 +lon_0=170.2608333333333 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Jacksons Bay Circuit 2000 +# NZGD2000 / Jacksons Bay 2000 <2123> +proj=tmerc +lat_0=-43.97777777777778 +lon_0=168.6061111111111 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Mount Pleasant Circuit 2000 +# NZGD2000 / Mount Pleasant 2000 <2124> +proj=tmerc +lat_0=-43.59055555555556 +lon_0=172.7269444444445 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Gawler Circuit 2000 +# NZGD2000 / Gawler 2000 <2125> +proj=tmerc +lat_0=-43.74861111111111 +lon_0=171.3605555555555 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Timaru Circuit 2000 +# NZGD2000 / Timaru 2000 <2126> +proj=tmerc +lat_0=-44.40194444444445 +lon_0=171.0572222222222 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Lindis Peak Circuit 2000 +# NZGD2000 / Lindis Peak 2000 <2127> +proj=tmerc +lat_0=-44.735 +lon_0=169.4675 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Mount Nicholas Circuit 2000 +# NZGD2000 / Mount Nicholas 2000 <2128> +proj=tmerc +lat_0=-45.13277777777778 +lon_0=168.3986111111111 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Mount York Circuit 2000 +# NZGD2000 / Mount York 2000 <2129> +proj=tmerc +lat_0=-45.56361111111111 +lon_0=167.7386111111111 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Observation Point Circuit 2000 +# NZGD2000 / Observation Point 2000 <2130> +proj=tmerc +lat_0=-45.81611111111111 +lon_0=170.6283333333333 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / North Taieri Circuit 2000 -<2131> +proj=tmerc +lat_0=-45.86138888888889 +lon_0=170.2825 +k=0.9999600000000001 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> -# NZGD2000 / Bluff Circuit 2000 +# NZGD2000 / North Taieri 2000 +<2131> +proj=tmerc +lat_0=-45.86138888888889 +lon_0=170.2825 +k=0.99996 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> +# NZGD2000 / Bluff 2000 <2132> +proj=tmerc +lat_0=-46.6 +lon_0=168.3427777777778 +k=1 +x_0=400000 +y_0=800000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # NZGD2000 / UTM zone 58S <2133> +proj=utm +zone=58 +south +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> @@ -1109,9 +1139,9 @@ # NZGD2000 / UTM zone 60S <2135> +proj=utm +zone=60 +south +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # Accra / Ghana National Grid -<2136> +proj=tmerc +lat_0=4.666666666666667 +lon_0=-1 +k=0.99975 +x_0=274319.7391633579 +y_0=0 +a=6378300 +b=6356751.689189189 +towgs84=-199,32,322,0,0,0,0 +to_meter=0.3047997101815088 +no_defs <> +<2136> +proj=tmerc +lat_0=4.666666666666667 +lon_0=-1 +k=0.99975 +x_0=274319.7391633579 +y_0=0 +a=6378300 +b=6356751.689189189 +to_meter=0.3047997101815088 +no_defs <> # Accra / TM 1 NW -<2137> +proj=tmerc +lat_0=0 +lon_0=-1 +k=0.9996 +x_0=500000 +y_0=0 +a=6378300 +b=6356751.689189189 +towgs84=-199,32,322,0,0,0,0 +units=m +no_defs <> +<2137> +proj=tmerc +lat_0=0 +lon_0=-1 +k=0.9996 +x_0=500000 +y_0=0 +a=6378300 +b=6356751.689189189 +units=m +no_defs <> # NAD27(CGQ77) / Quebec Lambert <2138> +proj=lcc +lat_1=60 +lat_2=46 +lat_0=44 +lon_0=-68.5 +x_0=0 +y_0=0 +ellps=clrk66 +units=m +no_defs <> # NAD83(CSRS98) / SCoPQ zone 2 (deprecated) @@ -1147,7 +1177,7 @@ # RGF93 / Lambert-93 <2154> +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # American Samoa 1962 / American Samoa Lambert (deprecated) -<2155> +proj=lcc +lat_1=-14.26666666666667 +lat_0=-14.26666666666667 +lon_0=170 +k_0=1 +x_0=152400.3048006096 +y_0=0 +ellps=clrk66 +towgs84=-115,118,426,0,0,0,0 +to_meter=0.3048006096012192 +no_defs <> +<2155> +proj=lcc +lat_1=-14.26666666666667 +lat_0=-14.26666666666667 +lon_0=170 +k_0=1 +x_0=152400.3048006096 +y_0=0 +ellps=clrk66 +towgs84=-115,118,426,0,0,0,0 +units=us-ft +no_defs <> # NAD83(HARN) / UTM zone 59S (deprecated) <2156> +proj=utm +zone=59 +south +ellps=GRS80 +units=m +no_defs <> # IRENET95 / Irish Transverse Mercator @@ -1155,39 +1185,39 @@ # IRENET95 / UTM zone 29N <2158> +proj=utm +zone=29 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # Sierra Leone 1924 / New Colony Grid -<2159> +proj=tmerc +lat_0=6.666666666666668 +lon_0=-12 +k=1 +x_0=152399.8550907544 +y_0=0 +a=6378300 +b=6356751.689189189 +to_meter=0.3047997101815088 +no_defs <> +<2159> +proj=tmerc +lat_0=6.666666666666667 +lon_0=-12 +k=1 +x_0=152399.8550907544 +y_0=0 +a=6378300 +b=6356751.689189189 +to_meter=0.3047997101815088 +no_defs <> # Sierra Leone 1924 / New War Office Grid -<2160> +proj=tmerc +lat_0=6.666666666666668 +lon_0=-12 +k=1 +x_0=243839.7681452071 +y_0=182879.8261089053 +a=6378300 +b=6356751.689189189 +to_meter=0.3047997101815088 +no_defs <> +<2160> +proj=tmerc +lat_0=6.666666666666667 +lon_0=-12 +k=1 +x_0=243839.7681452071 +y_0=182879.8261089053 +a=6378300 +b=6356751.689189189 +to_meter=0.3047997101815088 +no_defs <> # Sierra Leone 1968 / UTM zone 28N <2161> +proj=utm +zone=28 +ellps=clrk80 +towgs84=-88,4,101,0,0,0,0 +units=m +no_defs <> # Sierra Leone 1968 / UTM zone 29N <2162> +proj=utm +zone=29 +ellps=clrk80 +towgs84=-88,4,101,0,0,0,0 +units=m +no_defs <> -# US National Atlas Equal Area +# unnamed <2163> +proj=laea +lat_0=45 +lon_0=-100 +x_0=0 +y_0=0 +a=6370997 +b=6370997 +units=m +no_defs <> # Locodjo 1965 / TM 5 NW <2164> +proj=tmerc +lat_0=0 +lon_0=-5 +k=0.9996 +x_0=500000 +y_0=0 +ellps=clrk80 +towgs84=-125,53,467,0,0,0,0 +units=m +no_defs <> # Abidjan 1987 / TM 5 NW <2165> +proj=tmerc +lat_0=0 +lon_0=-5 +k=0.9996 +x_0=500000 +y_0=0 +ellps=clrk80 +towgs84=-124.76,53,466.79,0,0,0,0 +units=m +no_defs <> # Pulkovo 1942(83) / Gauss Kruger zone 3 (deprecated) -<2166> +proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=krass +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +no_defs <> +<2166> +proj=tmerc +lat_0=0 +lon_0=9 +k=1 +x_0=3500000 +y_0=0 +ellps=krass +units=m +no_defs <> # Pulkovo 1942(83) / Gauss Kruger zone 4 (deprecated) -<2167> +proj=tmerc +lat_0=0 +lon_0=12 +k=1 +x_0=4500000 +y_0=0 +ellps=krass +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +no_defs <> +<2167> +proj=tmerc +lat_0=0 +lon_0=12 +k=1 +x_0=4500000 +y_0=0 +ellps=krass +units=m +no_defs <> # Pulkovo 1942(83) / Gauss Kruger zone 5 (deprecated) -<2168> +proj=tmerc +lat_0=0 +lon_0=15 +k=1 +x_0=5500000 +y_0=0 +ellps=krass +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +no_defs <> +<2168> +proj=tmerc +lat_0=0 +lon_0=15 +k=1 +x_0=5500000 +y_0=0 +ellps=krass +units=m +no_defs <> # Luxembourg 1930 / Gauss -<2169> +proj=tmerc +lat_0=49.83333333333334 +lon_0=6.166666666666668 +k=1 +x_0=80000 +y_0=100000 +ellps=intl +towgs84=-193,13.7,-39.3,-0.41,-2.933,2.688,0.43 +units=m +no_defs <> -# MGI / Slovenia Grid -<2170> +proj=tmerc +lat_0=0 +lon_0=15 +k=0.9999 +x_0=500000 +y_0=0 +ellps=bessel +towgs84=577.326,90.129,463.919,5.137,1.474,5.297,2.4232 +units=m +no_defs <> +<2169> +proj=tmerc +lat_0=49.83333333333334 +lon_0=6.166666666666667 +k=1 +x_0=80000 +y_0=100000 +ellps=intl +towgs84=-193,13.7,-39.3,-0.41,-2.933,2.688,0.43 +units=m +no_defs <> +# MGI / Slovenia Grid (deprecated) +<2170> +proj=tmerc +lat_0=0 +lon_0=15 +k=0.9999 +x_0=500000 +y_0=0 +ellps=bessel +datum=hermannskogel +units=m +no_defs <> # Pulkovo 1942(58) / Poland zone I (deprecated) -<2171> +proj=sterea +lat_0=50.625 +lon_0=21.08333333333333 +k=0.9998 +x_0=4637000 +y_0=5647000 +ellps=krass +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +no_defs <> +<2171> +proj=sterea +lat_0=50.625 +lon_0=21.08333333333333 +k=0.9998 +x_0=4637000 +y_0=5647000 +ellps=krass +units=m +no_defs <> # Pulkovo 1942(58) / Poland zone II -<2172> +proj=sterea +lat_0=53.00194444444445 +lon_0=21.50277777777778 +k=0.9998 +x_0=4603000 +y_0=5806000 +ellps=krass +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +no_defs <> +<2172> +proj=sterea +lat_0=53.00194444444445 +lon_0=21.50277777777778 +k=0.9998 +x_0=4603000 +y_0=5806000 +ellps=krass +units=m +no_defs <> # Pulkovo 1942(58) / Poland zone III -<2173> +proj=sterea +lat_0=53.58333333333334 +lon_0=17.00833333333333 +k=0.9998 +x_0=3501000 +y_0=5999000 +ellps=krass +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +no_defs <> +<2173> +proj=sterea +lat_0=53.58333333333334 +lon_0=17.00833333333333 +k=0.9998 +x_0=3501000 +y_0=5999000 +ellps=krass +units=m +no_defs <> # Pulkovo 1942(58) / Poland zone IV -<2174> +proj=sterea +lat_0=51.67083333333333 +lon_0=16.67222222222222 +k=0.9998 +x_0=3703000 +y_0=5627000 +ellps=krass +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +no_defs <> +<2174> +proj=sterea +lat_0=51.67083333333333 +lon_0=16.67222222222222 +k=0.9998 +x_0=3703000 +y_0=5627000 +ellps=krass +units=m +no_defs <> # Pulkovo 1942(58) / Poland zone V -<2175> +proj=tmerc +lat_0=0 +lon_0=18.95833333333333 +k=0.999983 +x_0=237000 +y_0=-4700000 +ellps=krass +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +no_defs <> +<2175> +proj=tmerc +lat_0=0 +lon_0=18.95833333333333 +k=0.999983 +x_0=237000 +y_0=-4700000 +ellps=krass +units=m +no_defs <> # ETRS89 / Poland CS2000 zone 5 <2176> +proj=tmerc +lat_0=0 +lon_0=15 +k=0.999923 +x_0=5500000 +y_0=0 +ellps=GRS80 +units=m +no_defs <> # ETRS89 / Poland CS2000 zone 6 @@ -1197,7 +1227,7 @@ # ETRS89 / Poland CS2000 zone 8 <2179> +proj=tmerc +lat_0=0 +lon_0=24 +k=0.999923 +x_0=8500000 +y_0=0 +ellps=GRS80 +units=m +no_defs <> # ETRS89 / Poland CS92 -<2180> +proj=tmerc +lat_0=0 +lon_0=19 +k=0.9993000000000001 +x_0=500000 +y_0=-5300000 +ellps=GRS80 +units=m +no_defs <> +<2180> +proj=tmerc +lat_0=0 +lon_0=19 +k=0.9993 +x_0=500000 +y_0=-5300000 +ellps=GRS80 +units=m +no_defs <> # Azores Occidental 1939 / UTM zone 25N <2188> +proj=utm +zone=25 +ellps=intl +units=m +no_defs <> # Azores Central 1948 / UTM zone 26N @@ -1208,22 +1238,22 @@ <2191> +proj=utm +zone=28 +ellps=intl +units=m +no_defs <> # ED50 / France EuroLambert <2192> +proj=lcc +lat_1=46.8 +lat_0=46.8 +lon_0=2.337229166666667 +k_0=0.99987742 +x_0=600000 +y_0=2200000 +ellps=intl +units=m +no_defs <> -# NZGD2000 / New Zealand Transverse Mercator +# NZGD2000 / New Zealand Transverse Mercator 2000 <2193> +proj=tmerc +lat_0=0 +lon_0=173 +k=0.9996 +x_0=1600000 +y_0=10000000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # American Samoa 1962 / American Samoa Lambert (deprecated) -<2194> +proj=lcc +lat_1=-14.26666666666667 +lat_0=-14.26666666666667 +lon_0=-170 +k_0=1 +x_0=152400.3048006096 +y_0=0 +ellps=clrk66 +towgs84=-115,118,426,0,0,0,0 +to_meter=0.3048006096012192 +no_defs <> +<2194> +proj=lcc +lat_1=-14.26666666666667 +lat_0=-14.26666666666667 +lon_0=-170 +k_0=1 +x_0=152400.3048006096 +y_0=0 +ellps=clrk66 +towgs84=-115,118,426,0,0,0,0 +units=us-ft +no_defs <> # NAD83(HARN) / UTM zone 2S <2195> +proj=utm +zone=2 +south +ellps=GRS80 +units=m +no_defs <> # ETRS89 / Kp2000 Jutland -<2196> +proj=tmerc +lat_0=0 +lon_0=9.5 +k=0.9999500000000001 +x_0=200000 +y_0=0 +ellps=GRS80 +units=m +no_defs <> +<2196> +proj=tmerc +lat_0=0 +lon_0=9.5 +k=0.99995 +x_0=200000 +y_0=0 +ellps=GRS80 +units=m +no_defs <> # ETRS89 / Kp2000 Zealand -<2197> +proj=tmerc +lat_0=0 +lon_0=12 +k=0.9999500000000001 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs <> +<2197> +proj=tmerc +lat_0=0 +lon_0=12 +k=0.99995 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs <> # ETRS89 / Kp2000 Bornholm <2198> +proj=tmerc +lat_0=0 +lon_0=15 +k=1 +x_0=900000 +y_0=0 +ellps=GRS80 +units=m +no_defs <> # Albanian 1987 / Gauss Kruger zone 4 (deprecated) <2199> +proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=4500000 +y_0=0 +ellps=krass +units=m +no_defs <> # ATS77 / New Brunswick Stereographic (ATS77) -<2200> +proj=sterea +lat_0=46.5 +lon_0=-66.5 +k=0.9999119999999999 +x_0=300000 +y_0=800000 +a=6378135 +b=6356750.304921594 +units=m +no_defs <> +<2200> +proj=sterea +lat_0=46.5 +lon_0=-66.5 +k=0.999912 +x_0=300000 +y_0=800000 +a=6378135 +b=6356750.304921594 +units=m +no_defs <> # REGVEN / UTM zone 18N <2201> +proj=utm +zone=18 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # REGVEN / UTM zone 19N @@ -1231,7 +1261,7 @@ # REGVEN / UTM zone 20N <2203> +proj=utm +zone=20 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs <> # NAD27 / Tennessee -<2204> +proj=lcc +lat_1=35.25 +lat_2=36.41666666666666 +lat_0=34.66666666666666 +lon_0=-86 +x_0=609601.2192024384 +y_0=30480.06096012192 +ellps=clrk66 +datum=NAD27 +to_meter=0.3048006096012192 +no_defs <> +<2204> +proj=lcc +lat_1=35.25 +lat_2=36.41666666666666 +lat_0=34.66666666666666 +lon_0=-86 +x_0=609601.2192024384 +y_0=30480.06096012192 +ellps=clrk66 +datum=NAD27 +units=us-ft +no_defs <> # NAD83 / Kentucky North <2205> +proj=lcc +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lat_0=37.5 +lon_0=-84.25 +x_0=500000 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs <> # ED50 / 3-degree Gauss-Kruger zone 9 @@ -1269,147 +1299,147 @@ # Unable to translate coordinate system EPSG:2221 into PROJ.4 format. # # NAD83 / Arizona East (ft) -<2222> +proj=tmerc +lat_0=31 +lon_0=-110.1666666666667 +k=0.9999 +x_0=213360 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048 +no_defs <> +<2222> +proj=tmerc +lat_0=31 +lon_0=-110.1666666666667 +k=0.9999 +x_0=213360 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=ft +no_defs <> # NAD83 / Arizona Central (ft) -<2223> +proj=tmerc +lat_0=31 +lon_0=-111.9166666666667 +k=0.9999 +x_0=213360 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048 +no_defs <> +<2223> +proj=tmerc +lat_0=31 +lon_0=-111.9166666666667 +k=0.9999 +x_0=213360 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=ft +no_defs <> # NAD83 / Arizona West (ft) -<2224> +proj=tmerc +lat_0=31 +lon_0=-113.75 +k=0.9999333330000001 +x_0=213360 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048 +no_defs <> +<2224> +proj=tmerc +lat_0=31 +lon_0=-113.75 +k=0.999933333 +x_0=213360 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=ft +no_defs <> # NAD83 / California zone 1 (ftUS) -<2225> +proj=lcc +lat_1=41.66666666666666 +lat_2=40 +lat_0=39.33333333333334 +lon_0=-122 +x_0=2000000.0001016 +y_0=500000.0001016002 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2225> +proj=lcc +lat_1=41.66666666666666 +lat_2=40 +lat_0=39.33333333333334 +lon_0=-122 +x_0=2000000.0001016 +y_0=500000.0001016001 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / California zone 2 (ftUS) -<2226> +proj=lcc +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lat_0=37.66666666666666 +lon_0=-122 +x_0=2000000.0001016 +y_0=500000.0001016002 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2226> +proj=lcc +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lat_0=37.66666666666666 +lon_0=-122 +x_0=2000000.0001016 +y_0=500000.0001016001 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / California zone 3 (ftUS) -<2227> +proj=lcc +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lat_0=36.5 +lon_0=-120.5 +x_0=2000000.0001016 +y_0=500000.0001016002 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2227> +proj=lcc +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lat_0=36.5 +lon_0=-120.5 +x_0=2000000.0001016 +y_0=500000.0001016001 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / California zone 4 (ftUS) -<2228> +proj=lcc +lat_1=37.25 +lat_2=36 +lat_0=35.33333333333334 +lon_0=-119 +x_0=2000000.0001016 +y_0=500000.0001016002 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2228> +proj=lcc +lat_1=37.25 +lat_2=36 +lat_0=35.33333333333334 +lon_0=-119 +x_0=2000000.0001016 +y_0=500000.0001016001 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / California zone 5 (ftUS) -<2229> +proj=lcc +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lat_0=33.5 +lon_0=-118 +x_0=2000000.0001016 +y_0=500000.0001016002 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2229> +proj=lcc +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lat_0=33.5 +lon_0=-118 +x_0=2000000.0001016 +y_0=500000.0001016001 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / California zone 6 (ftUS) -<2230> +proj=lcc +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lat_0=32.16666666666666 +lon_0=-116.25 +x_0=2000000.0001016 +y_0=500000.0001016002 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2230> +proj=lcc +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lat_0=32.16666666666666 +lon_0=-116.25 +x_0=2000000.0001016 +y_0=500000.0001016001 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Colorado North (ftUS) -<2231> +proj=lcc +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lat_0=39.33333333333334 +lon_0=-105.5 +x_0=914401.8288036576 +y_0=304800.6096012192 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2231> +proj=lcc +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lat_0=39.33333333333334 +lon_0=-105.5 +x_0=914401.8288036576 +y_0=304800.6096012192 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Colorado Central (ftUS) -<2232> +proj=lcc +lat_1=39.75 +lat_2=38.45 +lat_0=37.83333333333334 +lon_0=-105.5 +x_0=914401.8288036576 +y_0=304800.6096012192 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2232> +proj=lcc +lat_1=39.75 +lat_2=38.45 +lat_0=37.83333333333334 +lon_0=-105.5 +x_0=914401.8288036576 +y_0=304800.6096012192 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Colorado South (ftUS) -<2233> +proj=lcc +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lat_0=36.66666666666666 +lon_0=-105.5 +x_0=914401.8288036576 +y_0=304800.6096012192 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2233> +proj=lcc +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lat_0=36.66666666666666 +lon_0=-105.5 +x_0=914401.8288036576 +y_0=304800.6096012192 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Connecticut (ftUS) -<2234> +proj=lcc +lat_1=41.86666666666667 +lat_2=41.2 +lat_0=40.83333333333334 +lon_0=-72.75 +x_0=304800.6096012192 +y_0=152400.3048006096 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2234> +proj=lcc +lat_1=41.86666666666667 +lat_2=41.2 +lat_0=40.83333333333334 +lon_0=-72.75 +x_0=304800.6096012192 +y_0=152400.3048006096 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Delaware (ftUS) -<2235> +proj=tmerc +lat_0=38 +lon_0=-75.41666666666667 +k=0.999995 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2235> +proj=tmerc +lat_0=38 +lon_0=-75.41666666666667 +k=0.999995 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Florida East (ftUS) -<2236> +proj=tmerc +lat_0=24.33333333333333 +lon_0=-81 +k=0.9999411770000001 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2236> +proj=tmerc +lat_0=24.33333333333333 +lon_0=-81 +k=0.999941177 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Florida West (ftUS) -<2237> +proj=tmerc +lat_0=24.33333333333333 +lon_0=-82 +k=0.9999411770000001 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2237> +proj=tmerc +lat_0=24.33333333333333 +lon_0=-82 +k=0.999941177 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Florida North (ftUS) -<2238> +proj=lcc +lat_1=30.75 +lat_2=29.58333333333333 +lat_0=29 +lon_0=-84.5 +x_0=600000 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2238> +proj=lcc +lat_1=30.75 +lat_2=29.58333333333333 +lat_0=29 +lon_0=-84.5 +x_0=600000 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Georgia East (ftUS) -<2239> +proj=tmerc +lat_0=30 +lon_0=-82.16666666666667 +k=0.9999 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2239> +proj=tmerc +lat_0=30 +lon_0=-82.16666666666667 +k=0.9999 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Georgia West (ftUS) -<2240> +proj=tmerc +lat_0=30 +lon_0=-84.16666666666667 +k=0.9999 +x_0=699999.9998983998 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2240> +proj=tmerc +lat_0=30 +lon_0=-84.16666666666667 +k=0.9999 +x_0=699999.9998983998 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Idaho East (ftUS) -<2241> +proj=tmerc +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +k=0.9999473680000001 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2241> +proj=tmerc +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +k=0.9999473679999999 +x_0=200000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Idaho Central (ftUS) -<2242> +proj=tmerc +lat_0=41.66666666666666 +lon_0=-114 +k=0.9999473680000001 +x_0=500000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2242> +proj=tmerc +lat_0=41.66666666666666 +lon_0=-114 +k=0.9999473679999999 +x_0=500000.0001016001 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Idaho West (ftUS) -<2243> +proj=tmerc +lat_0=41.66666666666666 +lon_0=-115.75 +k=0.9999333330000001 +x_0=800000.0001016001 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2243> +proj=tmerc +lat_0=41.66666666666666 +lon_0=-115.75 +k=0.999933333 +x_0=800000.0001016001 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Indiana East (ftUS) (deprecated) -<2244> +proj=tmerc +lat_0=37.5 +lon_0=-85.66666666666667 +k=0.999966667 +x_0=99999.99989839978 +y_0=249364.9987299975 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2244> +proj=tmerc +lat_0=37.5 +lon_0=-85.66666666666667 +k=0.999966667 +x_0=99999.99989839978 +y_0=249364.9987299975 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Indiana West (ftUS) (deprecated) -<2245> +proj=tmerc +lat_0=37.5 +lon_0=-87.08333333333333 +k=0.999966667 +x_0=900000 +y_0=249364.9987299975 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2245> +proj=tmerc +lat_0=37.5 +lon_0=-87.08333333333333 +k=0.999966667 +x_0=900000 +y_0=249364.9987299975 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Kentucky North (ftUS) -<2246> +proj=lcc +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lat_0=37.5 +lon_0=-84.25 +x_0=500000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2246> +proj=lcc +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lat_0=37.5 +lon_0=-84.25 +x_0=500000.0001016001 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Kentucky South (ftUS) -<2247> +proj=lcc +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lat_0=36.33333333333334 +lon_0=-85.75 +x_0=500000.0001016002 +y_0=500000.0001016002 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2247> +proj=lcc +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lat_0=36.33333333333334 +lon_0=-85.75 +x_0=500000.0001016001 +y_0=500000.0001016001 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Maryland (ftUS) -<2248> +proj=lcc +lat_1=39.45 +lat_2=38.3 +lat_0=37.66666666666666 +lon_0=-77 +x_0=399999.9998983998 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2248> +proj=lcc +lat_1=39.45 +lat_2=38.3 +lat_0=37.66666666666666 +lon_0=-77 +x_0=399999.9998983998 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Massachusetts Mainland (ftUS) -<2249> +proj=lcc +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lat_0=41 +lon_0=-71.5 +x_0=200000.0001016002 +y_0=750000 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2249> +proj=lcc +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lat_0=41 +lon_0=-71.5 +x_0=200000.0001016002 +y_0=750000 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Massachusetts Island (ftUS) -<2250> +proj=lcc +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lat_0=41 +lon_0=-70.5 +x_0=500000.0001016002 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048006096012192 +no_defs <> +<2250> +proj=lcc +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lat_0=41 +lon_0=-70.5 +x_0=500000.0001016001 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=us-ft +no_defs <> # NAD83 / Michigan North (ft) -<2251> +proj=lcc +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lat_0=44.78333333333333 +lon_0=-87 +x_0=7999999.999968001 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048 +no_defs <> +<2251> +proj=lcc +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lat_0=44.78333333333333 +lon_0=-87 +x_0=7999999.999968001 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=ft +no_defs <> # NAD83 / Michigan Central (ft) -<2252> +proj=lcc +lat_1=45.7 +lat_2=44.18333333333333 +lat_0=43.31666666666667 +lon_0=-84.36666666666666 +x_0=5999999.999976001 +y_0=0 +ellps=GRS80 +datum=NAD83 +to_meter=0.3048 +no_defs <> +<2252> +proj=lcc +lat_1=45.7 +lat_2=44.18333333333333 +lat_0=43.31666666666667 +lon_0=-84.36666666666666 +x_0=5999999.999976001 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=ft +no_defs <> # NAD83 / Michigan South (ft) -<2253> +proj=lcc +lat_1=43.66666666666666 +l... [truncated message content]
Revision: 7933 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7933&view=rev Author: jswhit Date: 2009年11月04日 16:18:11 +0000 (2009年11月04日) Log Message: ----------- obsolete file Removed Paths: ------------- trunk/toolkits/basemap/src/proj-4.5.0-geod_api.patch Deleted: trunk/toolkits/basemap/src/proj-4.5.0-geod_api.patch =================================================================== --- trunk/toolkits/basemap/src/proj-4.5.0-geod_api.patch 2009年11月04日 16:07:22 UTC (rev 7932) +++ trunk/toolkits/basemap/src/proj-4.5.0-geod_api.patch 2009年11月04日 16:18:11 UTC (rev 7933) @@ -1,668 +0,0 @@ -diff -Naur proj-4.5.0-orig/src/geod.c proj-4.5.0/src/geod.c ---- proj-4.5.0-orig/src/geod.c 2006年12月04日 11:18:34.000000000 +0100 -+++ proj-4.5.0/src/geod.c 2006年12月05日 12:35:35.000000000 +0100 -@@ -23,7 +23,12 @@ - pline[50], /* work string */ - *usage = - "%s\nusage: %s [ -afFIptTwW [args] ] [ +opts[=arg] ] [ files ]\n"; -- static void -+ -+ -+static GEODESIC_T Geodesic; -+static GEODESIC_T *GEODESIC = &Geodesic; -+ -+static void - printLL(double p, double l) { - if (oform) { - (void)printf(oform, p * RAD_TO_DEG); TAB; -@@ -33,28 +38,31 @@ - (void)fputs(rtodms(pline, l, 'E', 'W'),stdout); - } - } -- static void -+ -+ -+static void - do_arc(void) { - double az; - -- printLL(phi2, lam2); putchar('\n'); -- for (az = al12; n_alpha--; ) { -- al12 = az = adjlon(az + del_alpha); -- geod_pre(); -- geod_for(); -- printLL(phi2, lam2); putchar('\n'); -+ printLL(GEODESIC->p2.u, GEODESIC->p2.v); putchar('\n'); -+ for (az = GEODESIC->ALPHA12; GEODESIC->n_alpha--; ) { -+ GEODESIC->ALPHA12 = az = adjlon(az + GEODESIC->del_alpha); -+ geod_pre(GEODESIC); -+ geod_for(GEODESIC); -+ printLL(GEODESIC->p2.u, GEODESIC->p2.v); putchar('\n'); - } - } -- static void /* generate intermediate geodesic coordinates */ -+ -+static void /* generate intermediate geodesic coordinates */ - do_geod(void) { - double phil, laml, del_S; - -- phil = phi2; -- laml = lam2; -- printLL(phi1, lam1); putchar('\n'); -- for ( geod_S = del_S = geod_S / n_S; --n_S; geod_S += del_S) { -- geod_for(); -- printLL(phi2, lam2); putchar('\n'); -+ phil = GEODESIC->p2.u; -+ laml = GEODESIC->p2.v; -+ printLL(GEODESIC->p1.u, GEODESIC->p1.v); putchar('\n'); -+ for ( GEODESIC->DIST = del_S = GEODESIC->DIST / GEODESIC->n_S; --(GEODESIC->n_S); GEODESIC->DIST += del_S) { -+ geod_for(GEODESIC); -+ printLL(GEODESIC->p2.u, GEODESIC->p2.v); putchar('\n'); - } - printLL(phil, laml); putchar('\n'); - } -@@ -76,51 +84,51 @@ - fputs(line, stdout); - continue; - } -- phi1 = dmstor(s, &s); -- lam1 = dmstor(s, &s); -+ GEODESIC->p1.u = dmstor(s, &s); -+ GEODESIC->p1.v = dmstor(s, &s); - if (inverse) { -- phi2 = dmstor(s, &s); -- lam2 = dmstor(s, &s); -- geod_inv(); -+ GEODESIC->p2.u = dmstor(s, &s); -+ GEODESIC->p2.v = dmstor(s, &s); -+ geod_inv(GEODESIC); - } else { -- al12 = dmstor(s, &s); -- geod_S = strtod(s, &s) * to_meter; -- geod_pre(); -- geod_for(); -+ GEODESIC->ALPHA12 = dmstor(s, &s); -+ GEODESIC->DIST = strtod(s, &s) * GEODESIC->TO_METER; -+ geod_pre(GEODESIC); -+ geod_for(GEODESIC); - } - if (!*s && (s > line)) --s; /* assumed we gobbled \n */ - if (pos_azi) { -- if (al12 < 0.) al12 += TWOPI; -- if (al21 < 0.) al21 += TWOPI; -+ if (GEODESIC->ALPHA12 < 0.) GEODESIC->ALPHA12 += TWOPI; -+ if (GEODESIC->ALPHA21 < 0.) GEODESIC->ALPHA21 += TWOPI; - } - if (fullout) { -- printLL(phi1, lam1); TAB; -- printLL(phi2, lam2); TAB; -+ printLL(GEODESIC->p1.u, GEODESIC->p1.v); TAB; -+ printLL(GEODESIC->p2.u, GEODESIC->p2.v); TAB; - if (oform) { -- (void)printf(oform, al12 * RAD_TO_DEG); TAB; -- (void)printf(oform, al21 * RAD_TO_DEG); TAB; -- (void)printf(osform, geod_S * fr_meter); -+ (void)printf(oform, GEODESIC->ALPHA12 * RAD_TO_DEG); TAB; -+ (void)printf(oform, GEODESIC->ALPHA21 * RAD_TO_DEG); TAB; -+ (void)printf(osform, GEODESIC->DIST * GEODESIC->FR_METER); - } else { -- (void)fputs(rtodms(pline, al12, 0, 0), stdout); TAB; -- (void)fputs(rtodms(pline, al21, 0, 0), stdout); TAB; -- (void)printf(osform, geod_S * fr_meter); -+ (void)fputs(rtodms(pline, GEODESIC->ALPHA12, 0, 0), stdout); TAB; -+ (void)fputs(rtodms(pline, GEODESIC->ALPHA21, 0, 0), stdout); TAB; -+ (void)printf(osform, GEODESIC->DIST * GEODESIC->FR_METER); - } - } else if (inverse) - if (oform) { -- (void)printf(oform, al12 * RAD_TO_DEG); TAB; -- (void)printf(oform, al21 * RAD_TO_DEG); TAB; -- (void)printf(osform, geod_S * fr_meter); -+ (void)printf(oform, GEODESIC->ALPHA12 * RAD_TO_DEG); TAB; -+ (void)printf(oform, GEODESIC->ALPHA21 * RAD_TO_DEG); TAB; -+ (void)printf(osform, GEODESIC->DIST * GEODESIC->FR_METER); - } else { -- (void)fputs(rtodms(pline, al12, 0, 0), stdout); TAB; -- (void)fputs(rtodms(pline, al21, 0, 0), stdout); TAB; -- (void)printf(osform, geod_S * fr_meter); -+ (void)fputs(rtodms(pline, GEODESIC->ALPHA12, 0, 0), stdout); TAB; -+ (void)fputs(rtodms(pline, GEODESIC->ALPHA21, 0, 0), stdout); TAB; -+ (void)printf(osform, GEODESIC->DIST * GEODESIC->FR_METER); - } - else { -- printLL(phi2, lam2); TAB; -+ printLL(GEODESIC->p2.u, GEODESIC->p2.v); TAB; - if (oform) -- (void)printf(oform, al21 * RAD_TO_DEG); -+ (void)printf(oform, GEODESIC->ALPHA21 * RAD_TO_DEG); - else -- (void)fputs(rtodms(pline, al21, 0, 0), stdout); -+ (void)fputs(rtodms(pline, GEODESIC->ALPHA21, 0, 0), stdout); - } - (void)fputs(s, stdout); - } -@@ -209,12 +217,12 @@ - eargv[eargc++] = *argv; - } - /* done with parameter and control input */ -- geod_set(pargc, pargv); /* setup projection */ -- if ((n_alpha || n_S) && eargc) -+ GEOD_init(pargc, pargv, GEODESIC); /* setup projection */ -+ if ((GEODESIC->n_alpha || GEODESIC->n_S) && eargc) - emess(1,"files specified for arc/geodesic mode"); -- if (n_alpha) -+ if (GEODESIC->n_alpha) - do_arc(); -- else if (n_S) -+ else if (GEODESIC->n_S) - do_geod(); - else { /* process input file list */ - if (eargc == 0) /* if no specific files force sysin */ -diff -Naur proj-4.5.0-orig/src/geodesic.h proj-4.5.0/src/geodesic.h ---- proj-4.5.0-orig/src/geodesic.h 2006年12月04日 11:18:34.000000000 +0100 -+++ proj-4.5.0/src/geodesic.h 2006年12月05日 12:35:35.000000000 +0100 -@@ -1,3 +1,8 @@ -+#ifndef __GEODESIC_H__ -+#define __GEODESIC_H__ -+ -+#include "projects.h" -+ - #ifndef lint - static char GEODESIC_H_ID[] = "@(#)geodesic.h 4.3 95/08/19 GIE REL"; - #endif -@@ -12,40 +17,37 @@ - # define GEOD_EXTERN - #endif - --GEOD_EXTERN struct geodesic { -+typedef struct geodesic { - double A; -- double LAM1, PHI1, ALPHA12; -- double LAM2, PHI2, ALPHA21; -+ -+ projUV p1, p2; -+ -+ double ALPHA12; -+ double ALPHA21; -+ - double DIST; - double ONEF, FLAT, FLAT2, FLAT4, FLAT64; - int ELLIPSE; --} GEODESIC; -+ double FR_METER, TO_METER, del_alpha; -+ int n_alpha, n_S; -+ -+ -+ double th1,costh1,sinth1,sina12,cosa12,M,N,c1,c2,D,P,s1; -+ int merid, signS; -+} GEODESIC_T; - --# define geod_a GEODESIC.A --# define lam1 GEODESIC.LAM1 --# define phi1 GEODESIC.PHI1 --# define al12 GEODESIC.ALPHA12 --# define lam2 GEODESIC.LAM2 --# define phi2 GEODESIC.PHI2 --# define al21 GEODESIC.ALPHA21 --# define geod_S GEODESIC.DIST --# define geod_f GEODESIC.FLAT --# define onef GEODESIC.ONEF --# define f2 GEODESIC.FLAT2 --# define f4 GEODESIC.FLAT4 --# define ff2 GEODESIC.FLAT4 --# define f64 GEODESIC.FLAT64 --# define ellipse GEODESIC.ELLIPSE -- -- --GEOD_EXTERN int n_alpha, n_S; --GEOD_EXTERN double to_meter, fr_meter, del_alpha; - --void geod_set(int, char **); --void geod_for(void); --void geod_pre(void); --void geod_inv(void); -+ GEODESIC_T *GEOD_init(int, char **, GEODESIC_T *g); -+ GEODESIC_T *GEOD_init_plus(const char *args, GEODESIC_T *g); -+ void geod_for(GEODESIC_T *g); -+ void geod_pre(GEODESIC_T *g); -+ int geod_inv(GEODESIC_T *g); - -+ -+ - #ifdef __cplusplus - } - #endif -+ -+#endif // __GEODESIC_H__ -+ -diff -Naur proj-4.5.0-orig/src/geod_for.c proj-4.5.0/src/geod_for.c ---- proj-4.5.0-orig/src/geod_for.c 2006年12月04日 11:18:34.000000000 +0100 -+++ proj-4.5.0/src/geod_for.c 2006年12月05日 12:35:35.000000000 +0100 -@@ -4,103 +4,110 @@ - # include "projects.h" - # include "geodesic.h" - # define MERI_TOL 1e-9 -- static double --th1,costh1,sinth1,sina12,cosa12,M,N,c1,c2,D,P,s1; -- static int --merid, signS; -- void --geod_pre(void) { -- al12 = adjlon(al12); /* reduce to +- 0-PI */ -- signS = fabs(al12) > HALFPI ? 1 : 0; -- th1 = ellipse ? atan(onef * tan(phi1)) : phi1; -- costh1 = cos(th1); -- sinth1 = sin(th1); -- if ((merid = fabs(sina12 = sin(al12)) < MERI_TOL)) { -- sina12 = 0.; -- cosa12 = fabs(al12) < HALFPI ? 1. : -1.; -- M = 0.; -+ -+ -+// input: al12, ELLIPSE, ONEF, phi1, FLAT, FLAT4 -+// output: al12 (ajusting) and!!! double s1, D, P, c1, M, N, cosa12, sina12, sinth1, costh1, th1, int signS, merid -+ -+void -+geod_pre(GEODESIC_T *GEODESIC) { -+ GEODESIC->ALPHA12 = adjlon(GEODESIC->ALPHA12); /* reduce to +- 0-PI */ -+ GEODESIC->signS = fabs(GEODESIC->ALPHA12) > HALFPI ? 1 : 0; -+ GEODESIC->th1 = GEODESIC->ELLIPSE ? atan(GEODESIC->ONEF * tan(GEODESIC->p1.u)) : GEODESIC->p1.u; -+ GEODESIC->costh1 = cos(GEODESIC->th1); -+ GEODESIC->sinth1 = sin(GEODESIC->th1); -+ if ((GEODESIC->merid = fabs(GEODESIC->sina12 = sin(GEODESIC->ALPHA12)) < MERI_TOL)) { -+ GEODESIC->sina12 = 0.; -+ GEODESIC->cosa12 = fabs(GEODESIC->ALPHA12) < HALFPI ? 1. : -1.; -+ GEODESIC->M = 0.; - } else { -- cosa12 = cos(al12); -- M = costh1 * sina12; -+ GEODESIC->cosa12 = cos(GEODESIC->ALPHA12); -+ GEODESIC->M = GEODESIC->costh1 * GEODESIC->sina12; - } -- N = costh1 * cosa12; -- if (ellipse) { -- if (merid) { -- c1 = 0.; -- c2 = f4; -- D = 1. - c2; -- D *= D; -- P = c2 / D; -+ GEODESIC->N = GEODESIC->costh1 * GEODESIC->cosa12; -+ if (GEODESIC->ELLIPSE) { -+ if (GEODESIC->merid) { -+ GEODESIC->c1 = 0.; -+ GEODESIC->c2 = GEODESIC->FLAT4; -+ GEODESIC->D = 1. - GEODESIC->c2; -+ GEODESIC->D *= GEODESIC->D; -+ GEODESIC->P = GEODESIC->c2 / GEODESIC->D; - } else { -- c1 = geod_f * M; -- c2 = f4 * (1. - M * M); -- D = (1. - c2)*(1. - c2 - c1 * M); -- P = (1. + .5 * c1 * M) * c2 / D; -+ GEODESIC->c1 = GEODESIC->FLAT * GEODESIC->M; -+ GEODESIC->c2 = GEODESIC->FLAT4 * (1. - GEODESIC->M * GEODESIC->M); -+ GEODESIC->D = (1. - GEODESIC->c2)*(1. - GEODESIC->c2 - GEODESIC->c1 * GEODESIC->M); -+ GEODESIC->P = (1. + .5 * GEODESIC->c1 * GEODESIC->M) * GEODESIC->c2 / GEODESIC->D; - } - } -- if (merid) s1 = HALFPI - th1; -+ if (GEODESIC->merid) GEODESIC->s1 = HALFPI - GEODESIC->th1; - else { -- s1 = (fabs(M) >= 1.) ? 0. : acos(M); -- s1 = sinth1 / sin(s1); -- s1 = (fabs(s1) >= 1.) ? 0. : acos(s1); -+ GEODESIC->s1 = (fabs(GEODESIC->M) >= 1.) ? 0. : acos(GEODESIC->M); -+ GEODESIC->s1 = GEODESIC->sinth1 / sin(GEODESIC->s1); -+ GEODESIC->s1 = (fabs(GEODESIC->s1) >= 1.) ? 0. : acos(GEODESIC->s1); - } - } -- void --geod_for(void) { -- double d,sind,u,V,X,ds,cosds,sinds,ss,de; -- -- if (ellipse) { -- d = geod_S / (D * geod_a); -- if (signS) d = -d; -- u = 2. * (s1 - d); -+ -+// input: ELLIPSE, DIST, A and!!! D, signS, s1 -+// output: -+ -+void -+geod_for(GEODESIC_T *GEODESIC) { -+ double d,sind,u,V,X,ds,cosds,sinds,ss = 0,de; -+ -+ if (GEODESIC->ELLIPSE) { -+ d = GEODESIC->DIST / (GEODESIC->D * GEODESIC->A); -+ if (GEODESIC->signS) d = -d; -+ u = 2. * (GEODESIC->s1 - d); - V = cos(u + d); -- X = c2 * c2 * (sind = sin(d)) * cos(d) * (2. * V * V - 1.); -- ds = d + X - 2. * P * V * (1. - 2. * P * cos(u)) * sind; -- ss = s1 + s1 - ds; -+ X = GEODESIC->c2 * GEODESIC->c2 * (sind = sin(d)) * cos(d) * (2. * V * V - 1.); -+ ds = d + X - 2. * GEODESIC->P * V * (1. - 2. * GEODESIC->P * cos(u)) * sind; -+ ss = GEODESIC->s1 + GEODESIC->s1 - ds; - } else { -- ds = geod_S / geod_a; -- if (signS) ds = - ds; -+ ds = GEODESIC->DIST / GEODESIC->A; -+ if (GEODESIC->signS) ds = - ds; - } - cosds = cos(ds); - sinds = sin(ds); -- if (signS) sinds = - sinds; -- al21 = N * cosds - sinth1 * sinds; -- if (merid) { -- phi2 = atan( tan(HALFPI + s1 - ds) / onef); -- if (al21 > 0.) { -- al21 = PI; -- if (signS) -+ if (GEODESIC->signS) sinds = - sinds; -+ GEODESIC->ALPHA21 = GEODESIC->N * cosds - GEODESIC->sinth1 * sinds; -+ if (GEODESIC->merid) { -+ GEODESIC->p2.u = atan( tan(HALFPI + GEODESIC->s1 - ds) / GEODESIC->ONEF); -+ if (GEODESIC->ALPHA21 > 0.) { -+ GEODESIC->ALPHA21 = PI; -+ if (GEODESIC->signS) - de = PI; - else { -- phi2 = - phi2; -+ GEODESIC->p2.u = - GEODESIC->p2.u; - de = 0.; - } - } else { -- al21 = 0.; -- if (signS) { -- phi2 = - phi2; -+ GEODESIC->ALPHA21 = 0.; -+ if (GEODESIC->signS) { -+ GEODESIC->p2.u = - GEODESIC->p2.u; - de = 0; - } else - de = PI; - } - } else { -- al21 = atan(M / al21); -- if (al21 > 0) -- al21 += PI; -- if (al12 < 0.) -- al21 -= PI; -- al21 = adjlon(al21); -- phi2 = atan(-(sinth1 * cosds + N * sinds) * sin(al21) / -- (ellipse ? onef * M : M)); -- de = atan2(sinds * sina12 , -- (costh1 * cosds - sinth1 * sinds * cosa12)); -- if (ellipse) -- if (signS) -- de += c1 * ((1. - c2) * ds + -- c2 * sinds * cos(ss)); -+ GEODESIC->ALPHA21 = atan(GEODESIC->M / GEODESIC->ALPHA21); -+ if (GEODESIC->ALPHA21 > 0) -+ GEODESIC->ALPHA21 += PI; -+ if (GEODESIC->ALPHA12 < 0.) -+ GEODESIC->ALPHA21 -= PI; -+ GEODESIC->ALPHA21 = adjlon(GEODESIC->ALPHA21); -+ GEODESIC->p2.u = atan(-(GEODESIC->sinth1 * cosds + GEODESIC->N * sinds) * sin(GEODESIC->ALPHA21) / -+ (GEODESIC->ELLIPSE ? GEODESIC->ONEF * GEODESIC->M : GEODESIC->M)); -+ de = atan2(sinds * GEODESIC->sina12 , -+ (GEODESIC->costh1 * cosds - GEODESIC->sinth1 * sinds * GEODESIC->cosa12)); -+ if (GEODESIC->ELLIPSE) -+ { -+ if (GEODESIC->signS) -+ de += GEODESIC->c1 * ((1. - GEODESIC->c2) * ds + -+ GEODESIC->c2 * sinds * cos(ss)); - else -- de -= c1 * ((1. - c2) * ds - -- c2 * sinds * cos(ss)); -+ de -= GEODESIC->c1 * ((1. - GEODESIC->c2) * ds - -+ GEODESIC->c2 * sinds * cos(ss)); -+ } - } -- lam2 = adjlon( lam1 + de ); -+ GEODESIC->p2.v = adjlon( GEODESIC->p1.v + de ); - } -diff -Naur proj-4.5.0-orig/src/geod_inv.c proj-4.5.0/src/geod_inv.c ---- proj-4.5.0-orig/src/geod_inv.c 2006年12月04日 11:18:34.000000000 +0100 -+++ proj-4.5.0/src/geod_inv.c 2006年12月05日 12:35:35.000000000 +0100 -@@ -4,24 +4,26 @@ - # include "projects.h" - # include "geodesic.h" - # define DTOL 1e-12 -- void --geod_inv(void) { -+ -+int -+geod_inv(GEODESIC_T *GEODESIC) -+{ - double th1,th2,thm,dthm,dlamm,dlam,sindlamm,costhm,sinthm,cosdthm, - sindthm,L,E,cosd,d,X,Y,T,sind,tandlammp,u,v,D,A,B; - -- if (ellipse) { -- th1 = atan(onef * tan(phi1)); -- th2 = atan(onef * tan(phi2)); -+ if (GEODESIC->ELLIPSE) { -+ th1 = atan(GEODESIC->ONEF * tan(GEODESIC->p1.u)); -+ th2 = atan(GEODESIC->ONEF * tan(GEODESIC->p2.u)); - } else { -- th1 = phi1; -- th2 = phi2; -+ th1 = GEODESIC->p1.u; -+ th2 = GEODESIC->p2.u; - } - thm = .5 * (th1 + th2); - dthm = .5 * (th2 - th1); -- dlamm = .5 * ( dlam = adjlon(lam2 - lam1) ); -+ dlamm = .5 * ( dlam = adjlon(GEODESIC->p2.v - GEODESIC->p1.v) ); - if (fabs(dlam) < DTOL && fabs(dthm) < DTOL) { -- al12 = al21 = geod_S = 0.; -- return; -+ GEODESIC->ALPHA12 = GEODESIC->ALPHA21 = GEODESIC->DIST = 0.; -+ return -1; - } - sindlamm = sin(dlamm); - costhm = cos(thm); sinthm = sin(thm); -@@ -29,7 +31,7 @@ - L = sindthm * sindthm + (cosdthm * cosdthm - sinthm * sinthm) - * sindlamm * sindlamm; - d = acos(cosd = 1 - L - L); -- if (ellipse) { -+ if (GEODESIC->ELLIPSE) { - E = cosd + cosd; - sind = sin( d ); - Y = sinthm * cosdthm; -@@ -42,18 +44,19 @@ - D = 4. * T * T; - A = D * E; - B = D + D; -- geod_S = geod_a * sind * (T - f4 * (T * X - Y) + -- f64 * (X * (A + (T - .5 * (A - E)) * X) - -- Y * (B + E * Y) + D * X * Y)); -+ GEODESIC->DIST = GEODESIC->A * sind * (T - GEODESIC->FLAT4 * (T * X - Y) + -+ GEODESIC->FLAT64 * (X * (A + (T - .5 * (A - E)) * X) - -+ Y * (B + E * Y) + D * X * Y)); - tandlammp = tan(.5 * (dlam - .25 * (Y + Y - E * (4. - X)) * -- (f2 * T + f64 * (32. * T - (20. * T - A) -- * X - (B + 4.) * Y)) * tan(dlam))); -+ (GEODESIC->FLAT2 * T + GEODESIC->FLAT64 * (32. * T - (20. * T - A) -+ * X - (B + 4.) * Y)) * tan(dlam))); - } else { -- geod_S = geod_a * d; -+ GEODESIC->DIST = GEODESIC->A * d; - tandlammp = tan(dlamm); - } - u = atan2(sindthm , (tandlammp * costhm)); - v = atan2(cosdthm , (tandlammp * sinthm)); -- al12 = adjlon(TWOPI + v - u); -- al21 = adjlon(TWOPI - v - u); -+ GEODESIC->ALPHA12 = adjlon(TWOPI + v - u); -+ GEODESIC->ALPHA21 = adjlon(TWOPI - v - u); -+ return 0; - } -diff -Naur proj-4.5.0-orig/src/geod_set.c proj-4.5.0/src/geod_set.c ---- proj-4.5.0-orig/src/geod_set.c 2006年12月04日 11:18:34.000000000 +0100 -+++ proj-4.5.0/src/geod_set.c 2006年12月05日 12:35:35.000000000 +0100 -@@ -4,17 +4,27 @@ - - #define _IN_GEOD_SET - -+#include <stdlib.h> - #include <string.h> - #include "projects.h" - #include "geodesic.h" - #include "emess.h" -- void --geod_set(int argc, char **argv) { -- paralist *start = 0, *curr; -+ -+GEODESIC_T * -+GEOD_init(int argc, char **argv, GEODESIC_T *GEODESIC) -+{ -+ paralist *start = 0, *curr = 0; - double es; - char *name; - int i; - -+ -+ if(0 == GEODESIC) -+ { -+ GEODESIC = malloc(sizeof(GEODESIC_T)); -+ } -+ memset(GEODESIC, 0, sizeof(GEODESIC_T)); -+ - /* put arguments into internal linked list */ - if (argc <= 0) - emess(1, "no arguments in initialization list"); -@@ -24,49 +34,50 @@ - else - start = curr = pj_mkparam(argv[i]); - /* set elliptical parameters */ -- if (pj_ell_set(start, &geod_a, &es)) emess(1,"ellipse setup failure"); -+ if (pj_ell_set(start, &GEODESIC->A, &es)) emess(1,"ellipse setup failure"); - /* set units */ -- if (name = pj_param(start, "sunits").s) { -+ if ((name = pj_param(start, "sunits").s)) { - char *s; - struct PJ_UNITS *unit_list = pj_get_units_ref(); - for (i = 0; (s = unit_list[i].id) && strcmp(name, s) ; ++i) ; - if (!s) - emess(1,"%s unknown unit conversion id", name); -- fr_meter = 1. / (to_meter = atof(unit_list[i].to_meter)); -+ GEODESIC->FR_METER = 1. / (GEODESIC->TO_METER = atof(unit_list[i].to_meter)); - } else -- to_meter = fr_meter = 1.; -- if (ellipse = es != 0.) { -- onef = sqrt(1. - es); -- geod_f = 1 - onef; -- f2 = geod_f/2; -- f4 = geod_f/4; -- f64 = geod_f*geod_f/64; -+ GEODESIC->TO_METER = GEODESIC->FR_METER = 1.; -+ if ((GEODESIC->ELLIPSE = (es != 0.))) { -+ GEODESIC->ONEF = sqrt(1. - es); -+ GEODESIC->FLAT = 1 - GEODESIC->ONEF; -+ GEODESIC->FLAT2 = GEODESIC->FLAT/2; -+ GEODESIC->FLAT4 = GEODESIC->FLAT/4; -+ GEODESIC->FLAT64 = GEODESIC->FLAT*GEODESIC->FLAT/64; - } else { -- onef = 1.; -- geod_f = f2 = f4 = f64 = 0.; -+ GEODESIC->ONEF = 1.; -+ GEODESIC->FLAT = GEODESIC->FLAT2 = GEODESIC->FLAT4 = GEODESIC->FLAT64 = 0.; - } - /* check if line or arc mode */ - if (pj_param(start, "tlat_1").i) { - double del_S; - #undef f -- phi1 = pj_param(start, "rlat_1").f; -- lam1 = pj_param(start, "rlon_1").f; -+ -+ GEODESIC->p1.u = pj_param(start, "rlat_1").f; -+ GEODESIC->p1.v = pj_param(start, "rlon_1").f; - if (pj_param(start, "tlat_2").i) { -- phi2 = pj_param(start, "rlat_2").f; -- lam2 = pj_param(start, "rlon_2").f; -- geod_inv(); -- geod_pre(); -- } else if (geod_S = pj_param(start, "dS").f) { -- al12 = pj_param(start, "rA").f; -- geod_pre(); -- geod_for(); -+ GEODESIC->p2.u = pj_param(start, "rlat_2").f; -+ GEODESIC->p2.v = pj_param(start, "rlon_2").f; -+ geod_inv(GEODESIC); -+ geod_pre(GEODESIC); -+ } else if ((GEODESIC->DIST = pj_param(start, "dS").f)) { -+ GEODESIC->ALPHA12 = pj_param(start, "rA").f; -+ geod_pre(GEODESIC); -+ geod_for(GEODESIC); - } else emess(1,"incomplete geodesic/arc info"); -- if ((n_alpha = pj_param(start, "in_A").i) > 0) { -- if (!(del_alpha = pj_param(start, "rdel_A").f)) -+ if ((GEODESIC->n_alpha = pj_param(start, "in_A").i) > 0) { -+ if (!(GEODESIC->del_alpha = pj_param(start, "rdel_A").f)) - emess(1,"del azimuth == 0"); -- } else if (del_S = fabs(pj_param(start, "ddel_S").f)) { -- n_S = geod_S / del_S + .5; -- } else if ((n_S = pj_param(start, "in_S").i) <= 0) -+ } else if ((del_S = fabs(pj_param(start, "ddel_S").f))) { -+ GEODESIC->n_S = GEODESIC->DIST / del_S + .5; -+ } else if ((GEODESIC->n_S = pj_param(start, "in_S").i) <= 0) - emess(1,"no interval divisor selected"); - } - /* free up linked list */ -@@ -74,4 +85,53 @@ - curr = start->next; - pj_dalloc(start); - } -+ return GEODESIC; - } -+ -+GEODESIC_T *GEOD_init_plus(const char *definition, GEODESIC_T *geod) -+{ -+#define MAX_ARG 200 -+ char *argv[MAX_ARG]; -+ char *defn_copy; -+ int argc = 0, i; -+ -+ /* make a copy that we can manipulate */ -+ defn_copy = strdup(definition); -+ -+ /* split into arguments based on '+' and trim white space */ -+ -+ for( i = 0; defn_copy[i] != '0円'; i++ ) -+ { -+ switch( defn_copy[i] ) -+ { -+ case '+': -+ if( i == 0 || defn_copy[i-1] == '0円' ) -+ { -+ if( argc+1 == MAX_ARG ) -+ { -+ //pj_errno = -44; -+ return NULL; -+ } -+ -+ argv[argc++] = defn_copy + i + 1; -+ } -+ break; -+ -+ case ' ': -+ case '\t': -+ case '\n': -+ defn_copy[i] = '0円'; -+ break; -+ -+ default: -+ /* do nothing */; -+ } -+ } -+ -+ /* perform actual initialization */ -+ GEODESIC_T *ret_geod = GEOD_init(argc, argv, geod); -+ -+ free( defn_copy ); -+ return ret_geod; -+} -+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7932 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7932&view=rev Author: jswhit Date: 2009年11月04日 16:07:22 +0000 (2009年11月04日) Log Message: ----------- added is_land method to check if a point is over land or water. Modified Paths: -------------- trunk/toolkits/basemap/Changelog trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py Modified: trunk/toolkits/basemap/Changelog =================================================================== --- trunk/toolkits/basemap/Changelog 2009年11月03日 21:17:48 UTC (rev 7931) +++ trunk/toolkits/basemap/Changelog 2009年11月04日 16:07:22 UTC (rev 7932) @@ -1,4 +1,6 @@ version 0.99.5 (not yet released) + * add "is_land" method to check whether a point is over land or + water. * geos-3.1.1 now required. 3.1.1 source included (instead of 2.2.3). * shiftgrid no longer requires a cyclic point to be present (patch from Eric Bruning). Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py =================================================================== --- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年11月03日 21:17:48 UTC (rev 7931) +++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py 2009年11月04日 16:07:22 UTC (rev 7932) @@ -801,6 +801,20 @@ else: coastsegs.append(seg) self.coastsegs = coastsegs + # create geos Polygon structures for land areas. + # currently only used in is_land method. + self.landpolygons=[] + self.lakepolygons=[] + #self.islandinlakepolygons=[] + #self.lakeinislandinlakepolygons=[] + x, y = zip(*self.coastpolygons) + for x,y,type in zip(x,y,self.coastpolygontypes): + b = np.asarray([x,y]).T + if type == 1: self.landpolygons.append(_geoslib.Polygon(b)) + if type == 2: self.lakepolygons.append(_geoslib.Polygon(b)) + #if type == 3: self.islandinlakepolygons.append(_geoslib.Polygon(b)) + #if type == 4: self.lakeinislandinlakepolygons.append(_geoslib.Polygon(b)) + # set __init__'s docstring __init__.__doc__ = _Basemap_init_doc @@ -1537,6 +1551,23 @@ self.set_axes_limits(ax=ax) return rivers + def is_land(self,xpt,ypt): + """ + Returns True if the given x,y point (in projection coordinates) is + over land, False otherwise. The definition of land is based upon + the GSHHS coastline polygons associated with the class instance. + Points over lakes inside land regions are not counted as land points. + """ + landpt = False + for poly in self.landpolygons: + landpt = _geoslib.Point((xpt,ypt)).within(poly) + if landpt: break + lakept = False + for poly in self.lakepolygons: + lakept = _geoslib.Point((xpt,ypt)).within(poly) + if lakept: break + return landpt and not lakept + def readshapefile(self,shapefile,name,drawbounds=True,zorder=None, linewidth=0.5,color='k',antialiased=1,ax=None): """ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7931 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7931&view=rev Author: jdh2358 Date: 2009年11月03日 21:17:48 +0000 (2009年11月03日) Log Message: ----------- remove static decorator Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/mlab.py trunk/matplotlib/lib/matplotlib/tests/test_mlab.py Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 20:57:23 UTC (rev 7930) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 21:17:48 UTC (rev 7931) @@ -820,6 +820,10 @@ *Y* : a projected into PCA space + + The factor loadings are in the Wt factor, ie the factor + loadings for the 1st principal component are given by Wt[0] + """ n, m = a.shape if n<m: Modified: trunk/matplotlib/lib/matplotlib/tests/test_mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_mlab.py 2009年11月03日 20:57:23 UTC (rev 7930) +++ trunk/matplotlib/lib/matplotlib/tests/test_mlab.py 2009年11月03日 21:17:48 UTC (rev 7931) @@ -1,7 +1,6 @@ import numpy as np import matplotlib.mlab as mlab -@staticmethod def test_colinear_pca(): a = mlab.PCA._get_colinear() pca = mlab.PCA(a) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7930 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7930&view=rev Author: mdboom Date: 2009年11月03日 20:57:23 +0000 (2009年11月03日) Log Message: ----------- Merged revisions 7928 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r7928 | mdboom | 2009年11月03日 15:55:47 -0500 (2009年11月03日) | 1 line [2889193] Rasterized output offset in pdf and ps ........ 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_99_maint:1-7924 + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7929 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png: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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7929 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7929&view=rev Author: mdboom Date: 2009年11月03日 20:56:03 +0000 (2009年11月03日) Log Message: ----------- [2889193] Rasterized output offset in pdf and ps Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/backends/backend_mixed.py Modified: trunk/matplotlib/lib/matplotlib/backends/backend_mixed.py =================================================================== --- trunk/matplotlib/lib/matplotlib/backends/backend_mixed.py 2009年11月03日 20:55:47 UTC (rev 7928) +++ trunk/matplotlib/lib/matplotlib/backends/backend_mixed.py 2009年11月03日 20:56:03 UTC (rev 7929) @@ -122,8 +122,8 @@ gc = self._renderer.new_gc() self._renderer.draw_image( gc, - int(float(l)/self.dpi*72.), - int((float(height) - b - h)/self.dpi*72.), + float(l)/self.dpi*72., + (float(height) - b - h)/self.dpi*72., image) self._raster_renderer = None self._rasterizing = False This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7928 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7928&view=rev Author: mdboom Date: 2009年11月03日 20:55:47 +0000 (2009年11月03日) Log Message: ----------- [2889193] Rasterized output offset in pdf and ps Modified Paths: -------------- branches/v0_99_maint/lib/matplotlib/backends/backend_mixed.py Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_mixed.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/backends/backend_mixed.py 2009年11月03日 20:51:55 UTC (rev 7927) +++ branches/v0_99_maint/lib/matplotlib/backends/backend_mixed.py 2009年11月03日 20:55:47 UTC (rev 7928) @@ -14,7 +14,7 @@ raster_renderer_class=None, bbox_inches_restore=None): """ - figure: The figure instance. + figure: The figure instance. width: The width of the canvas in logical units @@ -49,7 +49,7 @@ self.figure=figure self._bbox_inches_restore = bbox_inches_restore - + self._set_current_renderer(vector_renderer) _methods = """ @@ -88,8 +88,8 @@ mode="png") self._bbox_inches_restore = r - - + + if self._rasterizing == 0: self._raster_renderer = self._raster_renderer_class( self._width*self.dpi, self._height*self.dpi, self.dpi) @@ -117,9 +117,10 @@ image = frombuffer(buffer, w, h, True) image.is_grayscale = False image.flipud_out() - self._renderer.draw_image(int(float(l)/self.dpi*72.), - int((float(height) - b - h)/self.dpi*72.), - image, None) + self._renderer.draw_image( + float(l)/self.dpi*72., + (float(height) - b - h)/self.dpi*72., + image, None) self._raster_renderer = None self._rasterizing = False This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7927 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7927&view=rev Author: jdh2358 Date: 2009年11月03日 20:51:55 +0000 (2009年11月03日) Log Message: ----------- added pca test Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/__init__.py trunk/matplotlib/lib/matplotlib/mlab.py Added Paths: ----------- trunk/matplotlib/lib/matplotlib/tests/test_mlab.py Modified: trunk/matplotlib/lib/matplotlib/__init__.py =================================================================== --- trunk/matplotlib/lib/matplotlib/__init__.py 2009年11月03日 20:27:23 UTC (rev 7926) +++ trunk/matplotlib/lib/matplotlib/__init__.py 2009年11月03日 20:51:55 UTC (rev 7927) @@ -905,6 +905,7 @@ 'matplotlib.tests.test_backend_svg', 'matplotlib.tests.test_basic', 'matplotlib.tests.test_cbook', + 'matplotlib.tests.test_mlab', 'matplotlib.tests.test_transforms', 'matplotlib.tests.test_axes', 'matplotlib.tests.test_dates', Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 20:27:23 UTC (rev 7926) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 20:51:55 UTC (rev 7927) @@ -761,7 +761,7 @@ """ WARNING: this function is deprecated -- please see class PCA instead - + Compute the principal components of *P*. *P* is a (*numVars*, *numObs*) array. *frac* is the minimum fraction of variance that a component must contain to be included. @@ -870,6 +870,27 @@ 'center the data using the mean and sigma from training set a' return (x - self.mu)/self.sigma + + + @staticmethod + def _get_colinear(): + c0 = np.array([ + 0.19294738, 0.6202667 , 0.45962655, 0.07608613, 0.135818 , + 0.83580842, 0.07218851, 0.48318321, 0.84472463, 0.18348462, + 0.81585306, 0.96923926, 0.12835919, 0.35075355, 0.15807861, + 0.837437 , 0.10824303, 0.1723387 , 0.43926494, 0.83705486]) + + c1 = np.array([ + -1.17705601, -0.513883 , -0.26614584, 0.88067144, 1.00474954, + -1.1616545 , 0.0266109 , 0.38227157, 1.80489433, 0.21472396, + -1.41920399, -2.08158544, -0.10559009, 1.68999268, 0.34847107, + -0.4685737 , 1.23980423, -0.14638744, -0.35907697, 0.22442616]) + + c2 = c0 + 2*c1 + c3 = -3*c0 + 4*c1 + a = np.array([c3, c0, c1, c2]).T + return a + def prctile(x, p = (0.0, 25.0, 50.0, 75.0, 100.0)): """ Return the percentiles of *x*. *p* can either be a sequence of Added: trunk/matplotlib/lib/matplotlib/tests/test_mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_mlab.py (rev 0) +++ trunk/matplotlib/lib/matplotlib/tests/test_mlab.py 2009年11月03日 20:51:55 UTC (rev 7927) @@ -0,0 +1,11 @@ +import numpy as np +import matplotlib.mlab as mlab + +@staticmethod +def test_colinear_pca(): + a = mlab.PCA._get_colinear() + pca = mlab.PCA(a) + + assert(np.allclose(pca.fracs[2:], 0.)) + assert(np.allclose(pca.Y[:,2:], 0.)) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7926 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7926&view=rev Author: jdh2358 Date: 2009年11月03日 20:27:23 +0000 (2009年11月03日) Log Message: ----------- added PCA helper class to mlab and deprecated prepca Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/mlab.py Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 17:57:52 UTC (rev 7925) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 20:27:23 UTC (rev 7926) @@ -759,6 +759,9 @@ def prepca(P, frac=0): """ + + WARNING: this function is deprecated -- please see class PCA instead + Compute the principal components of *P*. *P* is a (*numVars*, *numObs*) array. *frac* is the minimum fraction of variance that a component must contain to be included. @@ -778,6 +781,7 @@ R13 Neural Network Toolbox but is not found in later versions; its successor seems to be called "processpcs". """ + warnings.warn('This function is deprecated -- see class PCA instead') U,s,v = np.linalg.svd(P) varEach = s**2/P.shape[1] totVar = varEach.sum() @@ -789,6 +793,83 @@ Pcomponents = np.dot(Trans,P) return Pcomponents, Trans, fracVar[ind] + +class PCA: + def __init__(self, a): + """ + compute the SVD of a and store data for PCA. Use project to + project the data onto a reduced set of dimensions + + Inputs: + + *a*: a numobservations x numdims array + + Attrs: + + *a* a centered unit sigma version of input a + + *numrows*, *numcols*: the dimensions of a + + *mu* : a numdims array of means of a + + *sigma* : a numdims array of atandard deviation of a + + *fracs* : the proportion of variance of each of the principal components + + *Wt* : the weight vector for projecting a numdims point or array into PCA space + + *Y* : a projected into PCA space + + """ + n, m = a.shape + if n<m: + raise RuntimeError('we assume data in a is organized with numrows>numcols') + + self.numrows, self.numcols = n, m + self.mu = a.mean(axis=0) + self.sigma = a.std(axis=0) + + a = self.center(a) + + self.a = a + + U, s, Vh = np.linalg.svd(a, full_matrices=False) + + + Y = np.dot(Vh, a.T).T + + vars = s**2/float(len(s)) + self.fracs = vars/vars.sum() + + + self.Wt = Vh + self.Y = Y + + + def project(self, x, minfrac=0.): + 'project x onto the principle axes, dropping any axes where fraction of variance<minfrac' + x = np.asarray(x) + + ndims = len(x.shape) + + if (x.shape[-1]!=self.numcols): + raise ValueError('Expected an array with dims[-1]==%d'%self.numcols) + + + Y = np.dot(self.Wt, self.center(x).T).T + mask = self.fracs>=minfrac + if ndims==2: + Yreduced = Y[:,mask] + else: + Yreduced = Y[mask] + return Yreduced + + + + def center(self, x): + 'center the data using the mean and sigma from training set a' + return (x - self.mu)/self.sigma + def prctile(x, p = (0.0, 25.0, 50.0, 75.0, 100.0)): """ Return the percentiles of *x*. *p* can either be a sequence of This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7925 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7925&view=rev Author: mdboom Date: 2009年11月03日 17:57:52 +0000 (2009年11月03日) Log Message: ----------- Merged revisions 7924 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r7924 | mdboom | 2009年11月03日 11:27:13 -0500 (2009年11月03日) | 2 lines [2880836] Save from toolbar changes directory with WX backend ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/backends/backend_wx.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_99_maint:1-7921 + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7924 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 Modified: trunk/matplotlib/lib/matplotlib/backends/backend_wx.py =================================================================== --- trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2009年11月03日 16:27:13 UTC (rev 7924) +++ trunk/matplotlib/lib/matplotlib/backends/backend_wx.py 2009年11月03日 17:57:52 UTC (rev 7925) @@ -1795,7 +1795,7 @@ default_file = "image." + self.canvas.get_default_filetype() dlg = wx.FileDialog(self._parent, "Save to file", "", default_file, filetypes, - wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR) + wx.SAVE|wx.OVERWRITE_PROMPT) dlg.SetFilterIndex(filter_index) if dlg.ShowModal() == wx.ID_OK: dirname = dlg.GetDirectory() 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png: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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7924 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7924&view=rev Author: mdboom Date: 2009年11月03日 16:27:13 +0000 (2009年11月03日) Log Message: ----------- [2880836] Save from toolbar changes directory with WX backend Modified Paths: -------------- branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py 2009年11月03日 16:23:41 UTC (rev 7923) +++ branches/v0_99_maint/lib/matplotlib/backends/backend_wx.py 2009年11月03日 16:27:13 UTC (rev 7924) @@ -1794,7 +1794,7 @@ default_file = "image." + self.canvas.get_default_filetype() dlg = wx.FileDialog(self._parent, "Save to file", "", default_file, filetypes, - wx.SAVE|wx.OVERWRITE_PROMPT|wx.CHANGE_DIR) + wx.SAVE|wx.OVERWRITE_PROMPT) dlg.SetFilterIndex(filter_index) if dlg.ShowModal() == wx.ID_OK: dirname = dlg.GetDirectory() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7923 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7923&view=rev Author: mdboom Date: 2009年11月03日 16:23:41 +0000 (2009年11月03日) Log Message: ----------- Remove conflict markers from last commit. Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py trunk/matplotlib/src/_backend_agg.cpp Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2009年11月03日 16:21:36 UTC (rev 7922) +++ trunk/matplotlib/lib/matplotlib/collections.py 2009年11月03日 16:23:41 UTC (rev 7923) @@ -574,7 +574,6 @@ if closed: self._paths = [] for xy in verts: -<<<<<<< .working if len(xy): if np.ma.isMaskedArray(xy): xy = np.ma.concatenate([xy, np.zeros((1,2))]) @@ -586,19 +585,6 @@ codes[0] = mpath.Path.MOVETO codes[-1] = mpath.Path.CLOSEPOLY self._paths.append(mpath.Path(xy, codes)) -======= - if len(xy): - if np.ma.isMaskedArray(xy): - xy = np.ma.concatenate([xy, np.zeros((1,2))]) - else: - xy = np.asarray(xy) - xy = np.concatenate([xy, np.zeros((1,2))]) - codes = np.empty(xy.shape[0], dtype='uint8') - codes[:] = mpath.Path.LINETO - codes[0] = mpath.Path.MOVETO - codes[-1] = mpath.Path.CLOSEPOLY - self._paths.append(mpath.Path(xy, codes)) ->>>>>>> .merge-right.r7919 else: self._paths.append(mpath.Path(xy)) else: Modified: trunk/matplotlib/src/_backend_agg.cpp =================================================================== --- trunk/matplotlib/src/_backend_agg.cpp 2009年11月03日 16:21:36 UTC (rev 7922) +++ trunk/matplotlib/src/_backend_agg.cpp 2009年11月03日 16:23:41 UTC (rev 7923) @@ -163,17 +163,6 @@ _set_hatch_path(gc); } -<<<<<<< .working -======= -GCAgg::GCAgg(double dpi) : - dpi(dpi), isaa(true), - cap(agg::butt_cap), join(agg::round_join), linewidth(1.0), alpha(1.0), - dashOffset(0.0) -{ - -} - ->>>>>>> .merge-right.r7919 void GCAgg::_set_antialiased(const Py::Object& gc) { _VERBOSE("GCAgg::antialiased"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7922 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7922&view=rev Author: mdboom Date: 2009年11月03日 16:21:36 +0000 (2009年11月03日) Log Message: ----------- Merged revisions 7919 via svnmerge from https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_99_maint ........ r7919 | mdboom | 2009年11月03日 10:46:14 -0500 (2009年11月03日) | 2 lines [2890979] Close paths correctly in PolyCollection ........ Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py trunk/matplotlib/src/_backend_agg.cpp 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_99_maint:1-7916 + /branches/mathtex:1-7263 /branches/v0_99_maint:1-7921 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2009年11月03日 16:11:07 UTC (rev 7921) +++ trunk/matplotlib/lib/matplotlib/collections.py 2009年11月03日 16:21:36 UTC (rev 7922) @@ -574,6 +574,7 @@ if closed: self._paths = [] for xy in verts: +<<<<<<< .working if len(xy): if np.ma.isMaskedArray(xy): xy = np.ma.concatenate([xy, np.zeros((1,2))]) @@ -585,6 +586,19 @@ codes[0] = mpath.Path.MOVETO codes[-1] = mpath.Path.CLOSEPOLY self._paths.append(mpath.Path(xy, codes)) +======= + if len(xy): + if np.ma.isMaskedArray(xy): + xy = np.ma.concatenate([xy, np.zeros((1,2))]) + else: + xy = np.asarray(xy) + xy = np.concatenate([xy, np.zeros((1,2))]) + codes = np.empty(xy.shape[0], dtype='uint8') + codes[:] = mpath.Path.LINETO + codes[0] = mpath.Path.MOVETO + codes[-1] = mpath.Path.CLOSEPOLY + self._paths.append(mpath.Path(xy, codes)) +>>>>>>> .merge-right.r7919 else: self._paths.append(mpath.Path(xy)) 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: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 + /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: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 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: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 + /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: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 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: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 + /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: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 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: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 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png: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 Modified: trunk/matplotlib/src/_backend_agg.cpp =================================================================== --- trunk/matplotlib/src/_backend_agg.cpp 2009年11月03日 16:11:07 UTC (rev 7921) +++ trunk/matplotlib/src/_backend_agg.cpp 2009年11月03日 16:21:36 UTC (rev 7922) @@ -163,6 +163,17 @@ _set_hatch_path(gc); } +<<<<<<< .working +======= +GCAgg::GCAgg(double dpi) : + dpi(dpi), isaa(true), + cap(agg::butt_cap), join(agg::round_join), linewidth(1.0), alpha(1.0), + dashOffset(0.0) +{ + +} + +>>>>>>> .merge-right.r7919 void GCAgg::_set_antialiased(const Py::Object& gc) { _VERBOSE("GCAgg::antialiased"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7921 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7921&view=rev Author: mdboom Date: 2009年11月03日 16:11:07 +0000 (2009年11月03日) Log Message: ----------- [2890979] Close paths correctly in PolyCollection Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/collections.py trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf trunk/matplotlib/lib/matplotlib/tests/test_axes.py trunk/matplotlib/src/_backend_agg.cpp trunk/matplotlib/src/_backend_agg.h Added Paths: ----------- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg Modified: trunk/matplotlib/lib/matplotlib/collections.py =================================================================== --- trunk/matplotlib/lib/matplotlib/collections.py 2009年11月03日 16:00:13 UTC (rev 7920) +++ trunk/matplotlib/lib/matplotlib/collections.py 2009年11月03日 16:11:07 UTC (rev 7921) @@ -574,14 +574,19 @@ if closed: self._paths = [] for xy in verts: - if np.ma.isMaskedArray(xy): - if len(xy) and (xy[0] != xy[-1]).any(): - xy = np.ma.concatenate([xy, [xy[0]]]) + if len(xy): + if np.ma.isMaskedArray(xy): + xy = np.ma.concatenate([xy, np.zeros((1,2))]) + else: + xy = np.asarray(xy) + xy = np.concatenate([xy, np.zeros((1,2))]) + codes = np.empty(xy.shape[0], dtype=mpath.Path.code_type) + codes[:] = mpath.Path.LINETO + codes[0] = mpath.Path.MOVETO + codes[-1] = mpath.Path.CLOSEPOLY + self._paths.append(mpath.Path(xy, codes)) else: - xy = np.asarray(xy) - if len(xy) and (xy[0] != xy[-1]).any(): - xy = np.concatenate([xy, [xy[0]]]) - self._paths.append(mpath.Path(xy)) + self._paths.append(mpath.Path(xy)) else: self._paths = [mpath.Path(xy) for xy in verts] Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.pdf =================================================================== (Binary files differ) Added: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf =================================================================== (Binary files differ) Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png =================================================================== (Binary files differ) Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg (rev 0) +++ trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/polycollection_joinstyle.svg 2009年11月03日 16:11:07 UTC (rev 7921) @@ -0,0 +1,50 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<!-- Created with matplotlib (http://matplotlib.sourceforge.net/) --> +<svg width="576pt" height="432pt" viewBox="0 0 576 432" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + id="svg1"> +<filter id="colorAdd"><feComposite in="SourceGraphic" in2="BackgroundImage" operator="arithmetic" k2="1" k3="1"/></filter> +<g id="figure1"> +<g id="patch1"> +<path style="fill: #ffffff; stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M0.000000 432.000000L576.000000 432.000000L576.000000 0.000000 +L0.000000 0.000000L0.000000 432.000000"/> +</g> +<g id="axes1"> +<g id="patch2"> +<path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 388.800000L518.400000 388.800000L518.400000 43.200000 +L72.000000 43.200000L72.000000 388.800000"/> +</g> +<g id="PolyCollection1"> +<defs> +<path id="coll0_0_19e93e5df12bdd5a95009dd1dd45c12d" d="M220.800000 -158.400000L220.800000 -273.600000L369.600000 -273.600000 +L369.600000 -158.400000z"/> +</defs> +<defs> + <clipPath id="p50431ccdcb28178602d99d9270004dde"> +<rect x="72.000000" y="43.200000" width="446.400000" height="345.600000"/> + </clipPath> +</defs><g clip-path="url(#p50431ccdcb28178602d99d9270004dde)"><use style="fill: #0000ff; stroke: #000000; stroke-width: 40.000000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#coll0_0_19e93e5df12bdd5a95009dd1dd45c12d" x="0.000000" y="432.000000"/> +</g></g> +<g id="matplotlib.axis1"> +</g> +<g id="matplotlib.axis2"> +</g> +<g id="patch3"> +<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 43.200000L518.400000 43.200000"/> +</g> +<g id="patch4"> +<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M518.400000 388.800000L518.400000 43.200000"/> +</g> +<g id="patch5"> +<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 388.800000L518.400000 388.800000"/> +</g> +<g id="patch6"> +<path style="fill: none; stroke: #000000; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M72.000000 388.800000L72.000000 43.200000"/> +</g> +</g> +</g> +</svg> Modified: trunk/matplotlib/lib/matplotlib/tests/test_axes.py =================================================================== --- trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年11月03日 16:00:13 UTC (rev 7920) +++ trunk/matplotlib/lib/matplotlib/tests/test_axes.py 2009年11月03日 16:11:07 UTC (rev 7921) @@ -407,7 +407,24 @@ ax.imshow(r, clip_path=clip_path) fig.savefig('imshow_clip') +@image_comparison(baseline_images=['polycollection_joinstyle']) +def test_polycollection_joinstyle(): + # Bug #2890979 reported by Matthew West + from matplotlib import collections as mcoll + + fig = plt.figure() + ax = fig.add_subplot(111) + verts = np.array([[1,1], [1,2], [2,2], [2,1]]) + c = mcoll.PolyCollection([verts], linewidths = 40) + ax.add_collection(c) + ax.set_xbound(0, 3) + ax.set_ybound(0, 3) + ax.set_xticks([]) + ax.set_yticks([]) + + fig.savefig('polycollection_joinstyle') + if __name__=='__main__': import nose nose.runmodule(argv=['-s','--with-doctest'], exit=False) Modified: trunk/matplotlib/src/_backend_agg.cpp =================================================================== --- trunk/matplotlib/src/_backend_agg.cpp 2009年11月03日 16:00:13 UTC (rev 7920) +++ trunk/matplotlib/src/_backend_agg.cpp 2009年11月03日 16:11:07 UTC (rev 7921) @@ -147,8 +147,7 @@ } GCAgg::GCAgg(const Py::Object &gc, double dpi) : - dpi(dpi), isaa(true), linewidth(1.0), alpha(1.0), - dashOffset(0.0) + dpi(dpi), isaa(true), dashOffset(0.0) { _VERBOSE("GCAgg::GCAgg"); linewidth = points_to_pixels ( gc.getAttr("_linewidth") ) ; @@ -164,13 +163,6 @@ _set_hatch_path(gc); } -GCAgg::GCAgg(double dpi) : - dpi(dpi), isaa(true), linewidth(1.0), alpha(1.0), - dashOffset(0.0) -{ - -} - void GCAgg::_set_antialiased(const Py::Object& gc) { _VERBOSE("GCAgg::antialiased"); @@ -219,11 +211,11 @@ std::string joinstyle = Py::String( gc.getAttr("_joinstyle") ); - if (joinstyle=="miter") - join = agg::miter_join_revert; - else if (joinstyle=="round") + if (joinstyle == "miter") + join = agg::miter_join_revert; + else if (joinstyle == "round") join = agg::round_join; - else if(joinstyle=="bevel") + else if (joinstyle == "bevel") join = agg::bevel_join; else throw Py::ValueError(Printf("GC _joinstyle attribute must be one of butt, round, projecting; found %s", joinstyle.c_str()).str()); @@ -532,7 +524,7 @@ if (args.size() == 6) face_obj = args[5]; - GCAgg gc = GCAgg(gc_obj, dpi); + GCAgg gc(gc_obj, dpi); // Deal with the difference in y-axis direction marker_trans *= agg::trans_affine_scaling(1.0, -1.0); @@ -775,7 +767,7 @@ double angle = Py::Float( args[3] ); - GCAgg gc = GCAgg(args[4], dpi); + GCAgg gc(args[4], dpi); theRasterizer.reset_clipping(); rendererBase.reset_clipping(true); @@ -1081,7 +1073,8 @@ template<class PathGenerator, int check_snap, int has_curves> Py::Object RendererAgg::_draw_path_collection_generic - (agg::trans_affine master_transform, + (GCAgg& gc, + agg::trans_affine master_transform, const Py::Object& cliprect, const Py::Object& clippath, const agg::trans_affine& clippath_trans, @@ -1101,8 +1094,6 @@ typedef agg::conv_curve<quantized_t> quantized_curve_t; typedef agg::conv_curve<clipped_t> curve_t; - GCAgg gc(dpi); - PyArrayObject* offsets = NULL; PyArrayObject* facecolors = NULL; PyArrayObject* edgecolors = NULL; @@ -1312,7 +1303,8 @@ try { _draw_path_collection_generic<PathListGenerator, 0, 1> - (master_transform, + (gc, + master_transform, gc.cliprect, gc.clippath, gc.clippath_trans, @@ -1449,7 +1441,8 @@ try { try { _draw_path_collection_generic<QuadMeshGenerator, 0, 0> - (master_transform, + (gc, + master_transform, gc.cliprect, gc.clippath, gc.clippath_trans, Modified: trunk/matplotlib/src/_backend_agg.h =================================================================== --- trunk/matplotlib/src/_backend_agg.h 2009年11月03日 16:00:13 UTC (rev 7920) +++ trunk/matplotlib/src/_backend_agg.h 2009年11月03日 16:11:07 UTC (rev 7921) @@ -104,7 +104,6 @@ class GCAgg { public: GCAgg(const Py::Object& gc, double dpi); - GCAgg(double dpi); double dpi; bool isaa; @@ -224,15 +223,16 @@ bool render_clippath(const Py::Object& clippath, const agg::trans_affine& clippath_trans); template<class PathIteratorType> void _draw_path(PathIteratorType& path, bool has_clippath, - const facepair_t& face, const GCAgg& gc); + const facepair_t& face, const GCAgg& gc); template<class PathGenerator, int check_snap, int has_curves> Py::Object _draw_path_collection_generic - (agg::trans_affine master_transform, - const Py::Object& cliprect, - const Py::Object& clippath, + (GCAgg& gc, + agg::trans_affine master_transform, + const Py::Object& cliprect, + const Py::Object& clippath, const agg::trans_affine& clippath_trans, - const PathGenerator& path_generator, + const PathGenerator& path_generator, const Py::SeqBase<Py::Object>& transforms_obj, const Py::Object& offsets_obj, const agg::trans_affine& offset_trans, @@ -262,7 +262,7 @@ BufferRegion::init_type(); add_keyword_method("RendererAgg", &_backend_agg_module::new_renderer, - "RendererAgg(width, height, dpi)"); + "RendererAgg(width, height, dpi)"); initialize( "The agg rendering backend" ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7920 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7920&view=rev Author: jdh2358 Date: 2009年11月03日 16:00:13 +0000 (2009年11月03日) Log Message: ----------- support postfixes in recs_join Modified Paths: -------------- trunk/matplotlib/lib/matplotlib/mlab.py Modified: trunk/matplotlib/lib/matplotlib/mlab.py =================================================================== --- trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 15:46:14 UTC (rev 7919) +++ trunk/matplotlib/lib/matplotlib/mlab.py 2009年11月03日 16:00:13 UTC (rev 7920) @@ -1893,7 +1893,7 @@ return newrec -def recs_join(key, name, recs, jointype='outer', missing=0.): +def recs_join(key, name, recs, jointype='outer', missing=0., postfixes=None): """ Join a sequence of record arrays on single column key. @@ -1911,11 +1911,15 @@ *jointype* is a string 'inner' or 'outer' - *missing" + *missing* is what any missing field is replaced by + *postfixes* + if not None, a len recs sequence of postfixes - returns a record array with columns [rowkey, name1, name2, ... namen]. + returns a record array with columns [rowkey, name0, name1, ... namen-1]. + or if postfixes [PF0, PF1, ..., PFN-1] are supplied, + [rowkey, namePF0, namePF1, ... namePFN-1]. Example:: @@ -1938,7 +1942,9 @@ if None not in row: # throw out any Nones results.append([rowkey] + map(extract, row)) - names = ",".join([key] + ["%s%d" % (name, d) for d in range(len(recs))]) + if postfixes is None: + postfixes = ['%d'%i for i in range(len(recs))] + names = ",".join([key] + ["%s%s" % (name, postfix) for postfix in postfixes]) return np.rec.fromrecords(results, names=names) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7919 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7919&view=rev Author: mdboom Date: 2009年11月03日 15:46:14 +0000 (2009年11月03日) Log Message: ----------- [2890979] Close paths correctly in PolyCollection Modified Paths: -------------- branches/v0_99_maint/lib/matplotlib/collections.py branches/v0_99_maint/src/_backend_agg.cpp Modified: branches/v0_99_maint/lib/matplotlib/collections.py =================================================================== --- branches/v0_99_maint/lib/matplotlib/collections.py 2009年11月03日 13:53:57 UTC (rev 7918) +++ branches/v0_99_maint/lib/matplotlib/collections.py 2009年11月03日 15:46:14 UTC (rev 7919) @@ -676,14 +676,19 @@ if closed: self._paths = [] for xy in verts: - if np.ma.isMaskedArray(xy): - if len(xy) and (xy[0] != xy[-1]).any(): - xy = np.ma.concatenate([xy, [xy[0]]]) + if len(xy): + if np.ma.isMaskedArray(xy): + xy = np.ma.concatenate([xy, np.zeros((1,2))]) + else: + xy = np.asarray(xy) + xy = np.concatenate([xy, np.zeros((1,2))]) + codes = np.empty(xy.shape[0], dtype='uint8') + codes[:] = mpath.Path.LINETO + codes[0] = mpath.Path.MOVETO + codes[-1] = mpath.Path.CLOSEPOLY + self._paths.append(mpath.Path(xy, codes)) else: - xy = np.asarray(xy) - if len(xy) and (xy[0] != xy[-1]).any(): - xy = np.concatenate([xy, [xy[0]]]) - self._paths.append(mpath.Path(xy)) + self._paths.append(mpath.Path(xy)) else: self._paths = [mpath.Path(xy) for xy in verts] Modified: branches/v0_99_maint/src/_backend_agg.cpp =================================================================== --- branches/v0_99_maint/src/_backend_agg.cpp 2009年11月03日 13:53:57 UTC (rev 7918) +++ branches/v0_99_maint/src/_backend_agg.cpp 2009年11月03日 15:46:14 UTC (rev 7919) @@ -164,7 +164,8 @@ } GCAgg::GCAgg(double dpi) : - dpi(dpi), isaa(true), linewidth(1.0), alpha(1.0), + dpi(dpi), isaa(true), + cap(agg::butt_cap), join(agg::round_join), linewidth(1.0), alpha(1.0), dashOffset(0.0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.