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

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

Revision: 5157
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5157&view=rev
Author:   jswhit
Date:     2008-05-16 13:15:36 -0700 (Fri, 16 May 2008)

Log Message:
-----------
convert more examples to pyplot and numpy namespaces.

Modified Paths:
--------------
    trunk/toolkits/basemap/examples/simpletest.py
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py

Modified: trunk/toolkits/basemap/examples/simpletest.py
===================================================================
--- trunk/toolkits/basemap/examples/simpletest.py	2008-05-16 20:09:54 UTC (rev 5156)
+++ trunk/toolkits/basemap/examples/simpletest.py	2008-05-16 20:15:36 UTC (rev 5157)
@@ -1,22 +1,23 @@
 from mpl_toolkits.basemap import Basemap
-from pylab import load, show, title, meshgrid, cm, arange
+import numpy as np
+import matplotlib.pyplot as plt
+import matplotlib.mlab as mlab
 # read in topo data (on a regular lat/lon grid)
-etopo=load('etopo20data.gz')
-lons=load('etopo20lons.gz')
-lats=load('etopo20lats.gz')
+etopo=mlab.load('etopo20data.gz')
+lons=mlab.load('etopo20lons.gz')
+lats=mlab.load('etopo20lats.gz')
 # create Basemap instance for Robinson projection.
 m = Basemap(projection='robin',lon_0=0.5*(lons[0]+lons[-1]))
 # make filled contour plot.
-x, y = m(*meshgrid(lons, lats))
-cs = m.contourf(x,y,etopo,30,cmap=cm.jet)
+x, y = m(*np.meshgrid(lons, lats))
+cs = m.contourf(x,y,etopo,30,cmap=plt.cm.jet)
 # draw coastlines.
 m.drawcoastlines()
 # draw a line around the map region.
 m.drawmapboundary()
 # draw parallels and meridians.
-m.drawparallels(arange(-60.,90.,30.),labels=[1,0,0,0])
-m.drawmeridians(arange(0.,420.,60.),labels=[0,0,0,1])
+m.drawparallels(np.arange(-60.,90.,30.),labels=[1,0,0,0])
+m.drawmeridians(np.arange(0.,420.,60.),labels=[0,0,0,1])
 # add a title.
-title('Robinson Projection')
-show()
-
+plt.title('Robinson Projection')
+plt.show()

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py	2008-05-16 20:09:54 UTC (rev 5156)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/basemap.py	2008-05-16 20:15:36 UTC (rev 5157)
@@ -305,23 +305,25 @@
     Example Usage:
 
     >>> from mpl_toolkits.basemap import Basemap
-    >>> from pylab import load, meshgrid, title, arange, show
+    >>> import numpy as np
+    >>> import matplotlib.pyplot as plt
+    >>> import matplotlib.mlab as mlab
     >>> # read in topo data (on a regular lat/lon grid)
-    >>> etopo = load('etopo20data.gz')
-    >>> lons  = load('etopo20lons.gz')
-    >>> lats  = load('etopo20lats.gz')
+    >>> etopo = mlab.load('etopo20data.gz')
+    >>> lons  = mlab.load('etopo20lons.gz')
+    >>> lats  = mlab.load('etopo20lats.gz')
     >>> # create Basemap instance for Robinson projection.
     >>> m = Basemap(projection='robin',lon_0=0.5*(lons[0]+lons[-1]))
     >>> # compute native map projection coordinates for lat/lon grid.
-    >>> x, y = m(*meshgrid(lons,lats))
+    >>> x, y = m(*np.meshgrid(lons,lats))
     >>> # make filled contour plot.
-    >>> cs = m.contourf(x,y,etopo,30,cmap=cm.jet)
+    >>> cs = m.contourf(x,y,etopo,30,cmap=plt.cm.jet)
     >>> m.drawcoastlines() # draw coastlines
     >>> m.drawmapboundary() # draw a line around the map region
-    >>> m.drawparallels(arange(-90.,120.,30.),labels=[1,0,0,0]) # draw parallels
-    >>> m.drawmeridians(arange(0.,420.,60.),labels=[0,0,0,1]) # draw meridians
-    >>> title('Robinson Projection') # add a title
-    >>> show()
+    >>> m.drawparallels(np.arange(-90.,120.,30.),labels=[1,0,0,0]) # draw parallels
+    >>> m.drawmeridians(np.arange(0.,420.,60.),labels=[0,0,0,1]) # draw meridians
+    >>> plt.title('Robinson Projection') # add a title
+    >>> plt.show()
 
     [this example (simpletest.py) plus many others can be found in the
      examples directory of source distribution.  The "OO" version of this


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