Revision: 4520
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4520&view=rev
Author: jswhit
Date: 2007-11-30 06:43:11 -0800 (Fri, 30 Nov 2007)
Log Message:
-----------
remove numerix imports
Modified Paths:
--------------
trunk/toolkits/basemap/examples/ccsm_popgrid.py
trunk/toolkits/basemap/examples/fcstmaps.py
trunk/toolkits/basemap/examples/fillstates.py
trunk/toolkits/basemap/examples/plotmap_masked.py
trunk/toolkits/basemap/examples/plotmap_oo.py
trunk/toolkits/basemap/examples/simpletest_oo.py
Modified: trunk/toolkits/basemap/examples/ccsm_popgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/ccsm_popgrid.py 2007-11-30 14:36:43 UTC
(rev 4519)
+++ trunk/toolkits/basemap/examples/ccsm_popgrid.py 2007-11-30 14:43:11 UTC
(rev 4520)
@@ -22,13 +22,8 @@
"""
import pylab as pl
from matplotlib import rcParams
-try:
- import numpy
- rcParams['numerix'] = 'numpy'
-except:
- raise ImportError('this example requires numpy')
-import matplotlib.numerix.ma as MA
-import matplotlib.numerix as N
+from numpy import ma as MA
+import numpy as N
from matplotlib.toolkits.basemap import Basemap, NetCDFFile
# read in data from netCDF file.
Modified: trunk/toolkits/basemap/examples/fcstmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps.py 2007-11-30 14:36:43 UTC (rev
4519)
+++ trunk/toolkits/basemap/examples/fcstmaps.py 2007-11-30 14:43:11 UTC (rev
4520)
@@ -4,7 +4,7 @@
meshgrid, axes, colorbar
import numpy
import sys
-from matplotlib.numerix import ma
+from numpy import ma
import datetime
from matplotlib.toolkits.basemap import Basemap, NetCDFFile, addcyclic
Modified: trunk/toolkits/basemap/examples/fillstates.py
===================================================================
--- trunk/toolkits/basemap/examples/fillstates.py 2007-11-30 14:36:43 UTC
(rev 4519)
+++ trunk/toolkits/basemap/examples/fillstates.py 2007-11-30 14:43:11 UTC
(rev 4520)
@@ -1,5 +1,5 @@
import pylab as p
-import matplotlib.numerix as nx
+import numpy
from matplotlib.toolkits.basemap import Basemap as Basemap
from matplotlib.colors import rgb2hex
from matplotlib.patches import Polygon
@@ -90,7 +90,7 @@
poly = Polygon(seg,facecolor=color,edgecolor=color)
ax.add_patch(poly)
# draw meridians and parallels.
-m.drawparallels(nx.arange(25,65,20),labels=[1,0,0,0])
-m.drawmeridians(nx.arange(-120,-40,20),labels=[0,0,0,1])
+m.drawparallels(numpy.arange(25,65,20),labels=[1,0,0,0])
+m.drawmeridians(numpy.arange(-120,-40,20),labels=[0,0,0,1])
p.title('Filling State Polygons by Population Density')
p.show()
Modified: trunk/toolkits/basemap/examples/plotmap_masked.py
===================================================================
--- trunk/toolkits/basemap/examples/plotmap_masked.py 2007-11-30 14:36:43 UTC
(rev 4519)
+++ trunk/toolkits/basemap/examples/plotmap_masked.py 2007-11-30 14:43:11 UTC
(rev 4520)
@@ -8,7 +8,7 @@
from matplotlib.toolkits.basemap import Basemap, shiftgrid
from pylab import title, colorbar, show, axes, cm, load, arange, figure, \
text, where
-from matplotlib.numerix import ma
+from numpy import ma
import matplotlib.colors as colors
# read in topo data (on a regular lat/lon grid)
Modified: trunk/toolkits/basemap/examples/plotmap_oo.py
===================================================================
--- trunk/toolkits/basemap/examples/plotmap_oo.py 2007-11-30 14:36:43 UTC
(rev 4519)
+++ trunk/toolkits/basemap/examples/plotmap_oo.py 2007-11-30 14:43:11 UTC
(rev 4520)
@@ -14,7 +14,7 @@
from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
from matplotlib.toolkits.basemap import Basemap, shiftgrid
from matplotlib.figure import Figure
-import matplotlib.numerix as NX
+import numpy
import matplotlib.cm as cm
from matplotlib.mlab import load
@@ -57,9 +57,9 @@
m.drawstates()
# draw parallels and meridians.
# label on left, right and bottom of map.
-parallels = NX.arange(0.,80,20.)
+parallels = numpy.arange(0.,80,20.)
m.drawparallels(parallels,labels=[1,1,0,1])
-meridians = NX.arange(10.,360.,30.)
+meridians = numpy.arange(10.,360.,30.)
m.drawmeridians(meridians,labels=[1,1,0,1])
# set title.
ax.set_title('ETOPO Topography - Lambert Conformal Conic')
Modified: trunk/toolkits/basemap/examples/simpletest_oo.py
===================================================================
--- trunk/toolkits/basemap/examples/simpletest_oo.py 2007-11-30 14:36:43 UTC
(rev 4519)
+++ trunk/toolkits/basemap/examples/simpletest_oo.py 2007-11-30 14:43:11 UTC
(rev 4520)
@@ -7,8 +7,7 @@
from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
from matplotlib.toolkits.basemap import Basemap
from matplotlib.figure import Figure
-from numpy import meshgrid
-import matplotlib.numerix as nx
+import numpy
import matplotlib.cm as cm
from matplotlib.mlab import load
@@ -26,15 +25,15 @@
# set 'ax' keyword so pylab won't be imported.
m = Basemap(projection='robin',lon_0=0.5*(lons[0]+lons[-1]),ax=ax)
# make filled contour plot.
-x, y = m(*meshgrid(lons, lats))
+x, y = m(*numpy.meshgrid(lons, lats))
cs = m.contourf(x,y,etopo,30,cmap=cm.jet)
# draw coastlines.
m.drawcoastlines()
# draw a line around the map region.
m.drawmapboundary()
# draw parallels and meridians.
-m.drawparallels(nx.arange(-60.,90.,30.),labels=[1,0,0,0],fontsize=10)
-m.drawmeridians(nx.arange(0.,420.,60.),labels=[0,0,0,1],fontsize=10)
+m.drawparallels(numpy.arange(-60.,90.,30.),labels=[1,0,0,0],fontsize=10)
+m.drawmeridians(numpy.arange(0.,420.,60.),labels=[0,0,0,1],fontsize=10)
# add a title.
ax.set_title('Robinson Projection')
# add a colorbar.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
