matplotlib-checkins Mailing List for matplotlib

Revision: 8531
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8531&view=rev
Author: jswhit
Date: 2010年07月07日 15:22:38 +0000 (2010年7月07日)
Log Message:
-----------
prepare for 1.0 release
Modified Paths:
--------------
 trunk/toolkits/basemap/Changelog
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2010年07月07日 14:20:14 UTC (rev 8530)
+++ trunk/toolkits/basemap/Changelog	2010年07月07日 15:22:38 UTC (rev 8531)
@@ -1,4 +1,4 @@
-version 1.0 (not yet released)
+version 1.0 (svn revision 8531)
 	 * don't force adjustable='box' so Basemap is compatible
 with AxesGrid. Added fcstmaps_axesgrid.py example.
 * add support for plotting on unstructured grids using
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8530
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8530&view=rev
Author: jswhit
Date: 2010年07月07日 14:20:14 +0000 (2010年7月07日)
Log Message:
-----------
fix ortho example
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/contour_demo.py
Modified: trunk/toolkits/basemap/examples/contour_demo.py
===================================================================
--- trunk/toolkits/basemap/examples/contour_demo.py	2010年07月07日 14:02:04 UTC (rev 8529)
+++ trunk/toolkits/basemap/examples/contour_demo.py	2010年07月07日 14:20:14 UTC (rev 8530)
@@ -123,7 +123,7 @@
 fig=plt.figure()
 # setup of orthographic basemap
 m = Basemap(resolution='c',projection='ortho',\
- lat_0=50.,lon_0=-120.)
+ lat_0=45.,lon_0=-120.)
 ax = fig.add_axes([0.1,0.1,0.7,0.7])
 # make a filled contour plot.
 x, y = m(lons, lats)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8529
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8529&view=rev
Author: jswhit
Date: 2010年07月07日 14:02:04 +0000 (2010年7月07日)
Log Message:
-----------
update URLs
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/fcstmaps.py
 trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
Modified: trunk/toolkits/basemap/examples/fcstmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps.py	2010年07月07日 13:59:29 UTC (rev 8528)
+++ trunk/toolkits/basemap/examples/fcstmaps.py	2010年07月07日 14:02:04 UTC (rev 8529)
@@ -15,16 +15,20 @@
 YYYYMMDD = datetime.datetime.today().strftime('%Y%m%d')
 
 # set OpenDAP server URL.
-URLbase="http://nomad1.ncep.noaa.gov:9090/dods/mrf/mrf"
-URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
-print URL+'\n'
 try:
+ URLbase="http://nomad1.ncep.noaa.gov:9090/dods/mrf/mrf"
+ URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
 data = NetCDFFile(URL)
 except:
- msg = """
+ try:
+ URLbase="http://nomad2.ncep.noaa.gov:9090/dods/mrf/mrf"
+ URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
+ data = NetCDFFile(URL)
+ except:
+ msg = """
 opendap server not providing the requested data.
 Try another date by providing YYYYMMDD on command line."""
- raise IOError, msg
+ raise IOError, msg
 
 
 # read lats,lons,times.
Modified: trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py	2010年07月07日 13:59:29 UTC (rev 8528)
+++ trunk/toolkits/basemap/examples/fcstmaps_axesgrid.py	2010年07月07日 14:02:04 UTC (rev 8529)
@@ -17,16 +17,20 @@
 YYYYMMDD = datetime.datetime.today().strftime('%Y%m%d')
 
 # set OpenDAP server URL.
-URLbase="http://nomad1.ncep.noaa.gov:9090/dods/mrf/mrf"
-URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
-print URL+'\n'
 try:
+ URLbase="http://nomad1.ncep.noaa.gov:9090/dods/mrf/mrf"
+ URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
 data = NetCDFFile(URL)
 except:
- msg = """
+ try:
+ URLbase="http://nomad2.ncep.noaa.gov:9090/dods/mrf/mrf"
+ URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
+ data = NetCDFFile(URL)
+ except:
+ msg = """
 opendap server not providing the requested data.
 Try another date by providing YYYYMMDD on command line."""
- raise IOError, msg
+ raise IOError, msg
 
 
 # read lats,lons,times.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8528
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8528&view=rev
Author: jswhit
Date: 2010年07月07日 13:59:29 +0000 (2010年7月07日)
Log Message:
-----------
update URL
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/plothighsandlows.py
Modified: trunk/toolkits/basemap/examples/plothighsandlows.py
===================================================================
--- trunk/toolkits/basemap/examples/plothighsandlows.py	2010年07月07日 13:53:19 UTC (rev 8527)
+++ trunk/toolkits/basemap/examples/plothighsandlows.py	2010年07月07日 13:59:29 UTC (rev 8528)
@@ -27,9 +27,9 @@
 
 # open OpenDAP dataset.
 try:
- data=NetCDFFile("http://nomad1.ncep.noaa.gov:9090/dods/gdas/rotating/gdas"+YYYYMMDDHH)
+ data=NetCDFFile("http://nomad1.ncep.noaa.gov:9090/dods/gdas/rotating/gdas"+YYYYMMDDHH+".grib2")
 except:
- data=NetCDFFile("http://nomad1.ncep.noaa.gov:9090/dods/gdas/rotating/"+YYYYMMDDHH[0:6]+"/gdas"+YYYYMMDDHH)
+ data=NetCDFFile("http://nomad2.ncep.noaa.gov:9090/dods/gdas/rotating/gdas"+YYYYMMDDHH+".grib2")
 
 # read lats,lons.
 lats = data.variables['lat'][:]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8527
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8527&view=rev
Author: jswhit
Date: 2010年07月07日 13:53:19 +0000 (2010年7月07日)
Log Message:
-----------
fix URL
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/plotsst.py
Modified: trunk/toolkits/basemap/examples/plotsst.py
===================================================================
--- trunk/toolkits/basemap/examples/plotsst.py	2010年07月07日 13:19:29 UTC (rev 8526)
+++ trunk/toolkits/basemap/examples/plotsst.py	2010年07月07日 13:53:19 UTC (rev 8527)
@@ -12,7 +12,8 @@
 date = datetime.datetime(int(date[0:4]),int(date[4:6]),int(date[6:8]))
 print date
 # open dataset.
-dataset = NetCDFFile('http://nomads.ncdc.noaa.gov/thredds/dodsC/oisst/totalAgg')
+dataset =\
+NetCDFFile('http://nomads.ncdc.noaa.gov/thredds/dodsC/oisst2/totalAmsrAgg')
 # find index of desired time.
 time = dataset.variables['time']
 nt = date2index(date, time, calendar='standard')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8526
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8526&view=rev
Author: mdboom
Date: 2010年07月07日 13:19:29 +0000 (2010年7月07日)
Log Message:
-----------
Backport of r8515: Reset clipping upon exit of draw_markers to avoid negative interaction with blitting.
Modified Paths:
--------------
 branches/v1_0_maint/src/_backend_agg.cpp
Modified: branches/v1_0_maint/src/_backend_agg.cpp
===================================================================
--- branches/v1_0_maint/src/_backend_agg.cpp	2010年07月07日 03:10:32 UTC (rev 8525)
+++ branches/v1_0_maint/src/_backend_agg.cpp	2010年07月07日 13:19:29 UTC (rev 8526)
@@ -796,6 +796,8 @@
 delete[] fillCache;
 if (strokeCache != staticStrokeCache)
 delete[] strokeCache;
+ theRasterizer.reset_clipping();
+ rendererBase.reset_clipping(true);
 throw;
 }
 
@@ -804,6 +806,9 @@
 if (strokeCache != staticStrokeCache)
 delete[] strokeCache;
 
+ theRasterizer.reset_clipping();
+ rendererBase.reset_clipping(true);
+
 return Py::Object();
 }
 
@@ -1086,6 +1091,7 @@
 {
 set_clipbox(gc.cliprect, rendererBase);
 rendererBase.blend_from(pixf, 0, (int)x, (int)(height - (y + image->rowsOut)));
+ rendererBase.reset_clipping(true);
 }
 
 image->flipud_out(empty);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8525
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8525&view=rev
Author: jswhit
Date: 2010年07月07日 03:10:32 +0000 (2010年7月07日)
Log Message:
-----------
make compatible with matplotlib sphinx extensions
Modified Paths:
--------------
 trunk/toolkits/basemap/doc/conf.py
Modified: trunk/toolkits/basemap/doc/conf.py
===================================================================
--- trunk/toolkits/basemap/doc/conf.py	2010年07月06日 21:54:21 UTC (rev 8524)
+++ trunk/toolkits/basemap/doc/conf.py	2010年07月07日 03:10:32 UTC (rev 8525)
@@ -18,16 +18,16 @@
 # absolute, like shown here.
 sys.path.append(os.path.abspath('sphinxext'))
 
-# Import support for ipython console session syntax highlighting (lives
-# in the sphinxext directory defined above)
-import ipython_console_highlighting
-
 # General configuration
 # ---------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['mathmpl', 'math_symbol_table', 'sphinx.ext.autodoc']
+extensions = ['matplotlib.sphinxext.mathmpl', 'math_symbol_table',
+ 'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives',
+ 'matplotlib.sphinxext.plot_directive', 'inheritance_diagram',
+ 'gen_rst',
+ 'matplotlib.sphinxext.ipython_console_highlighting']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.