SF.net SVN: matplotlib: [4397] trunk/toolkits/basemap-testing/lib/ matplotlib/toolkits/basemap/basemap.py

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

Revision: 4397
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4397&view=rev
Author:   jswhit
Date:     2007-11-20 12:21:53 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
fix drawlsmask for 'moll','robin' and 'sinu' projections.

Modified Paths:
--------------
    trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py

Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007-11-20 18:25:33 UTC (rev 4396)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007-11-20 20:21:53 UTC (rev 4397)
@@ -2461,8 +2461,22 @@
             nx = int((self.xmax-self.xmin)/dx)+1; ny = int((self.ymax-self.ymin)/dx)+1
         # interpolate rgba values from proj='cyl' (geographic coords)
         # to a rectangular map projection grid.
-            mask = self.transform_scalar(lsmask,lsmask_lons,\
-                                         lsmask_lats,nx,ny,order=0,masked=255)
+            mask,x,y = self.transform_scalar(lsmask,lsmask_lons,\
+                       lsmask_lats,nx,ny,returnxy=True,order=0,masked=255)
+            # for these projections, points outside the projection
+            # limb have to be set to transparent manually.
+            if self.projection in ['moll','robin','sinu']:
+                lons, lats = self(x, y, inverse=True)
+                lon_0 = self.projparams['lon_0']
+                lats = lats[:,nx/2]
+                lons1 = (lon_0+180.)*npy.ones(lons.shape[0],npy.float64)
+                lons2 = (lon_0-180.)*npy.ones(lons.shape[0],npy.float64)
+                xmax,ytmp = self(lons1,lats)
+                xmin,ytmp = self(lons2,lats)
+                for j in range(lats.shape[0]):
+                    xx = x[j,:]
+                    mask[j,:]=npy.where(npy.logical_or(xx<xmin[j],xx>xmax[j]),\
+                                        255,mask[j,:])
             self.lsmask = mask
         # optionally, set lakes to ocean color.
         if lakes:
@@ -2479,6 +2493,7 @@
         rgba[:,:,3] = npy.where(mask==255,0,rgba[:,:,3])
         # plot mask as rgba image.
         im = self.imshow(rgba,interpolation='nearest',ax=ax,**kwargs)
+        return im
 
 ### End of Basemap class
 


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