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

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

Revision: 6576
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6576&view=rev
Author:   jswhit
Date:     2008-12-12 12:22:15 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
bump version number, have bluemarble pass kwargs to imshow, return
Image instance.

Modified Paths:
--------------
    trunk/toolkits/basemap/Changelog
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
    trunk/toolkits/basemap/setup.py

Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2008-12-12 03:33:51 UTC (rev 6575)
+++ trunk/toolkits/basemap/Changelog	2008-12-12 12:22:15 UTC (rev 6576)
@@ -1,3 +1,5 @@
+version 0.99.3 (not yet released)
+           * bluemarble:  pass kwargs to imshow, return Image instance.
 version 0.99.2 (svn revision 6541)
            * fix drawlsmask method so that it works for cylindrical
              projections with limits outside (-180,180).

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-12-12 03:33:51 UTC (rev 6575)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008-12-12 12:22:15 UTC (rev 6576)
@@ -41,7 +41,7 @@
 # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
 basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
 
-__version__ = '0.99.2'
+__version__ = '0.99.3'
 
 # supported map projections.
 _projnames = {'cyl'      : 'Cylindrical Equidistant',
@@ -3148,7 +3148,7 @@
         im = self.imshow(rgba,interpolation='nearest',ax=ax,**kwargs)
         return im
 
-    def bluemarble(self,ax=None,scale=None):
+    def bluemarble(self,ax=None,scale=None,**kwargs):
         """
         display blue marble image (from http://visibleearth.nasa.gov)
         as map background.
@@ -3157,9 +3157,9 @@
         to downsample the image (``scale=0.5`` downsamples to 2700x1350).
         """
         if ax is not None:
-            self.warpimage(image='bluemarble',ax=ax,scale=scale)
+            return self.warpimage(image='bluemarble',ax=ax,scale=scale,**kwargs)
         else:
-            self.warpimage(image='bluemarble',scale=scale)
+            return self.warpimage(image='bluemarble',scale=scale,**kwargs)
 
     def warpimage(self,image="bluemarble",scale=None,**kwargs):
         """
@@ -3312,10 +3312,10 @@
                     # make points outside projection limb transparent.
                     self._bm_rgba_warped = self._bm_rgba_warped.filled(0.)
             # plot warped rgba image.
-            im = self.imshow(self._bm_rgba_warped,ax=ax)
+            im = self.imshow(self._bm_rgba_warped,ax=ax,**kwargs)
         else:
             # bmproj True, no interpolation necessary.
-            im = self.imshow(self._bm_rgba,ax=ax)
+            im = self.imshow(self._bm_rgba,ax=ax,**kwargs)
         return im
 
     def drawmapscale(self,lon,lat,lon0,lat0,length,barstyle='simple',\

Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py	2008-12-12 03:33:51 UTC (rev 6575)
+++ trunk/toolkits/basemap/setup.py	2008-12-12 12:22:15 UTC (rev 6576)
@@ -182,7 +182,7 @@
     print 'will not install httplib2'
 
 # Specify all the required mpl data
-pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world','data/bmng.jpg']
+pyproj_datafiles = ['data/epsg', 'data/esri', 'data/esri.extra', 'data/GL27', 'data/nad.lst', 'data/nad27', 'data/nad83', 'data/ntv2_out.dist', 'data/other.extra', 'data/pj_out27.dist', 'data/pj_out83.dist', 'data/proj_def.dat', 'data/README', 'data/td_out.dist', 'data/test27', 'data/test83', 'data/testntv2', 'data/testvarious', 'data/world','data/bmng.jpg','data/bmng_low.jpg']
 boundaryfiles = []
 for resolution in ['c','l','i','h','f']:
     boundaryfiles = boundaryfiles + glob.glob("lib/mpl_toolkits/basemap/data/*_"+resolution+".dat")
@@ -191,7 +191,7 @@
 package_data = {'mpl_toolkits.basemap':pyproj_datafiles+basemap_datafiles}
 setup(
   name              = "basemap",
-  version           = "0.99.2",
+  version           = "0.99.3",
   description       = "Plot data on map projections with matplotlib",
   long_description  = """
   An add-on toolkit for matplotlib that lets you plot data


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