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

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

Revision: 5196
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5196&view=rev
Author:   jswhit
Date:     2008-05-20 04:52:12 -0700 (Tue, 20 May 2008)

Log Message:
-----------
convert more examples to numpy/pyplot namespace

Modified Paths:
--------------
    trunk/toolkits/basemap/examples/README
    trunk/toolkits/basemap/examples/customticks.py
    trunk/toolkits/basemap/examples/fcstmaps.py
    trunk/toolkits/basemap/examples/geos_demo.py
    trunk/toolkits/basemap/examples/geos_demo_2.py
    trunk/toolkits/basemap/examples/geos_demo_3.py
    trunk/toolkits/basemap/examples/hires.py
    trunk/toolkits/basemap/examples/nytolondon.py
    trunk/toolkits/basemap/examples/ortho_demo.py
    trunk/toolkits/basemap/examples/plotcities.py
    trunk/toolkits/basemap/examples/quiver_demo.py
    trunk/toolkits/basemap/examples/randompoints.py

Modified: trunk/toolkits/basemap/examples/README
===================================================================
--- trunk/toolkits/basemap/examples/README	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/README	2008-05-20 11:52:12 UTC (rev 5196)
@@ -52,6 +52,9 @@
 from a jpeg file, then plot only a portion of the full earth (contributed
 by Scott Sinclair, requires PIL).
 
+geos_demo_3.py shows how to make a regional geostationary or orthographic 
+plot, where part of the region is outside the projection limb.
+
 fcstmaps.py is a sample multi-panel plot that accesses
 data over http using the dap module. An internet connection is required.
 

Modified: trunk/toolkits/basemap/examples/customticks.py
===================================================================
--- trunk/toolkits/basemap/examples/customticks.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/customticks.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,37 +1,38 @@
 from mpl_toolkits.basemap import Basemap
-import pylab, numpy
+import numpy as np
+import matplotlib.pyplot as plt
 from matplotlib.ticker import FuncFormatter
 
 # example showing how to create custom tick labels for a cylindrical
 # projection.
 
 def lat2str(deg):
-    min = 60 * (deg - numpy.floor(deg))
-    deg = numpy.floor(deg)
+    min = 60 * (deg - np.floor(deg))
+    deg = np.floor(deg)
     dir = 'N'
     if deg < 0:
         if min != 0.0:
             deg += 1.0
             min -= 60.0
         dir = 'S'
-    return (u"%d\N{DEGREE SIGN} %g' %s") % (numpy.abs(deg),numpy.abs(min),dir)
+    return (u"%d\N{DEGREE SIGN} %g' %s") % (np.abs(deg),np.abs(min),dir)
 
 def lon2str(deg):
-    min = 60 * (deg - numpy.floor(deg))
-    deg = numpy.floor(deg)
+    min = 60 * (deg - np.floor(deg))
+    deg = np.floor(deg)
     dir = 'E'
     if deg < 0:
         if min != 0.0:
             deg += 1.0
             min -= 60.0
         dir = 'W'
-    return (u"%d\N{DEGREE SIGN} %g' %s") % (numpy.abs(deg),numpy.abs(min),dir)
+    return (u"%d\N{DEGREE SIGN} %g' %s") % (np.abs(deg),np.abs(min),dir)
 
 # (1) use matplotlib custom tick formatter
 #     instead of Basemap labelling methods.
 
 # create figure.
-fig=pylab.figure()
+fig=plt.figure()
 # create Basemap instance (regular lat/lon projection).
 # suppress_ticks=False allows custom axes ticks to be used
 # Ticks are suppressed by default, so Basemap methods
@@ -44,7 +45,7 @@
 # background color will be used for oceans.
 m.drawmapboundary(fill_color='aqua')
 # get axes instance.
-ax = pylab.gca()
+ax = plt.gca()
 # add custom ticks.
 # This only works for projection='cyl'.
 def xformat(x, pos=None): return lon2str(x)
@@ -62,7 +63,7 @@
 #     custom formatting function with the 'fmt' keyword.
 
 # create figure.
-fig = pylab.figure()
+fig = plt.figure()
 # create Basemap instance.
 m = Basemap(llcrnrlon=-156.5,llcrnrlat=18.75,urcrnrlon=-154.5,urcrnrlat=20.5,
             resolution='h',projection='cyl')
@@ -73,8 +74,8 @@
 m.drawmapboundary(fill_color='aqua')
 # label meridians and parallels, passing string formatting function
 # with 'fmt' keyword.
-m.drawparallels(numpy.linspace(18,21,7),labels=[1,0,0,0],fmt=lat2str,dashes=[2,2])
-m.drawmeridians(numpy.linspace(-157,-154,7),labels=[0,0,0,1],fmt=lon2str,dashes=[2,2])
-pylab.title('Hawaii')
+m.drawparallels(np.linspace(18,21,7),labels=[1,0,0,0],fmt=lat2str,dashes=[2,2])
+m.drawmeridians(np.linspace(-157,-154,7),labels=[0,0,0,1],fmt=lon2str,dashes=[2,2])
+plt.title('Hawaii')
 
-pylab.show()
+plt.show()

Modified: trunk/toolkits/basemap/examples/fcstmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/fcstmaps.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,8 +1,7 @@
 # this example reads today's numerical weather forecasts 
 # from the NOAA OpenDAP servers and makes a multi-panel plot.
-from pylab import title, show, figure, cm,  figtext, \
-                  meshgrid, axes, colorbar
-import numpy
+import numpy as np
+import matplotlib.pyplot as plt
 import sys
 from numpy import ma
 import datetime
@@ -57,7 +56,7 @@
 
 t2mvar = data.variables['tmp2m']
 t2min = t2mvar[0:ntimes,:,:]
-t2m = numpy.zeros((ntimes,nlats,nlons+1),t2min.dtype)
+t2m = np.zeros((ntimes,nlats,nlons+1),t2min.dtype)
 # create Basemap instance for Orthographic projection.
 m = Basemap(lon_0=-90,lat_0=60,projection='ortho')
 # add wrap-around point in longitude.
@@ -66,25 +65,26 @@
 # convert to celsius.
 t2m = t2m-273.15
 # contour levels
-clevs = numpy.arange(-30,30.1,2.)
-lons, lats = meshgrid(lons, lats)
+clevs = np.arange(-30,30.1,2.)
+lons, lats = np.meshgrid(lons, lats)
 x, y = m(lons, lats)
 # create figure.
-fig=figure(figsize=(6,8))
+fig=plt.figure(figsize=(6,8))
 # make subplots.
 for nt,fcsthr in enumerate(fcsthrs):
     ax = fig.add_subplot(321+nt)
-    cs = m.contourf(x,y,t2m[nt,:,:],clevs,cmap=cm.jet,extend='both')
+    cs = m.contourf(x,y,t2m[nt,:,:],clevs,cmap=plt.cm.jet,extend='both')
     m.drawcoastlines(linewidth=0.5)
     m.drawcountries()
-    m.drawparallels(numpy.arange(-80,81,20))
-    m.drawmeridians(numpy.arange(0,360,20))
+    m.drawparallels(np.arange(-80,81,20))
+    m.drawmeridians(np.arange(0,360,20))
     # panel title
-    title('%d-h forecast valid '%fcsthr+verifdates[nt],fontsize=9)
+    plt.title('%d-h forecast valid '%fcsthr+verifdates[nt],fontsize=9)
 # figure title
-figtext(0.5,0.95,u"2-m temp (\N{DEGREE SIGN}C) forecasts from %s"%verifdates[0],
-        horizontalalignment='center',fontsize=14)
+plt.figtext(0.5,0.95,
+            u"2-m temp (\N{DEGREE SIGN}C) forecasts from %s"%verifdates[0],
+            horizontalalignment='center',fontsize=14)
 # a single colorbar.
-cax = axes([0.1, 0.03, 0.8, 0.025])
-colorbar(cax=cax, orientation='horizontal')
-show()
+cax = plt.axes([0.1, 0.03, 0.8, 0.025])
+plt.colorbar(cax=cax, orientation='horizontal')
+plt.show()

Modified: trunk/toolkits/basemap/examples/geos_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/geos_demo.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/geos_demo.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,11 +1,12 @@
 from mpl_toolkits.basemap import Basemap
-from pylab import title, show, arange, figure
+import numpy as np
+import matplotlib.pyplot as plt
 
 # create Basemap instance for Geostationary (satellite view) projection.
 lon_0 = float(raw_input('enter reference longitude (lon_0):'))
 
 # map with land/sea mask plotted
-fig=figure()
+fig=plt.figure()
 m = Basemap(projection='geos',lon_0=lon_0,rsphere=(6378137.00,6356752.3142),resolution=None)
 # plot land-sea mask.
 rgba_land = (0,255,0,255) # land green.
@@ -13,21 +14,21 @@
 # lakes=True means plot inland lakes with ocean color.
 m.drawlsmask(rgba_land, rgba_ocean, lakes=True)
 # draw parallels and meridians.
-m.drawparallels(arange(-90.,120.,30.))
-m.drawmeridians(arange(0.,420.,60.))
+m.drawparallels(np.arange(-90.,120.,30.))
+m.drawmeridians(np.arange(0.,420.,60.))
 m.drawmapboundary()
-title('Geostationary Map Centered on Lon=%s' % (lon_0))
+plt.title('Geostationary Map Centered on Lon=%s' % (lon_0))
 
 # map with continents drawn and filled.
-fig = figure()
+fig = plt.figure()
 m = Basemap(projection='geos',lon_0=lon_0,rsphere=(6378137.00,6356752.3142),resolution='l')
 m.drawcoastlines()
 m.drawmapboundary(fill_color='aqua')
 m.fillcontinents(color='coral',lake_color='aqua')
 m.drawcountries()
 # draw parallels and meridians.
-m.drawparallels(arange(-90.,120.,30.))
-m.drawmeridians(arange(0.,420.,60.))
+m.drawparallels(np.arange(-90.,120.,30.))
+m.drawmeridians(np.arange(0.,420.,60.))
 m.drawmapboundary()
-title('Geostationary Map Centered on Lon=%s' % (lon_0))
-show()
+plt.title('Geostationary Map Centered on Lon=%s' % (lon_0))
+plt.show()

Modified: trunk/toolkits/basemap/examples/geos_demo_2.py
===================================================================
--- trunk/toolkits/basemap/examples/geos_demo_2.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/geos_demo_2.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -10,7 +10,8 @@
 """
 from PIL import Image
 from mpl_toolkits.basemap import Basemap
-from pylab import figure, cm, arange, colorbar, text, savefig, gcf, clim, title, show
+import numpy as np
+import matplotlib.pyplot as plt
 from matplotlib.image import pil_to_array
 
 plot_name = 'geos_demo.png'
@@ -30,25 +31,25 @@
 lon_0 = 0.0
 satellite_height = 35785831.0
 
-fig = figure(figsize=(7,7))
+fig = plt.figure(figsize=(7,7))
 ax = fig.add_axes((0.1,0.1,0.8,0.8))
 # create Basemap instance for a Geostationary projection.
 m = Basemap(projection='geos', lon_0=lon_0, satellite_height=satellite_height,
             resolution='l', llcrnrlon=ll_lon, llcrnrlat=ll_lat, urcrnrlon=ur_lon, urcrnrlat=ur_lat)
 # add data
-m.imshow(data, cmap=cm.gray, interpolation='nearest')
-clim(0, 255)
+m.imshow(data, cmap=plt.cm.gray, interpolation='nearest')
+plt.clim(0, 255)
 # draw coastlines.
 m.drawcoastlines(linewidth=0.5, color=overlay_color)
 m.drawcountries(linewidth=0.5, color=overlay_color)
 # can't label meridians on bottom, because labels would
 # be outside map projection region.
-m.drawmeridians(arange(10,76,5), labels=[0,0,1,0], color=overlay_color)
-m.drawparallels(arange(-90,90,5), labels=[1,0,0,0], color=overlay_color)
+m.drawmeridians(np.arange(10,76,5), labels=[0,0,1,0], color=overlay_color)
+m.drawparallels(np.arange(-90,90,5), labels=[1,0,0,0], color=overlay_color)
 # add a colobar
-#colorbar()
+#plt.colorbar()
 # add timestamp and save
-fig = gcf()
+fig = plt.gcf()
 fig.text(x=0.275, y=0.025, s=u'Meteosat-9 VIS 0.6 channel - 12:00 UTC 04/06/2007\n    \N{COPYRIGHT SIGN} EUMETSAT 2007',
             horizontalalignment='left',
             verticalalignment='bottom',
@@ -56,8 +57,8 @@
             fontweight='bold',
             bbox=dict(facecolor='gray', alpha=0.25, pad=15))
 fig.set_size_inches((8, 6))
-title('Meteosat Geostationary Satellite Image - Portion of Full Earth',y=1.05,fontsize=12)
+plt.title('Meteosat Geostationary Satellite Image - Portion of Full Earth',y=1.05,fontsize=12)
 
-show()
+plt.show()
 #fig.savefig(plot_name)
 #print 'Plot saved to %s' % (plot_name)

Modified: trunk/toolkits/basemap/examples/geos_demo_3.py
===================================================================
--- trunk/toolkits/basemap/examples/geos_demo_3.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/geos_demo_3.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,7 +1,8 @@
 from mpl_toolkits.basemap import Basemap
-from pylab import title, show, arange, figure
+import numpy as np
+import matplotlib.pyplot as plt
 
-fig = figure()
+fig = plt.figure()
 lon_0=57
 # global geos map
 m1 = Basemap(projection='geos',lon_0=lon_0,rsphere=(6378137.00,6356752.3142),resolution=None)
@@ -13,12 +14,12 @@
 m.fillcontinents(color='coral',lake_color='aqua')
 m.drawcountries()
 # draw parallels and meridians.
-m.drawparallels(arange(-90.,120.,30.))
-m.drawmeridians(arange(0.,420.,60.))
+m.drawparallels(np.arange(-90.,120.,30.))
+m.drawmeridians(np.arange(0.,420.,60.))
 m.drawmapboundary()
-title('Geostationary Map Centered on Lon=%s' % lon_0)
+plt.title('Geostationary Map Centered on Lon=%s' % lon_0)
 
-fig = figure()
+fig = plt.figure()
 # global ortho map
 lat_0=10.
 m1 = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution=None)
@@ -30,9 +31,9 @@
 m.fillcontinents(color='coral',lake_color='aqua')
 m.drawcountries()
 # draw parallels and meridians.
-m.drawparallels(arange(-90.,120.,30.))
-m.drawmeridians(arange(0.,420.,60.))
+m.drawparallels(np.arange(-90.,120.,30.))
+m.drawmeridians(np.arange(0.,420.,60.))
 m.drawmapboundary()
-title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
+plt.title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
 
-show()
+plt.show()

Modified: trunk/toolkits/basemap/examples/hires.py
===================================================================
--- trunk/toolkits/basemap/examples/hires.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/hires.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,16 +1,17 @@
 from mpl_toolkits.basemap import Basemap
-from pylab import show, title, arange, figure, clf
+import numpy as np
+import matplotlib.pyplot as plt
 import cPickle, time
 
 # create figure with aqua background (will be oceans)
-fig = figure()
+fig = plt.figure()
 
 # create Basemap instance. Use 'high' resolution coastlines.
 t1 = time.clock()
 #m = Basemap(llcrnrlon=-10.5,llcrnrlat=49.5,urcrnrlon=3.5,urcrnrlat=59.5,
 #            resolution='h',projection='tmerc',lon_0=-4,lat_0=0)
 m = Basemap(width=920000,height=1100000,
-            resolution='h',projection='tmerc',lon_0=-4.2,lat_0=54.6)
+            resolution='f',projection='tmerc',lon_0=-4.2,lat_0=54.6)
 # make sure countries and rivers are loaded
 m.drawcountries()
 m.drawrivers()
@@ -20,7 +21,7 @@
 cPickle.dump(m,open('map.pickle','wb'),-1)
 
 # clear the figure
-clf()
+plt.clf()
 # read cPickle back in and plot it again (should be much faster).
 t1 = time.clock()
 m2 = cPickle.load(open('map.pickle','rb'))
@@ -37,10 +38,10 @@
 m.drawrivers(color='b')
 print time.clock()-t1,' secs to plot using using a pickled Basemap instance'
 # draw parallels
-circles = arange(48,65,2).tolist()
+circles = np.arange(48,65,2).tolist()
 m.drawparallels(circles,labels=[1,1,0,0])
 # draw meridians
-meridians = arange(-12,13,2)
+meridians = np.arange(-12,13,2)
 m.drawmeridians(meridians,labels=[0,0,1,1])
-title("High-Res British Isles",y=1.04)
-show()
+plt.title("High-Res British Isles",y=1.04)
+plt.show()

Modified: trunk/toolkits/basemap/examples/nytolondon.py
===================================================================
--- trunk/toolkits/basemap/examples/nytolondon.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/nytolondon.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,10 +1,11 @@
 # example demonstrating how to draw a great circle on a map.
 from mpl_toolkits.basemap import Basemap
-from pylab import title, arange, show, figure
+import numpy as np
+import matplotlib.pyplot as plt
 
 # setup lambert azimuthal map projection.
 # create new figure
-fig=figure()
+fig=plt.figure()
 m = Basemap(llcrnrlon=-100.,llcrnrlat=20.,urcrnrlon=20.,urcrnrlat=60.,\
             rsphere=(6378137.00,6356752.3142),\
             resolution='c',area_thresh=10000.,projection='merc',\
@@ -24,16 +25,16 @@
 m.drawcoastlines()
 m.fillcontinents()
 # draw parallels
-circles = arange(10,90,20)
+circles = np.arange(10,90,20)
 m.drawparallels(circles,labels=[1,1,0,1])
 # draw meridians
-meridians = arange(-180,180,30)
+meridians = np.arange(-180,180,30)
 m.drawmeridians(meridians,labels=[1,1,0,1])
-title('Great Circle from New York to London (Mercator)')
+plt.title('Great Circle from New York to London (Mercator)')
 print 'plotting Great Circle from New York to London (Mercator)'
 
 # create new figure
-fig=figure()
+fig=plt.figure()
 # setup a gnomonic projection.
 m = Basemap(llcrnrlon=-100.,llcrnrlat=20.,urcrnrlon=20.,urcrnrlat=60.,\
             resolution='c',area_thresh=10000.,projection='gnom',\
@@ -53,11 +54,11 @@
 m.drawcoastlines()
 m.fillcontinents()
 # draw parallels
-circles = arange(10,90,20)
+circles = np.arange(10,90,20)
 m.drawparallels(circles,labels=[0,1,0,0])
 # draw meridians
-meridians = arange(-180,180,30)
+meridians = np.arange(-180,180,30)
 m.drawmeridians(meridians,labels=[1,1,0,1])
-title('Great Circle from New York to London (Gnomonic)')
+plt.title('Great Circle from New York to London (Gnomonic)')
 print 'plotting Great Circle from New York to London (Gnomonic)'
-show()
+plt.show()

Modified: trunk/toolkits/basemap/examples/ortho_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/ortho_demo.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/ortho_demo.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,12 +1,13 @@
 from mpl_toolkits.basemap import Basemap
-from pylab import title, show, arange, figure
+import numpy as np
+import matplotlib.pyplot as plt
 
 # create Basemap instance for Orthographic (satellite view) projection.
 lon_0 = float(raw_input('enter reference longitude (lon_0):'))
 lat_0 = float(raw_input('enter reference latitude (lat_0):'))
 
 # map with land/sea mask plotted
-fig = figure()
+fig = plt.figure()
 m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution=None)
 # plot land-sea mask.
 rgba_land = (0,255,0,255) # land green.
@@ -14,20 +15,20 @@
 # lakes=True means plot inland lakes with ocean color.
 m.drawlsmask(rgba_land, rgba_ocean, lakes=True)
 # draw parallels and meridians.
-m.drawparallels(arange(-90.,120.,30.))
-m.drawmeridians(arange(0.,420.,60.))
+m.drawparallels(np.arange(-90.,120.,30.))
+m.drawmeridians(np.arange(0.,420.,60.))
 m.drawmapboundary()
-title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
+plt.title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
 
 # map with continents drawn and filled.
-fig = figure()
+fig = plt.figure()
 m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution='l')
 m.drawcoastlines()
 m.fillcontinents(color='coral',lake_color='aqua')
 m.drawcountries()
 # draw parallels and meridians.
-m.drawparallels(arange(-90.,120.,30.))
-m.drawmeridians(arange(0.,420.,60.))
+m.drawparallels(np.arange(-90.,120.,30.))
+m.drawmeridians(np.arange(0.,420.,60.))
 m.drawmapboundary(fill_color='aqua')
 # add a map scale.
 length = 5000 
@@ -35,5 +36,5 @@
 lon1,lat1 = m(x1,y1,inverse=True)
 m.drawmapscale(lon1,lat1,lon_0,lat_0,length,fontsize=8,barstyle='fancy',\
                labelstyle='fancy',units='km')
-title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
-show()
+plt.title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
+plt.show()

Modified: trunk/toolkits/basemap/examples/plotcities.py
===================================================================
--- trunk/toolkits/basemap/examples/plotcities.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/plotcities.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,6 +1,5 @@
-import pylab as p
 from matplotlib.mlab import prctile_rank
-import numpy
+import matplotlib.pyplot as plt
 from mpl_toolkits.basemap import Basemap as Basemap
 
 # cities colored by population rank.
@@ -16,9 +15,9 @@
 popranks = prctile_rank(pop,100)
 colors = []
 for rank in popranks:
-    colors.append(p.cm.jet(float(rank)/100.))
+    colors.append(plt.cm.jet(float(rank)/100.))
 m.drawcoastlines()
 m.fillcontinents()
 m.scatter(x,y,25,colors,marker='o',faceted=False,zorder=10)
-p.title('City Locations colored by Population Rank')
-p.show()
+plt.title('City Locations colored by Population Rank')
+plt.show()

Modified: trunk/toolkits/basemap/examples/quiver_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/quiver_demo.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/quiver_demo.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,7 +1,6 @@
 from mpl_toolkits.basemap import Basemap
-import numpy
-from pylab import show, title, arange, meshgrid, cm, figure, \
-                  colorbar, axes, gca, reshape, quiverkey
+import numpy as np
+import matplotlib.pyplot as plt
 
 # read in data.
 file = open('fcover.dat','r')
@@ -13,12 +12,12 @@
    ul.append(float(l[0]))
    vl.append(float(l[1]))
    pl.append(float(l[2]))
-u = reshape(numpy.array(ul,numpy.float32),(nlats,nlons))
-v = reshape(numpy.array(vl,numpy.float32),(nlats,nlons))
-p = reshape(numpy.array(pl,numpy.float32),(nlats,nlons))
-lats1 = -90.+dellat*arange(nlats)
-lons1 = -180.+dellon*arange(nlons)
-lons, lats = meshgrid(lons1, lats1)
+u = np.reshape(np.array(ul,np.float32),(nlats,nlons))
+v = np.reshape(np.array(vl,np.float32),(nlats,nlons))
+p = np.reshape(np.array(pl,np.float32),(nlats,nlons))
+lats1 = -90.+dellat*np.arange(nlats)
+lons1 = -180.+dellon*np.arange(nlons)
+lons, lats = np.meshgrid(lons1, lats1)
 
 # plot vectors in geographical (lat/lon) coordinates.
 
@@ -26,32 +25,32 @@
 m = Basemap(lon_0=-135,boundinglat=25,
             resolution='c',area_thresh=10000.,projection='npstere')
 # create a figure, add an axes.
-fig=figure(figsize=(8,8))
+fig=plt.figure(figsize=(8,8))
 ax = fig.add_axes([0.1,0.1,0.7,0.7])
 # rotate wind vectors to map projection coordinates.
 # (also compute native map projections coordinates of lat/lon grid)
 # only do Northern Hemisphere.
 urot,vrot,x,y = m.rotate_vector(u[36:,:],v[36:,:],lons[36:,:],lats[36:,:],returnxy=True)
 # plot filled contours over map.
-cs = m.contourf(x,y,p[36:,:],15,cmap=cm.jet)
+cs = m.contourf(x,y,p[36:,:],15,cmap=plt.cm.jet)
 # plot wind vectors over map.
 Q = m.quiver(x,y,urot,vrot) #or specify, e.g., width=0.003, scale=400)
-qk = quiverkey(Q, 0.95, 1.05, 25, '25 m/s', labelpos='W')
-cax = axes([0.875, 0.1, 0.05, 0.7]) # setup colorbar axes.
-colorbar(cax=cax) # draw colorbar
-axes(ax)  # make the original axes current again
+qk = plt.quiverkey(Q, 0.95, 1.05, 25, '25 m/s', labelpos='W')
+cax = plt.axes([0.875, 0.1, 0.05, 0.7]) # setup colorbar axes.
+plt.colorbar(cax=cax) # draw colorbar
+plt.axes(ax)  # make the original axes current again
 m.drawcoastlines()
 m.drawcountries()
 # draw parallels
 delat = 20.
-circles = arange(0.,90.+delat,delat).tolist()+\
-          arange(-delat,-90.-delat,-delat).tolist()
+circles = np.arange(0.,90.+delat,delat).tolist()+\
+          np.arange(-delat,-90.-delat,-delat).tolist()
 m.drawparallels(circles,labels=[1,1,1,1])
 # draw meridians
 delon = 45.
-meridians = arange(-180,180,delon)
+meridians = np.arange(-180,180,delon)
 m.drawmeridians(meridians,labels=[1,1,1,1])
-title('Surface Winds Winds and Pressure (lat-lon grid)',y=1.075)
+plt.title('Surface Winds Winds and Pressure (lat-lon grid)',y=1.075)
  
 # plot vectors in map projection coordinates.
 
@@ -62,30 +61,30 @@
 # and interpolation).
 nxv = 41; nyv = 41
 nxp = 101; nyp = 101
-spd = numpy.sqrt(u**2+v**2)
+spd = np.sqrt(u**2+v**2)
 udat, vdat, xv, yv = m.transform_vector(u,v,lons1,lats1,nxv,nyv,returnxy=True)
 pdat, xp, yp = m.transform_scalar(p,lons1,lats1,nxp,nyp,returnxy=True)
 # create a figure, add an axes.
-fig=figure(figsize=(8,8))
+fig=plt.figure(figsize=(8,8))
 ax = fig.add_axes([0.1,0.1,0.7,0.7])
 # plot image over map
-im = m.imshow(pdat,cm.jet)
+im = m.imshow(pdat,plt.cm.jet)
 # plot wind vectors over map.
 Q = m.quiver(xv,yv,udat,vdat) #or specify, e.g., width=0.003, scale=400)
-qk = quiverkey(Q, 0.95, 1.05, 25, '25 m/s', labelpos='W')
-cax = axes([0.875, 0.1, 0.05, 0.7]) # setup colorbar axes.
-colorbar(cax=cax) # draw colorbar
-axes(ax)  # make the original axes current again
+qk = plt.quiverkey(Q, 0.95, 1.05, 25, '25 m/s', labelpos='W')
+cax = plt.axes([0.875, 0.1, 0.05, 0.7]) # setup colorbar axes.
+plt.colorbar(cax=cax) # draw colorbar
+plt.axes(ax)  # make the original axes current again
 m.drawcoastlines()
 m.drawcountries()
 # draw parallels
 delat = 20.
-circles = arange(0.,90.+delat,delat).tolist()+\
-          arange(-delat,-90.-delat,-delat).tolist()
+circles = np.arange(0.,90.+delat,delat).tolist()+\
+          np.arange(-delat,-90.-delat,-delat).tolist()
 m.drawparallels(circles,labels=[1,1,1,1])
 # draw meridians
 delon = 45.
-meridians = arange(-180,180,delon)
+meridians = np.arange(-180,180,delon)
 m.drawmeridians(meridians,labels=[1,1,1,1])
-title('Surface Winds Winds and Pressure (projection grid)',y=1.075)
-show()
+plt.title('Surface Winds Winds and Pressure (projection grid)',y=1.075)
+plt.show()

Modified: trunk/toolkits/basemap/examples/randompoints.py
===================================================================
--- trunk/toolkits/basemap/examples/randompoints.py	2008-05-19 19:09:35 UTC (rev 5195)
+++ trunk/toolkits/basemap/examples/randompoints.py	2008-05-20 11:52:12 UTC (rev 5196)
@@ -1,4 +1,5 @@
-from pylab import show, title, arange, figure, title, arccos, pi, cm, text
+import numpy as np
+import matplotlib.pyplot as plt
 from matplotlib.colors import rgb2hex
 from mpl_toolkits.basemap import Basemap
 from numpy.random import uniform
@@ -18,16 +19,16 @@
 v = uniform(0.,1.,size=npts)
 z = uniform(0,100,size=npts)
 lons = 360.*u
-lats = (180./pi)*arccos(2*v-1) - 90.
+lats = (180./np.pi)*np.arccos(2*v-1) - 90.
 # transform lons and lats to map coordinates.
 x,y = m(lons,lats)
 # plot them as filled circles on the map.
 # first, create a figure.
-fig=figure()
+fig=plt.figure()
 # draw colored markers.
 # use zorder=10 to make sure markers are drawn last.
 # (otherwise they are covered up when continents are filled)
-#m.scatter(x,y,25,z,cmap=cm.jet,marker='o',faceted=False,zorder=10) 
+#m.scatter(x,y,25,z,cmap=plt.cm.jet,marker='o',faceted=False,zorder=10) 
 # create a list of strings containing z values
 # or, plot actual numbers as color-coded text strings.
 zn = [ '%2i' % zz for zz in z ]
@@ -35,8 +36,8 @@
 for numstr,zval,xpt,ypt in zip(zn,z,x,y):
     # only plot values inside map region.
     if xpt > m.xmin and xpt < m.xmax and ypt > m.ymin and ypt < m.ymax:
-        hexcolor = rgb2hex(cm.jet(zval/100.)[:3])
-        text(xpt,ypt,numstr,fontsize=9,weight='bold',color=hexcolor)
+        hexcolor = rgb2hex(plt.cm.jet(zval/100.)[:3])
+        plt.text(xpt,ypt,numstr,fontsize=9,weight='bold',color=hexcolor)
 # draw coasts and fill continents/lakes.
 m.drawcoastlines(linewidth=0.5)
 m.fillcontinents(color='coral',lake_color='aqua')
@@ -44,11 +45,11 @@
 m.drawmapboundary(fill_color='aqua')
 # draw parallels and meridians.
 delat = 20.
-circles = arange(0.,90.,delat).tolist()+\
-          arange(-delat,-90,-delat).tolist()
+circles = np.arange(0.,90.,delat).tolist()+\
+          np.arange(-delat,-90,-delat).tolist()
 m.drawparallels(circles)
 delon = 45.
-meridians = arange(0,360,delon)
+meridians = np.arange(0,360,delon)
 m.drawmeridians(meridians,labels=[1,1,1,1])
-title('Random Points',y=1.075)
-show()
+plt.title('Random Points',y=1.075)
+plt.show()


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