SF.net SVN: matplotlib:[5956] trunk/toolkits/basemap

[<js...@us...>]

Revision: 5956
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5956&view=rev
Author:   jswhit
Date:     2008-08-02 18:54:32 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
make land_color, ocean_color kwargs in drawlsmask

Modified Paths:
--------------
    trunk/toolkits/basemap/doc/users/figures/background2.py
    trunk/toolkits/basemap/examples/geos_demo.py
    trunk/toolkits/basemap/examples/ortho_demo.py
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/doc/users/figures/background2.py
===================================================================
--- trunk/toolkits/basemap/doc/users/figures/background2.py	2008-08-02 12:40:17 UTC (rev 5955)
+++ trunk/toolkits/basemap/doc/users/figures/background2.py	2008-08-02 18:54:32 UTC (rev 5956)
@@ -6,5 +6,6 @@
             resolution=None,lat_1=45.,lat_2=55,lat_0=50,lon_0=-107.)
 # draw a land-sea mask for a map background.
 # lakes=True means plot inland lakes with ocean color.
-m.drawlsmask('coral','aqua',lakes=True)
+m.drawlsmask(land_color='coral',ocean_color='aqua',lakes=True)
+plt.show()
 plt.savefig('background2.png')

Modified: trunk/toolkits/basemap/examples/geos_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/geos_demo.py	2008-08-02 12:40:17 UTC (rev 5955)
+++ trunk/toolkits/basemap/examples/geos_demo.py	2008-08-02 18:54:32 UTC (rev 5956)
@@ -11,7 +11,7 @@
 # plot land-sea mask.
 # land red, oceans blue.
 # lakes=True means plot inland lakes with ocean color.
-m.drawlsmask('red','blue',lakes=True)
+m.drawlsmask(land_color='red',ocean_color='blue',lakes=True)
 # draw parallels and meridians.
 m.drawparallels(np.arange(-90.,120.,30.))
 m.drawmeridians(np.arange(0.,420.,60.))

Modified: trunk/toolkits/basemap/examples/ortho_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/ortho_demo.py	2008-08-02 12:40:17 UTC (rev 5955)
+++ trunk/toolkits/basemap/examples/ortho_demo.py	2008-08-02 18:54:32 UTC (rev 5956)
@@ -11,7 +11,7 @@
 m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution=None)
 # land red, oceans blue.
 # lakes=True means plot inland lakes with ocean color.
-m.drawlsmask('red','blue', lakes=True)
+m.drawlsmask(land_color='red',ocean_color='blue', lakes=True)
 # draw parallels and meridians.
 m.drawparallels(np.arange(-90.,120.,30.))
 m.drawmeridians(np.arange(0.,420.,60.))

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-08-02 12:40:17 UTC (rev 5955)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-08-02 18:54:32 UTC (rev 5956)
@@ -2940,7 +2940,7 @@
         self.set_axes_limits(ax=ax)
         return retnh,retsh
 
-    def drawlsmask(self,land_color,ocean_color,lsmask=None,
+    def drawlsmask(self,land_color="0.8",ocean_color="w",lsmask=None,
                    lsmask_lons=None,lsmask_lats=None,lakes=False,**kwargs):
         """
         Draw land-sea mask image.
@@ -2953,17 +2953,12 @@
         .. tabularcolumns:: |l|L|
 
         ==============   ====================================================
-        Arguments        Description
+        Keywords         Description
         ==============   ====================================================
         land_color       desired land color (color name or rgba tuple). 
+                         Default gray ("0.8").
         ocean_color      desired ocean color (color name or rgba tuple).
-        ==============   ====================================================
-
-        .. tabularcolumns:: |l|L|
-
-        ==============   ====================================================
-        Keywords         Description
-        ==============   ====================================================
+                         Default white.
         lakes            If True, inland lakes are also colored with
                          ocean_color (default is lakes=False).
         lsmask           An array of 0's for ocean pixels, 1's for


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.