matplotlib-checkins Mailing List for matplotlib

Revision: 6146
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6146&view=rev
Author: jswhit
Date: 2008年10月04日 13:09:52 +0000 (2008年10月04日)
Log Message:
-----------
add new projections
Modified Paths:
--------------
 trunk/toolkits/basemap/doc/users/figures/robin.py
 trunk/toolkits/basemap/doc/users/mapsetup.rst
Added Paths:
-----------
 trunk/toolkits/basemap/doc/users/figures/gall.py
 trunk/toolkits/basemap/doc/users/figures/mbtfpq.py
 trunk/toolkits/basemap/doc/users/figures/vandg.py
 trunk/toolkits/basemap/doc/users/gall.rst
 trunk/toolkits/basemap/doc/users/mbtfpq.rst
 trunk/toolkits/basemap/doc/users/vandg.rst
Added: trunk/toolkits/basemap/doc/users/figures/gall.py
===================================================================
--- trunk/toolkits/basemap/doc/users/figures/gall.py	 (rev 0)
+++ trunk/toolkits/basemap/doc/users/figures/gall.py	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -0,0 +1,17 @@
+from mpl_toolkits.basemap import Basemap
+import numpy as np
+import matplotlib.pyplot as plt
+# llcrnrlat,llcrnrlon,urcrnrlat,urcrnrlon
+# are the lat/lon values of the lower left and upper right corners
+# of the map.
+# resolution = 'c' means use crude resolution coastlines.
+m = Basemap(projection='gall',llcrnrlat=-90,urcrnrlat=90,\
+ llcrnrlon=-180,urcrnrlon=180,resolution='c')
+m.drawcoastlines()
+m.fillcontinents(color='coral',lake_color='aqua')
+# draw parallels and meridians.
+m.drawparallels(np.arange(-90.,91.,30.))
+m.drawmeridians(np.arange(-180.,181.,60.))
+m.drawmapboundary(fill_color='aqua') 
+plt.title("Gall Stereographic Projection")
+plt.savefig('gall.png')
Added: trunk/toolkits/basemap/doc/users/figures/mbtfpq.py
===================================================================
--- trunk/toolkits/basemap/doc/users/figures/mbtfpq.py	 (rev 0)
+++ trunk/toolkits/basemap/doc/users/figures/mbtfpq.py	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -0,0 +1,14 @@
+from mpl_toolkits.basemap import Basemap
+import numpy as np
+import matplotlib.pyplot as plt
+# lon_0 is central longitude of projection.
+# resolution = 'c' means use crude resolution coastlines.
+m = Basemap(projection='mbtfpq',lon_0=0,resolution='c')
+m.drawcoastlines()
+m.fillcontinents(color='coral',lake_color='aqua')
+# draw parallels and meridians.
+m.drawparallels(np.arange(-90.,120.,30.))
+m.drawmeridians(np.arange(0.,360.,60.))
+m.drawmapboundary(fill_color='aqua') 
+plt.title("McBryde-Thomas Flat Polar Quartic Projection")
+plt.savefig('mbtfpq.png')
Modified: trunk/toolkits/basemap/doc/users/figures/robin.py
===================================================================
--- trunk/toolkits/basemap/doc/users/figures/robin.py	2008年10月04日 07:16:10 UTC (rev 6145)
+++ trunk/toolkits/basemap/doc/users/figures/robin.py	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -8,7 +8,7 @@
 m.fillcontinents(color='coral',lake_color='aqua')
 # draw parallels and meridians.
 m.drawparallels(np.arange(-90.,120.,30.))
-m.drawmeridians(np.arange(0.,420.,60.))
+m.drawmeridians(np.arange(0.,360.,60.))
 m.drawmapboundary(fill_color='aqua') 
 plt.title("Robinson Projection")
 plt.savefig('robin.png')
Added: trunk/toolkits/basemap/doc/users/figures/vandg.py
===================================================================
--- trunk/toolkits/basemap/doc/users/figures/vandg.py	 (rev 0)
+++ trunk/toolkits/basemap/doc/users/figures/vandg.py	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -0,0 +1,14 @@
+from mpl_toolkits.basemap import Basemap
+import numpy as np
+import matplotlib.pyplot as plt
+# lon_0 is central longitude of projection.
+# resolution = 'c' means use crude resolution coastlines.
+m = Basemap(projection='vandg',lon_0=0,resolution='c')
+m.drawcoastlines()
+m.fillcontinents(color='coral',lake_color='aqua')
+# draw parallels and meridians.
+m.drawparallels(np.arange(-80.,81.,20.))
+m.drawmeridians(np.arange(0.,360.,60.))
+m.drawmapboundary(fill_color='aqua') 
+plt.title("van der Grinten Projection")
+plt.savefig('vandg.png')
Added: trunk/toolkits/basemap/doc/users/gall.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/gall.rst	 (rev 0)
+++ trunk/toolkits/basemap/doc/users/gall.rst	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -0,0 +1,11 @@
+.. _gall:
+
+Gall Stereographic Projection
+=============================
+
+A stereographic, cylindrical projection that is neither equal-area
+or conformal.
+
+.. literalinclude:: figures/gall.py
+
+.. image:: figures/gall.png
Modified: trunk/toolkits/basemap/doc/users/mapsetup.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/mapsetup.rst	2008年10月04日 07:16:10 UTC (rev 6145)
+++ trunk/toolkits/basemap/doc/users/mapsetup.rst	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -6,7 +6,7 @@
 In order to represent the curved surface of the earth on a two-dimensional
 map, a map projection is needed. Since this cannot be done without
 distortion, there are many map projections, each with it's own advantages
-and disadvantages. Basemap provides 19 different map projections.
+and disadvantages. Basemap provides 22 different map projections.
 Some are global, some can only represent a portion of the globe. When
 a :class:`~mpl_toolkits.basemap.Basemap` class instance is
 created, the desired map projection must
@@ -47,6 +47,7 @@
 omerc.rst
 poly.rst
 mill.rst
+ gall.rst
 lcc.rst
 laea.rst
 stere.rst
@@ -55,3 +56,5 @@
 pstere.rst
 plaea.rst
 paeqd.rst
+ mbtfpq.rst
+ vandg.rst
Added: trunk/toolkits/basemap/doc/users/mbtfpq.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/mbtfpq.rst	 (rev 0)
+++ trunk/toolkits/basemap/doc/users/mbtfpq.rst	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -0,0 +1,10 @@
+.. _mbtfpq:
+
+McBryde-Thomas Flat Polar Quartic
+=================================
+
+A global equal-area projection.
+
+.. literalinclude:: figures/mbtfpq.py
+
+.. image:: figures/mbtfpq.png
Added: trunk/toolkits/basemap/doc/users/vandg.rst
===================================================================
--- trunk/toolkits/basemap/doc/users/vandg.rst	 (rev 0)
+++ trunk/toolkits/basemap/doc/users/vandg.rst	2008年10月04日 13:09:52 UTC (rev 6146)
@@ -0,0 +1,12 @@
+.. _vandg:
+
+van der Grinten Projection
+==========================
+
+A global projection once used by the National Geographic Society for world maps.
+Neither equal area or conformal, shows the world in a circle centered on
+the equator.
+
+.. literalinclude:: figures/vandg.py
+
+.. image:: figures/vandg.png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6145
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6145&view=rev
Author: efiring
Date: 2008年10月04日 07:16:10 +0000 (2008年10月04日)
Log Message:
-----------
Change default precision kwarg in spy from None to 0.
Modified Paths:
--------------
 trunk/matplotlib/API_CHANGES
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/API_CHANGES
===================================================================
--- trunk/matplotlib/API_CHANGES	2008年10月02日 15:00:54 UTC (rev 6144)
+++ trunk/matplotlib/API_CHANGES	2008年10月04日 07:16:10 UTC (rev 6145)
@@ -2,6 +2,11 @@
 Changes for 0.98.x
 ==================
 
+* Changed precision kwarg in spy; default is 0, and the string value
+ 'present' is used for sparse arrays only to show filled locations.
+
+* EllipseCollection added.
+
 * Added angles kwarg to quiver for more flexible specification of
 the arrow angles.
 
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008年10月02日 15:00:54 UTC (rev 6144)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008年10月04日 07:16:10 UTC (rev 6145)
@@ -6648,21 +6648,21 @@
 
 return Pxx, freqs, bins, im
 
- def spy(self, Z, precision=None, marker=None, markersize=None,
+ def spy(self, Z, precision=0, marker=None, markersize=None,
 aspect='equal', **kwargs):
 """
 call signature::
 
- spy(Z, precision=None, marker=None, markersize=None,
+ spy(Z, precision=0, marker=None, markersize=None,
 aspect='equal', **kwargs)
 
 ``spy(Z)`` plots the sparsity pattern of the 2-D array *Z*.
 
- If *precision* is *None*, any non-zero value will be plotted;
+ If *precision* is 0, any non-zero value will be plotted;
 else, values of :math:`|Z| > precision` will be plotted.
 
 For :class:`scipy.sparse.spmatrix` instances, there is a
- special case: if *precision* is 0, any value present in
+ special case: if *precision* is 'present', any value present in
 the array will be plotted, even if it is identically zero.
 
 The array will be plotted as it would be printed, with
@@ -6715,12 +6715,15 @@
 * ',' pixel
 
 """
+ if precision is None:
+ precision = 0
+ warnings.DeprecationWarning("Use precision=0 instead of None")
+ # 2008年10月03日
 if marker is None and markersize is None and hasattr(Z, 'tocoo'):
 marker = 's'
 if marker is None and markersize is None:
 Z = np.asarray(Z)
- if precision is None: mask = Z!=0.
- else: mask = np.absolute(Z)>precision
+ mask = np.absolute(Z)>precision
 
 if 'cmap' not in kwargs:
 kwargs['cmap'] = mcolors.ListedColormap(['w', 'k'], name='binary')
@@ -6731,22 +6734,16 @@
 else:
 if hasattr(Z, 'tocoo'):
 c = Z.tocoo()
- if precision == 0:
+ if precision == 'present':
 y = c.row
 x = c.col
 else:
- if precision is None:
- nonzero = c.data != 0.
- else:
- nonzero = np.absolute(c.data) > precision
+ nonzero = np.absolute(c.data) > precision
 y = c.row[nonzero]
 x = c.col[nonzero]
 else:
 Z = np.asarray(Z)
- if precision is None:
- nonzero = Z!=0.
- else:
- nonzero = np.absolute(Z)>precision
+ nonzero = np.absolute(Z)>precision
 y, x = np.nonzero(nonzero)
 if marker is None: marker = 's'
 if markersize is None: markersize = 10
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.