matplotlib-checkins Mailing List for matplotlib

Revision: 5545
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5545&view=rev
Author: jswhit
Date: 2008年06月14日 14:14:34 -0700 (2008年6月14日)
Log Message:
-----------
more docstring cleanups.
don't use PyNIO in NetCDFFile.
Modified Paths:
--------------
 trunk/toolkits/basemap/Changelog
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pupynere.py
Modified: trunk/toolkits/basemap/Changelog
===================================================================
--- trunk/toolkits/basemap/Changelog	2008年06月14日 16:35:55 UTC (rev 5544)
+++ trunk/toolkits/basemap/Changelog	2008年06月14日 21:14:34 UTC (rev 5545)
@@ -1,3 +1,5 @@
+ * don't try to use PyNIO in NetCDFFile (it was causing
+ too many suprises).
 * improved documentation using Sphinx/docutils.
 * change default behaviour of num2date and date2num to be
 the same as matplotlib counterparts.
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008年06月14日 16:35:55 UTC (rev 5544)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008年06月14日 21:14:34 UTC (rev 5545)
@@ -161,7 +161,8 @@
 (because either they are computed internally, or entire globe is
 always plotted). 
 
- For the cylindrical projections(``cyl``, ``merc`` and ``mill``), the default is to use
+ For the cylindrical projections (``cyl``, ``merc`` and ``mill``),
+ the default is to use
 llcrnrlon=-180,llcrnrlat=-90, urcrnrlon=180 and urcrnrlat=90). For all other
 projections except ``ortho`` and ``geos``, either the lat/lon values of the
 corners or width and height must be specified by the user.
@@ -3192,42 +3193,51 @@
 
 def interp(datain,xin,yin,xout,yout,checkbounds=False,masked=False,order=1):
 """
- dataout = interp(datain,xin,yin,xout,yout,order=1)
+ Interpolate data (``datain``) on a rectilinear grid (with x = ``xin``
+ y = ``yin``) to a grid with x = ``xout``, y= ``yout``.
 
- interpolate data (datain) on a rectilinear grid (with x=xin
- y=yin) to a grid with x=xout, y=yout.
+ ============== ====================================================
+ Arguments Description
+ ============== ====================================================
+ datain a rank-2 array with 1st dimension corresponding to 
+ y, 2nd dimension x.
+ xin, yin rank-1 arrays containing x and y of
+ datain grid in increasing order.
+ xout, yout rank-2 arrays containing x and y of desired output
+ grid.
+ ============== ====================================================
 
- datain is a rank-2 array with 1st dimension corresponding to y,
- 2nd dimension x.
+ ============== ====================================================
+ Keywords Description
+ ============== ====================================================
+ checkbounds If True, values of xout and yout are checked to see
+ that they lie within the range specified by xin
+ and xin. 
+ If False, and xout,yout are outside xin,yin, 
+ interpolated values will be clipped to values on
+ boundary of input grid (xin,yin)
+ Default is False.
+ masked If True, points outside the range of xin and yin
+ are masked (in a masked array). 
+ If masked is set to a number, then
+ points outside the range of xin and yin will be 
+ set to that number. Default False.
+ order 0 for nearest-neighbor interpolation, 1 for
+ bilinear interpolation (default 1).
+ ============== ====================================================
 
- xin, yin are rank-1 arrays containing x and y of
- datain grid in increasing order.
+ .. note::
+ If datain is a masked array and order=1 (bilinear interpolation) is
+ used, elements of dataout will be masked if any of the four surrounding
+ points in datain are masked. To avoid this, do the interpolation in two
+ passes, first with order=1 (producing dataout1), then with order=0
+ (producing dataout2). Then replace all the masked values in dataout1
+ with the corresponding elements in dataout2 (using numpy.where).
+ This effectively uses nearest neighbor interpolation if any of the
+ four surrounding points in datain are masked, and bilinear interpolation
+ otherwise.
 
- xout, yout are rank-2 arrays containing x and y of desired output grid.
-
- If checkbounds=True, values of xout and yout are checked to see that
- they lie within the range specified by xin and xin. Default is False.
-
- If checkbounds=False, and xout,yout are outside xin,yin, interpolated
- values will be clipped to values on boundary of input grid (xin,yin)
- if masked=False. 
-
- If masked=True, the return value will be a masked
- array with those points masked. If masked is set to a number, then
- points outside the range of xin and yin will be set to that number.
-
- The order keyword can be 0 for nearest-neighbor interpolation,
- or 1 for bilinear interpolation (default 1).
-
- If datain is a masked array and order=1 (bilinear interpolation) is
- used, elements of dataout will be masked if any of the four surrounding
- points in datain are masked. To avoid this, do the interpolation in two
- passes, first with order=1 (producing dataout1), then with order=0
- (producing dataout2). Then replace all the masked values in dataout1
- with the corresponding elements in dataout2 (using numpy.where).
- This effectively uses nearest neighbor interpolation if any of the
- four surrounding points in datain are masked, and bilinear interpolation
- otherwise.
+ Returns ``dataout``, the interpolated data on the grid ``xout, yout``.
 """
 # xin and yin must be monotonically increasing.
 if xin[-1]-xin[0] < 0 or yin[-1]-yin[0] < 0:
@@ -3311,21 +3321,28 @@
 
 def shiftgrid(lon0,datain,lonsin,start=True):
 """
- shift global lat/lon grid east or west.
+ Shift global lat/lon grid east or west.
 assumes wraparound (or cyclic point) is included.
 
- lon0: starting longitude for shifted grid
- (ending longitude if start=False). lon0 must be on
- input grid (within the range of lonsin).
+ ============== ====================================================
+ Arguments Description
+ ============== ====================================================
+ lon0 starting longitude for shifted grid
+ (ending longitude if start=False). lon0 must be on
+ input grid (within the range of lonsin).
+ datain original data.
+ lonsin original longitudes.
+ ============== ====================================================
 
- datain: original data.
+ ============== ====================================================
+ Keywords Description
+ ============== ====================================================
+ start if True, lon0 represents the starting longitude
+ of the new grid. if False, lon0 is the ending
+ longitude. Default True.
+ ============== ====================================================
 
- lonsin: original longitudes.
-
- start[True]: if True, lon0 represents the starting longitude
- of the new grid. if False, lon0 is the ending longitude.
-
- returns dataout,lonsout (data and longitudes on shifted grid).
+ returns ``dataout,lonsout`` (data and longitudes on shifted grid).
 """
 if np.fabs(lonsin[-1]-lonsin[0]-360.) > 1.e-4:
 raise ValueError, 'cyclic point not included'
@@ -3348,9 +3365,8 @@
 
 def addcyclic(arrin,lonsin):
 """
- arrout, lonsout = addcyclic(arrin, lonsin)
-
- Add cyclic (wraparound) point in longitude.
+ ``arrout, lonsout = addcyclic(arrin, lonsin)``
+ adds cyclic (wraparound) point in longitude to ``arrin`` and ``lonsin``.
 """
 nlats = arrin.shape[0]
 nlons = arrin.shape[1]
@@ -3383,85 +3399,71 @@
 else:
 return corners
 
-has_pynio = True
-try:
- from PyNGL import nio
-except ImportError:
- has_pynio = False
-
 def NetCDFFile(file, maskandscale=True):
 """NetCDF File reader. API is the same as Scientific.IO.NetCDF.
- If 'file' is a URL that starts with 'http', it is assumed
+ If ``file`` is a URL that starts with `http`, it is assumed
 to be a remote OPenDAP dataset, and the python dap client is used
 to retrieve the data. Only the OPenDAP Array and Grid data
- types are recognized. If file does not start with 'http', it
- is assumed to be a local file. If possible, the file will be read 
- with a pure python NetCDF reader, otherwise PyNIO 
- (http://www.pyngl.ucar.edu/Nio.shtml) will be used (if it is installed).
- PyNIO supports NetCDF version 4, GRIB1, GRIB2, HDF4 and HDFEOS2 files.
- Data read from OPenDAP and NetCDF version 3 datasets will 
+ types are recognized. If file does not start with `http`, it
+ is assumed to be a local netCDF file. Data will
 automatically be converted to masked arrays if the variable has either
- a 'missing_value' or '_FillValue' attribute, and some data points
+ a ``missing_value`` or ``_FillValue`` attribute, and some data points
 are equal to the value specified by that attribute. In addition,
- variables stored as integers that have the 'scale_factor' and
- 'add_offset' attribute will automatically be rescaled to floats when
- read. If PyNIO is used, neither of the automatic conversions will
- be performed. To suppress these automatic conversions, set the
- maskandscale keyword to False. 
+ variables stored as integers that have the ``scale_factor`` and
+ ``add_offset`` attribute will automatically be rescaled to floats when
+ read. To suppress these automatic conversions, set the
+ ``maskandscale`` keyword to False. 
 """
 if file.startswith('http'):
 return pupynere._RemoteFile(file,maskandscale)
 else:
- # use pynio if it is installed and the file cannot
- # be read with the pure python netCDF reader. This allows
- # netCDF version 4, GRIB1, GRIB2, HDF4 and HDFEOS files
- # to be read.
- if has_pynio:
- try:
- f = pupynere._LocalFile(file,maskandscale)
- except:
- f = nio.open_file(file)
- # otherwise, use the pupynere netCDF 3 pure python reader.
- # (will fail if file is not a netCDF version 3 file).
- else:
- f = pupynere._LocalFile(file,maskandscale)
- return f
+ return pupynere._LocalFile(file,maskandscale)
 
 def num2date(times,units='days since 0001年01月01日 00:00:00',calendar='proleptic_gregorian'):
 """
 Return datetime objects given numeric time values. The units
- of the numeric time values are described by the units argument
- and the calendar keyword. The returned datetime objects represent 
+ of the numeric time values are described by the ``units`` argument
+ and the ``calendar`` keyword. The returned datetime objects represent 
 UTC with no time-zone offset, even if the specified 
 units contain a time-zone offset.
 
- Default behavior is the same as the matplotlib num2date function
+ Default behavior is the same as the matplotlib.dates.num2date function
 but the reference time and calendar can be changed via the
- 'units' and 'calendar' keywords.
+ ``units`` and ``calendar`` keywords.
 
- Arguments:
+ ============== ====================================================
+ Arguments Description
+ ============== ====================================================
+ times numeric time values. Maximum resolution is 1 second.
+ ============== ====================================================
 
- times - numeric time values. Maximum resolution is 1 second.
+ ============== ====================================================
+ Keywords Description
+ ============== ====================================================
+ units a string of the form '<time units> since 
+ <reference time>' describing the units and
+ origin of the time coordinate.
+ <time units> can be days, hours, minutes
+ or seconds. <reference time> is the time origin. 
+ Default is 'days since 0001年01月01日 00:00:00'.
+ calendar describes the calendar used in the time
+ calculations. All the values currently defined in 
+ the CF metadata convention
+ (http://cf-pcmdi.llnl.gov/documents/cf-conventions/)
+ are supported.
+ Valid calendars ``standard``, ``gregorian``,
+ ``proleptic_gregorian``, ``noleap``, ``365_day``,
+ ``julian``, ``all_leap``, ``366_day``.
+ Default is ``proleptic_gregorian``.
+ ============== ====================================================
 
- units - a string of the form '<time units> since <reference time>'
- describing the time units. <time units> can be days, hours, minutes
- or seconds. <reference time> is the time origin. 
- Default is 'days since 0001年01月01日 00:00:00'.
-
- calendar - describes the calendar used in the time calculations. 
- All the values currently defined in the CF metadata convention 
- (http://cf-pcmdi.llnl.gov/documents/cf-conventions/) are supported.
- Valid calendars 'standard', 'gregorian', 'proleptic_gregorian'
- 'noleap', '365_day', '360_day', 'julian', 'all_leap', '366_day'.
- Default is 'standard'/'gregorian', which is a mixed 
- Julian/Gregorian calendar. Defalut 'proleptic_gregorian'.
-
 Returns a datetime instance, or an array of datetime instances.
 
 The datetime instances returned are 'real' python datetime 
 objects if the date falls in the Gregorian calendar (i.e. 
- calendar='proleptic_gregorian', or calendar = 'standard' or 'gregorian'
- and the date is after 1582年10月15日). Otherwise, they are 'phony' datetime 
+ calendar=``proleptic_gregorian``, or calendar = ``standard``
+ or ``gregorian`` and the date is after 1582年10月15日).
+ Otherwise, they are 'phony' datetime 
 objects which support some but not all the methods of 'real' python
 datetime objects. The datetime instances do not contain
 a time-zone offset, even if the specified units contains one.
@@ -3472,34 +3474,44 @@
 def date2num(dates,units='days since 0001年01月01日 00:00:00',calendar='proleptic_gregorian'):
 """
 Return numeric time values given datetime objects. The units
- of the numeric time values are described by the units argument
- and the calendar keyword. The datetime objects must
+ of the numeric time values are described by the ``units`` argument
+ and the ``calendar`` keyword. The datetime objects must
 be in UTC with no time-zone offset. If there is a 
 time-zone offset in units, it will be applied to the
 returned numeric values.
 
- Default behavior is the same as the matplotlib date2num function
+ Default behavior is the same as the matplotlib.dates.date2num function
 but the reference time and calendar can be changed via the
- 'units' and 'calendar' keywords.
+ ``units`` and ``calendar`` keywords.
 
- Arguments:
+ ============== ====================================================
+ Arguments Description
+ ============== ====================================================
+ dates A datetime object or a sequence of datetime objects.
+ The datetime objects should not include a
+ time-zone offset.
+ ============== ====================================================
 
- dates - A datetime object or a sequence of datetime objects.
- The datetime objects should not include a time-zone offset.
+ ============== ====================================================
+ Keywords Description
+ ============== ====================================================
+ units a string of the form '<time units> since 
+ <reference time>' describing the units and
+ origin of the time coordinate.
+ <time units> can be days, hours, minutes
+ or seconds. <reference time> is the time origin. 
+ Default is 'days since 0001年01月01日 00:00:00'.
+ calendar describes the calendar used in the time
+ calculations. All the values currently defined in 
+ the CF metadata convention
+ (http://cf-pcmdi.llnl.gov/documents/cf-conventions/)
+ are supported.
+ Valid calendars ``standard``, ``gregorian``,
+ ``proleptic_gregorian``, ``noleap``, ``365_day``,
+ ``julian``, ``all_leap``, ``366_day``.
+ Default is ``proleptic_gregorian``.
+ ============== ====================================================
 
- units - a string of the form '<time units> since <reference time>'
- describing the time units. <time units> can be days, hours, minutes
- or seconds. <reference time> is the time origin. 
- Default is 'days since 0001年01月01日 00:00:00'.
-
- calendar - describes the calendar used in the time calculations. 
- All the values currently defined in the CF metadata convention 
- (http://cf-pcmdi.llnl.gov/documents/cf-conventions/) are supported.
- Valid calendars 'standard', 'gregorian', 'proleptic_gregorian'
- 'noleap', '365_day', '360_day', 'julian', 'all_leap', '366_day'.
- Default is 'standard'/'gregorian', which is a mixed 
- Julian/Gregorian calendar. Default 'proleptic_gregorian'.
-
 Returns a numeric time value, or an array of numeric time values.
 
 The maximum resolution of the numeric time values is 1 second.
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pupynere.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pupynere.py	2008年06月14日 16:35:55 UTC (rev 5544)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/pupynere.py	2008年06月14日 21:14:34 UTC (rev 5545)
@@ -37,12 +37,6 @@
 from dap.client import open as open_remote
 from dap.dtypes import ArrayType, GridType, typemap
 
-has_pynio = True
-try:
- from PyNGL import nio
-except ImportError:
- has_pynio = False
-
 ABSENT = '\x00' * 8
 ZERO = '\x00' * 4
 NC_BYTE = '\x00\x00\x00\x01' 
@@ -76,37 +70,19 @@
 to be a remote OPenDAP dataset, and the python dap client is used
 to retrieve the data. Only the OPenDAP Array and Grid data
 types are recognized. If file does not start with 'http', it
- is assumed to be a local file. If possible, the file will be read 
- with a pure python NetCDF reader, otherwise PyNIO 
- (http://www.pyngl.ucar.edu/Nio.shtml) will be used (if it is installed).
- PyNIO supports NetCDF version 4, GRIB1, GRIB2, HDF4 and HDFEOS2 files.
- Data read from OPenDAP and NetCDF version 3 datasets will 
+ is assumed to be a local netCDF file. Data will
 automatically be converted to masked arrays if the variable has either
 a 'missing_value' or '_FillValue' attribute, and some data points
 are equal to the value specified by that attribute. In addition,
 variables stored as integers that have the 'scale_factor' and
 'add_offset' attribute will automatically be rescaled to floats when
- read. If PyNIO is used, neither of the automatic conversions will
- be performed. To suppress these automatic conversions, set the
+ read. To suppress these automatic conversions, set the
 maskandscale keyword to False. 
 """
 if file.startswith('http'):
 return _RemoteFile(file,maskandscale)
 else:
- # use pynio if it is installed and the file cannot
- # be read with the pure python netCDF reader. This allows
- # netCDF version 4, GRIB1, GRIB2, HDF4 and HDFEOS files
- # to be read.
- if has_pynio:
- try:
- f = _LocalFile(file,maskandscale)
- except:
- f = nio.open_file(file)
- # otherwise, use the pupynere netCDF 3 pure python reader.
- # (will fail if file is not a netCDF version 3 file).
- else:
- f = _LocalFile(file,maskandscale)
- return f
+ return _LocalFile(file,maskandscale)
 
 def _maskandscale(var,datout):
 totalmask = zeros(datout.shape,numpy.bool)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5544
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5544&view=rev
Author: dsdale
Date: 2008年06月14日 09:35:55 -0700 (2008年6月14日)
Log Message:
-----------
don't use the contents directive, it doesnt format well in pdf
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/howto_faq.rst
 trunk/matplotlib/doc/faq/installing_faq.rst
 trunk/matplotlib/doc/faq/troubleshooting_faq.rst
Modified: trunk/matplotlib/doc/faq/howto_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/howto_faq.rst	2008年06月14日 16:24:07 UTC (rev 5543)
+++ trunk/matplotlib/doc/faq/howto_faq.rst	2008年06月14日 16:35:55 UTC (rev 5544)
@@ -1,10 +1,9 @@
 .. _howto-faq:
 
-*****
-HOWTO
-*****
+*********
+HOWTO FAQ
+*********
 
-
 .. _howto-ticks:
 
 How do I configure the tick linewidths?
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 16:24:07 UTC (rev 5543)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 16:35:55 UTC (rev 5544)
@@ -4,9 +4,7 @@
 Installation FAQ
 ******************
 
-.. contents::
 
-
 How do I report a compilation problem?
 ======================================
 
Modified: trunk/matplotlib/doc/faq/troubleshooting_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/troubleshooting_faq.rst	2008年06月14日 16:24:07 UTC (rev 5543)
+++ trunk/matplotlib/doc/faq/troubleshooting_faq.rst	2008年06月14日 16:35:55 UTC (rev 5544)
@@ -1,8 +1,8 @@
 .. _troubleshooting-faq:
 
-===================
+*******************
 Troubleshooting FAQ
-===================
+*******************
 
 .. _matplotlib-version:
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5543
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5543&view=rev
Author: dsdale
Date: 2008年06月14日 09:24:07 -0700 (2008年6月14日)
Log Message:
-----------
installation faq updates
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/installing_faq.rst
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 16:19:53 UTC (rev 5542)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 16:24:07 UTC (rev 5543)
@@ -44,14 +44,14 @@
 How do I cleanly rebuild and reinstall everything?
 ==================================================
 
-1. Delete the caches from your :ref:`.matplotlib configuration directory
-<locating-matplotlib-config-dir>`.
+The steps depend on your platform and installation method.
 
-The next steps depend on your platform and installation method.
-
 Easy Install
 ------------
 
+1. Delete the caches from your :ref:`.matplotlib configuration directory
+ <locating-matplotlib-config-dir>`.
+
 2. Run::
 
 easy_install -m PackageName
@@ -63,8 +63,11 @@
 Windows installer
 -----------------
 
+1. Delete the caches from your :ref:`.matplotlib configuration directory
+ <locating-matplotlib-config-dir>`.
+
 2. Use :menuselection:`Start --> Control Panel` to start the :program:`Add and
-Remove Software` utility.
+ Remove Software` utility.
 
 Source install
 --------------
@@ -76,7 +79,11 @@
 does not properly clean the build directory, and does nothing to the
 install directory. To cleanly rebuild:
 
+1. Delete the caches from your :ref:`.matplotlib configuration directory
+ <locating-matplotlib-config-dir>`.
+
 2. Delete the ``build`` directory in the source tree
+
 3. Delete any matplotlib directories or eggs from your `installation directory
 <locating-matplotlib-install>`
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5542
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5542&view=rev
Author: dsdale
Date: 2008年06月14日 09:19:53 -0700 (2008年6月14日)
Log Message:
-----------
added local table of contents to the installation faq
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/installing_faq.rst
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 16:07:24 UTC (rev 5541)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 16:19:53 UTC (rev 5542)
@@ -4,6 +4,7 @@
 Installation FAQ
 ******************
 
+.. contents::
 
 
 How do I report a compilation problem?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5541
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5541&view=rev
Author: dsdale
Date: 2008年06月14日 09:07:24 -0700 (2008年6月14日)
Log Message:
-----------
updated installation faq, added to glossary
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/installing_faq.rst
 trunk/matplotlib/doc/glossary/index.rst
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 14:59:09 UTC (rev 5540)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 16:07:24 UTC (rev 5541)
@@ -150,32 +150,46 @@
 Here is a summary of the matplotlib renderers (there is an eponymous
 backed for each):
 
-======== ====================== ======================================================================================
-Renderer Filetypes Description
-======== ====================== ======================================================================================
-AGG png :term:`raster graphics` -- high quality images using the `Anti-Grain Geometry`_ engine
-PS ps, eps :term:`vector graphics` -- Postscript_ output
-PDF pdf :term:`vector graphics` -- `Portable Document Format`_
-SVG svg :term:`vector graphics` -- `Scalable Vector Graphics`_
-Cairo png, ps, pdf, svn, ... :term:`vector graphics` -- `Cairo graphics`_
-GDK png, jpg, tiff, ... :term:`raster graphics` -- the `Gimp Drawing Kit`_ for GTK
-======== ====================== ======================================================================================
+============= ============ ================================================
+Renderer Filetypes Description
+============= ============ ================================================
+:term:`AGG` :term:`png` :term:`raster graphics` -- high quality images
+ using the `Anti-Grain Geometry`_ engine
+PS :term:`ps` :term:`vector graphics` -- Postscript_ output
+ :term:`eps`
+PDF		:term:`pdf` :term:`vector graphics` --
+ `Portable Document Format`_
+SVG :term:`svg` :term:`vector graphics` --
+ `Scalable Vector Graphics`_
+:term:`Cairo` :term:`png` :term:`vector graphics` --
+ :term:`ps` `Cairo graphics`_
+	 :term:`pdf`
+	 :term:`svg`
+	 ...
+:term:`GDK` :term:`png` :term:`raster graphics` -- 
+ :term:`jpg` the `Gimp Drawing Kit`_
+	 :term:`tiff`
+	 ...
+============= ============ ================================================
 
 And here are the user interfaces and renderer combinations supported:
 
-============ =====================================================================================
+============ ================================================================
 Backend Description
-============ =====================================================================================
-GTKAgg Agg rendering to a GTK canvas (requires PyGTK_)
-GTK GDK rendering to a GTK canvas (not recommended) (requires PyGTK_)
-GTKCairo Cairo rendering to a GTK Canvas (requires PyGTK_)
-WXAgg Agg rendering to to a wxWidgets canvas (requires wxPython_)
-WX Native wxWidgets drawing to a wxWidgets Canvas (not recommended) (requires wxPython_)
-TkAgg Agg rendering to a Tk canvas (requires TkInter_)
-QtAgg Agg rendering to a Qt canvas (requires PyQt_)
-Qt4Agg Agg rendering to a Qt4 canvas (requires PyQt4_)
-FLTKAgg Agg rendering to a FLTK canvas (requires pyFLTK_)
-============ =====================================================================================
+============ ================================================================
+GTKAgg Agg rendering to a :term:`GTK` canvas (requires PyGTK_)
+GTK GDK rendering to a :term:`GTK` canvas (not recommended)
+ (requires PyGTK_)
+GTKCairo Cairo rendering to a :term:`GTK` Canvas (requires PyGTK_)
+WXAgg Agg rendering to to a :term:`wxWidgets` canvas
+ (requires wxPython_)
+WX Native :term:`wxWidgets` drawing to a :term:`wxWidgets` Canvas
+ (not recommended) (requires wxPython_)
+TkAgg Agg rendering to a :term:`Tk` canvas (requires TkInter_)
+QtAgg Agg rendering to a :term:`Qt` canvas (requires PyQt_)
+Qt4Agg Agg rendering to a :term:`Qt4` canvas (requires PyQt4_)
+FLTKAgg Agg rendering to a :term:`FLTK` canvas (requires pyFLTK_)
+============ ================================================================
 
 .. _`Anti-Grain Geometry`: http://www.antigrain.com/
 .. _Postscript: http://en.wikipedia.org/wiki/PostScript
Modified: trunk/matplotlib/doc/glossary/index.rst
===================================================================
--- trunk/matplotlib/doc/glossary/index.rst	2008年06月14日 14:59:09 UTC (rev 5540)
+++ trunk/matplotlib/doc/glossary/index.rst	2008年06月14日 16:07:24 UTC (rev 5541)
@@ -4,12 +4,69 @@
 
 .. glossary::
 
+ AGG
+ The Anti-Grain Geometry rendering engine, capable of rendering
+ high-quality images.
+
+ Cairo
+ The Cairo graphics engine
+ 
+ EPS
+ Encapsulated Postscript
+
+ FLTK
+ FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
+ UNIX/Linux (X11), Microsoft Windows, and MacOS X
+ 
+ GDK
+ The Gimp Drawing Kit for GTK+
+
+ GTK
+ The GTK graphical user interface library
+
+ JPG
+ A compression method and file format for photographic images
+
+ PDF
+ Adobe's Portable Document Format
+ 
+ PNG
+ PNG stands for Portable Network Graphics, a raster graphics format that
+ employs lossless data compression which is more suitable for line art
+ than the lossy jpg format. Unlike the gif format, png is not encumbered
+ by requirements for a patent license.
+
+ PS
+ Postscript
+
+ Qt
+ Qt is a cross-platform application framework for desktop and embedded
+ development.
+ 
+ Qt4
+ Qt4 is the most recent version of Qt cross-platform application framework
+ for desktop and embedded development.
+ 
 raster graphics
 Raster graphics, or bitmaps, represent an image as an array of pixels
 which is resolution dependent. Raster graphics are generally most
 practical for photo-realistic images, but do not scale easily without
 loss of quality.
 
+ SVG
+ The Scalable Vector Graphics format.
+
+ TIFF
+ Tagged Image File Format
+
+ Tk
+ Tk is a graphical user interface for Tcl and many other dynamic
+ languages. It can produce rich, native applications that run unchanged
+ across Windows, Mac OS X, Linux and more.
+
+ wxWidgets
+ A cross-platform GUI and tools library for GTK, MS Windows, and MacOS.
+ 
 vector graphics
 The use of geometrical primitives based upon mathematical equations to
 represent images in computer graphics. Primitives can include points,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5540
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5540&view=rev
Author: dsdale
Date: 2008年06月14日 07:59:09 -0700 (2008年6月14日)
Log Message:
-----------
remove gtk backends from API reference for now
fixed a broken link in installation faq
Modified Paths:
--------------
 trunk/matplotlib/doc/api/backend_gtkagg_api.rst
 trunk/matplotlib/doc/faq/installing_faq.rst
Modified: trunk/matplotlib/doc/api/backend_gtkagg_api.rst
===================================================================
--- trunk/matplotlib/doc/api/backend_gtkagg_api.rst	2008年06月14日 14:32:13 UTC (rev 5539)
+++ trunk/matplotlib/doc/api/backend_gtkagg_api.rst	2008年06月14日 14:59:09 UTC (rev 5540)
@@ -2,6 +2,9 @@
 :mod:`matplotlib.backends.backend_gtkagg`
 =========================================
 
-.. automodule:: matplotlib.backends.backend_gtkagg
- :members:
- :undoc-members:
\ No newline at end of file
+**TODO** We'll add this later, importing the gtk backends requires an active
+X-session, which is not compatible with cron jobs.
+
+.. .. automodule:: matplotlib.backends.backend_gtkagg
+.. :members:
+.. :undoc-members:
\ No newline at end of file
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 14:32:13 UTC (rev 5539)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 14:59:09 UTC (rev 5540)
@@ -196,14 +196,14 @@
 How do I compile matplotlib with PyGTK-2.4?
 -------------------------------------------
 
-There is a `bug <pygtk-2.4-bug>`_ in PyGTK-2.4. You need to edit
+There is a `bug in PyGTK-2.4`_. You need to edit
 :file:`pygobject.h` to add the :cmacro:`G_BEGIN_DECLS` and :cmacro:`G_END_DECLS`
 macros, and rename :cdata:`typename` parameter to :cdata:`typename_`::
 
 -			 const char *typename,
 +			 const char *typename_,
 
-.. _`bug <pygtk-2.4-bug>`: http://bugzilla.gnome.org/show_bug.cgi?id=155304
+.. _`bug in PyGTK-2.4`: http://bugzilla.gnome.org/show_bug.cgi?id=155304
 
 
 OS-X questions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5539
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5539&view=rev
Author: dsdale
Date: 2008年06月14日 07:32:13 -0700 (2008年6月14日)
Log Message:
-----------
improvements to installation faq
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/installing_faq.rst
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 14:10:27 UTC (rev 5538)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 14:32:13 UTC (rev 5539)
@@ -43,38 +43,43 @@
 How do I cleanly rebuild and reinstall everything?
 ==================================================
 
-# TODO: include for binary installs 
+1. Delete the caches from your :ref:`.matplotlib configuration directory
+<locating-matplotlib-config-dir>`.
 
-Unfortunately::
+The next steps depend on your platform and installation method.
 
- python setup.py clean
+Easy Install
+------------
 
-does not properly clean the build directory, and does nothing to the
-install directory. To cleanly rebuild:
+2. Run::
 
- * delete the ``build`` directory in the source tree
- * delete ``site-packages/matplotlib`` directory in the Python
- installation. The location of ``site-packages`` is
- platform-specific. You can find out where matplotlib is installed by doing::
+ easy_install -m PackageName
 
- > python -c 'import matplotlib; print matplotlib.__file__'
+3. Delete any .egg files or directories from your `installation directory
+ <locating-matplotlib-install>`.
 
- and then making sure you remove the matplotlib directory (and
- any matplotlib*.egg files) you find there.
 
- * you may also want to clear some of the cache data that
- matplotlib stores in your ``.matplotlib`` directory. You can
- find the location of this directory by doing::
+Windows installer
+-----------------
 
- import matplotlib
- print matplotlib.get_configdir()
+2. Use :menuselection:`Start --> Control Panel` to start the :program:`Add and
+Remove Software` utility.
 
- A typical location for the config directory is :file:`.matplotlib`, and the following
- caches may need to be cleared after a major update::
+Source install
+--------------
 
- rm -rf ~/.matplotlib/tex.cache
-	 rm -rf ~/.matplotlib/fontManager.cache
+Unfortunately::
 
+ python setup.py clean
+
+does not properly clean the build directory, and does nothing to the
+install directory. To cleanly rebuild:
+
+2. Delete the ``build`` directory in the source tree
+3. Delete any matplotlib directories or eggs from your `installation directory
+ <locating-matplotlib-install>`
+
+
 Backends
 ========
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5538
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5538&view=rev
Author: dsdale
Date: 2008年06月14日 07:10:27 -0700 (2008年6月14日)
Log Message:
-----------
added to the installation faq
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/installing_faq.rst
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 13:40:01 UTC (rev 5537)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 14:10:27 UTC (rev 5538)
@@ -11,11 +11,40 @@
 
 See :ref:`reporting-problems`.
 
+matplotlib compiled fine, but I can't get anything to plot
+==========================================================
+
+The first thing to try is a :ref:`clean install <clean-install>` and see if
+that helps. If not, the best way to test your install is by running a script,
+rather than working interactively from a python shell or an integrated
+development environment such as :program:`IDLE` which add additional
+complexities. Open up a UNIX shell or a DOS command prompt and cd into a
+directory containing a minimal example in a file. Something like
+:file:`simple_plot.py`, or for example::
+
+ from pylab import *
+ plot([1,2,3])
+ show()
+
+and run it with::
+
+ python simple_plot.py --verbose-helpful
+
+This will give you additional information about which backends matplotlib is
+loading, version information, and more. At this point you might want to make
+sure you understand matplotlib's :ref:`configuration <customizing-matplotlib>`
+process, governed by the :file:`matplotlibrc` configuration file which contains
+instructions within and the concept of the matplotlib backend.
+
+If you are still having trouble, see :ref:`reporting-problems`.
+
 .. _clean-install:
 
 How do I cleanly rebuild and reinstall everything?
 ==================================================
 
+# TODO: include for binary installs 
+
 Unfortunately::
 
 python setup.py clean
@@ -46,10 +75,13 @@
 rm -rf ~/.matplotlib/tex.cache
 	 rm -rf ~/.matplotlib/fontManager.cache
 
+Backends
+========
+
 .. _what-is-a-backend:
 
 What is a backend?
-==================
+------------------
 
 A lot of documentation on the website and in the mailing lists refers
 to the "backend" and many new users are confused by this term.
@@ -154,6 +186,21 @@
 .. _pyFLTK: http://pyfltk.sourceforge.net
 
 
+.. _pygtk-2.4:
+
+How do I compile matplotlib with PyGTK-2.4?
+-------------------------------------------
+
+There is a `bug <pygtk-2.4-bug>`_ in PyGTK-2.4. You need to edit
+:file:`pygobject.h` to add the :cmacro:`G_BEGIN_DECLS` and :cmacro:`G_END_DECLS`
+macros, and rename :cdata:`typename` parameter to :cdata:`typename_`::
+
+ -			 const char *typename,
+ +			 const char *typename_,
+
+.. _`bug <pygtk-2.4-bug>`: http://bugzilla.gnome.org/show_bug.cgi?id=155304
+
+
 OS-X questions
 ==============
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5537
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5537&view=rev
Author: dsdale
Date: 2008年06月14日 06:40:01 -0700 (2008年6月14日)
Log Message:
-----------
updates to installation faq and glossary
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/installing_faq.rst
 trunk/matplotlib/doc/glossary/index.rst
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 13:21:19 UTC (rev 5536)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2008年06月14日 13:40:01 UTC (rev 5537)
@@ -113,34 +113,47 @@
 Here is a summary of the matplotlib renderers (there is an eponymous
 backed for each):
 
-=============================== =====================================================================================
-Renderer (Filetypes) Description
-=============================== =====================================================================================
-Agg (png) raster - high quality images using the `antigrain <http://antigrain.html>`_ engine
-PS (ps, eps) vector - postscript output
-PDF (pdf) vector - portable document format
-SVG (svg) vector - scalar vector graphics
-Cairo (png, ps, pdf, svn, ...) vector - `cairo graphics <http://cairographics.org>`_
-GDK (png, jpg, tiff..) raster - the GDK drawing API for GTK
-=============================== =====================================================================================
+======== ====================== ======================================================================================
+Renderer Filetypes Description
+======== ====================== ======================================================================================
+AGG png :term:`raster graphics` -- high quality images using the `Anti-Grain Geometry`_ engine
+PS ps, eps :term:`vector graphics` -- Postscript_ output
+PDF pdf :term:`vector graphics` -- `Portable Document Format`_
+SVG svg :term:`vector graphics` -- `Scalable Vector Graphics`_
+Cairo png, ps, pdf, svn, ... :term:`vector graphics` -- `Cairo graphics`_
+GDK png, jpg, tiff, ... :term:`raster graphics` -- the `Gimp Drawing Kit`_ for GTK
+======== ====================== ======================================================================================
 
 And here are the user interfaces and renderer combinations supported:
 
-============ ===================================================================================================
+============ =====================================================================================
 Backend Description
-============ ===================================================================================================
-GTKAgg Agg rendering to a GTK canvas (`pygtk <http://www.pygtk.org>`_)
-GTK GDK rendering to a GTK canvas (not recommended) (`pygtk <http://www.pygtk.org>`_)
-GTKCairo Cairo rendering to a GTK Canvas (`pygtk <http://www.pygtk.org>`_)
-WXAgg Agg rendering to to a WX canvas (`wxpython <http://www.wxpython.org>`_)
-WX Native WX drawing to a WX Canvas (not recommended) (`wxpython <http://www.wxpython.org>`_)
-TkAgg Agg rendering to a Tkinter canvas (`tkinter <http://wiki.python.org/moin/TkInter>`_)
-QtAgg Agg rendering to a Qt canvas (`pyqt <http://www.riverbankcomputing.co.uk/software/pyqt/intro>`_)
-Qt4Agg Agg rendering to a Qt4 canvas (`pyqt <http://www.riverbankcomputing.co.uk/software/pyqt/intro>`_)
-FLTKAgg Agg rendering to a FLTK canvas (`pyfltk <http://pyfltk.sourceforge.net>`_)
-============ ===================================================================================================
+============ =====================================================================================
+GTKAgg Agg rendering to a GTK canvas (requires PyGTK_)
+GTK GDK rendering to a GTK canvas (not recommended) (requires PyGTK_)
+GTKCairo Cairo rendering to a GTK Canvas (requires PyGTK_)
+WXAgg Agg rendering to to a wxWidgets canvas (requires wxPython_)
+WX Native wxWidgets drawing to a wxWidgets Canvas (not recommended) (requires wxPython_)
+TkAgg Agg rendering to a Tk canvas (requires TkInter_)
+QtAgg Agg rendering to a Qt canvas (requires PyQt_)
+Qt4Agg Agg rendering to a Qt4 canvas (requires PyQt4_)
+FLTKAgg Agg rendering to a FLTK canvas (requires pyFLTK_)
+============ =====================================================================================
 
+.. _`Anti-Grain Geometry`: http://www.antigrain.com/
+.. _Postscript: http://en.wikipedia.org/wiki/PostScript
+.. _`Portable Document Format`: http://en.wikipedia.org/wiki/Portable_Document_Format
+.. _`Scalable Vector Graphics`: http://en.wikipedia.org/wiki/Scalable_Vector_Graphics
+.. _`Cairo graphics`: http://en.wikipedia.org/wiki/Cairo_(graphics)
+.. _`Gimp Drawing Kit`: http://en.wikipedia.org/wiki/GDK
+.. _PyGTK: http://www.pygtk.org
+.. _wxPython: http://www.wxpython.org/
+.. _TkInter: http://wiki.python.org/moin/TkInter
+.. _PyQt: http://www.riverbankcomputing.co.uk/software/pyqt/intro
+.. _PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
+.. _pyFLTK: http://pyfltk.sourceforge.net
 
+
 OS-X questions
 ==============
 
Modified: trunk/matplotlib/doc/glossary/index.rst
===================================================================
--- trunk/matplotlib/doc/glossary/index.rst	2008年06月14日 13:21:19 UTC (rev 5536)
+++ trunk/matplotlib/doc/glossary/index.rst	2008年06月14日 13:40:01 UTC (rev 5537)
@@ -7,8 +7,8 @@
 raster graphics
 Raster graphics, or bitmaps, represent an image as an array of pixels
 which is resolution dependent. Raster graphics are generally most
- practical for photo-realistic images, but do not easily without loss of
- quality.
+ practical for photo-realistic images, but do not scale easily without
+ loss of quality.
 
 vector graphics
 The use of geometrical primitives based upon mathematical equations to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5536
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5536&view=rev
Author: dsdale
Date: 2008年06月14日 06:21:19 -0700 (2008年6月14日)
Log Message:
-----------
added a glossary to the docs
Modified Paths:
--------------
 trunk/matplotlib/doc/index.rst
Added Paths:
-----------
 trunk/matplotlib/doc/glossary/
 trunk/matplotlib/doc/glossary/index.rst
Added: trunk/matplotlib/doc/glossary/index.rst
===================================================================
--- trunk/matplotlib/doc/glossary/index.rst	 (rev 0)
+++ trunk/matplotlib/doc/glossary/index.rst	2008年06月14日 13:21:19 UTC (rev 5536)
@@ -0,0 +1,20 @@
+########
+Glossary
+########
+
+.. glossary::
+
+ raster graphics
+ Raster graphics, or bitmaps, represent an image as an array of pixels
+ which is resolution dependent. Raster graphics are generally most
+ practical for photo-realistic images, but do not easily without loss of
+ quality.
+
+ vector graphics
+ The use of geometrical primitives based upon mathematical equations to
+ represent images in computer graphics. Primitives can include points,
+ lines, curves, and shapes or polygons. Vector graphics are scalable,
+ which means that they can be resized without suffering from issues
+ related to inherent resolution like are seen in raster graphics. Vector
+ graphics are generally most practical for typesetting and graphic design
+ applications.
\ No newline at end of file
Modified: trunk/matplotlib/doc/index.rst
===================================================================
--- trunk/matplotlib/doc/index.rst	2008年06月14日 12:32:49 UTC (rev 5535)
+++ trunk/matplotlib/doc/index.rst	2008年06月14日 13:21:19 UTC (rev 5536)
@@ -1,7 +1,5 @@
-.. matplotlib documentation master file, created by sphinx-quickstart on Sat May 24 15:37:00 2008.
- You can adapt this file completely to your liking, but it should at least
- contain the root `toctree` directive.
 
+
 Welcome to matplotlib's documentation!
 ======================================
 
@@ -19,16 +17,10 @@
 faq/index.rst
 devel/index.rst
 api/index.rst
+ glossary/index.rst
 
-Indices and tables
-==================
+.. htmlonly::
 
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
-
-.. _ipython: http://ipython.scipy.org
-.. _numpy: http://numpy.scipy.org
-.. _scipy: http://scipy.org
-.. _vtk: http://www.vtk.org
+ * :ref:`genindex`
+ * :ref:`modindex`
+ * :ref:`search`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5535
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5535&view=rev
Author: jswhit
Date: 2008年06月14日 05:32:49 -0700 (2008年6月14日)
Log Message:
-----------
docstring cleanups, typo fixes.
Modified Paths:
--------------
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008年06月14日 12:23:49 UTC (rev 5534)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008年06月14日 12:32:49 UTC (rev 5535)
@@ -109,11 +109,11 @@
 _Basemap_init_doc = """
 
 Sets up a basemap with specified map projection.
- and creates the coastline data structures in native map projection
+ and creates the coastline data structures in map projection
 coordinates.
 
 Calling a Basemap class instance with the arguments lon, lat will
- convert lon/lat (in degrees) to x/y native map projection coordinates
+ convert lon/lat (in degrees) to x/y map projection coordinates
 (in meters). The inverse transformation is done if the optional keyword
 ``inverse`` is set to True.
 
@@ -212,7 +212,7 @@
 suppress_ticks=False. suppress_ticks=False
 is useful if you want to use your own custom tick
 formatter, or if you want to let matplotlib label 
- the axes in meters using native map projection
+ the axes in meters using map projection
 coordinates.
 anchor determines how map is placed in axes rectangle
 (passed to axes.set_aspect). Default is ``C``, 
@@ -320,7 +320,7 @@
 **Converting from Geographic (lon/lat) to Map Projection (x/y) Coordinates**
 
 Calling a Basemap class instance with the arguments lon, lat will
- convert lon/lat (in degrees) to x/y native map projection
+ convert lon/lat (in degrees) to x/y map projection
 coordinates (in meters). If optional keyword ``inverse`` is
 True (default is False), the inverse transformation from x/y
 to lon/lat is performed.
@@ -349,7 +349,7 @@
 >>> 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.
+ >>> # compute map projection coordinates for lat/lon grid.
 >>> x, y = m(*np.meshgrid(lons,lats))
 >>> # make filled contour plot.
 >>> cs = m.contourf(x,y,etopo,30,cmap=plt.cm.jet)
@@ -762,7 +762,7 @@
 def __call__(self,x,y,inverse=False):
 """
 Calling a Basemap class instance with the arguments lon, lat will
- convert lon/lat (in degrees) to x/y native map projection
+ convert lon/lat (in degrees) to x/y map projection
 coordinates (in meters). If optional keyword ``inverse`` is
 True (default is False), the inverse transformation from x/y
 to lon/lat is performed.
@@ -1492,7 +1492,7 @@
 that world_borders.shp, world_borders.shx and 
 world_borders.dbf live in /home/jeff/esri.
 name name for Basemap attribute to hold the shapefile
- vertices or points in native map projection 
+ vertices or points in map projection 
 coordinates. Class attribute name+'_info' is a list 
 of dictionaries, one for each shape, containing 
 attributes of each shape from dbf file, For
@@ -2167,7 +2167,7 @@
 """
 Interpolate a scalar field (``datin``) from a lat/lon grid with
 longitudes = ``lons`` and latitudes = ``lats`` to a ``ny`` by ``nx``
- native map projection grid. Typically used to transform data to
+ map projection grid. Typically used to transform data to
 map projection coordinates for plotting on a map with 
 the :meth:`imshow`.
 
@@ -2180,7 +2180,7 @@
 For non-cylindrical projections (those other than
 ``cyl``, ``merc`` and ``mill``) lons must fit 
 within range -180 to 180.
- returnxy If True, the x and y values of the native map
+ returnxy If True, the x and y values of the map
 projection grid are also returned (Default False).
 checkbounds If True, values of lons and lats are checked to see
 that they lie within the map projection region.
@@ -2224,7 +2224,7 @@
 """
 Rotate and interpolate a vector field (``uin,vin``) from a
 lat/lon grid with longitudes = ``lons`` and latitudes = ``lats``
- to a ``ny`` by ``nx`` native map projection grid.
+ to a ``ny`` by ``nx`` map projection grid.
 
 The input vector field is defined in spherical coordinates (it
 has eastward and northward components) while the output
@@ -2240,7 +2240,7 @@
 For non-cylindrical projections (those other than
 ``cyl``, ``merc`` and ``mill``) lons must fit 
 within range -180 to 180.
- returnxy If True, the x and y values of the native map
+ returnxy If True, the x and y values of the map
 projection grid are also returned (Default False).
 checkbounds If True, values of lons and lats are checked to see
 that they lie within the map projection region.
@@ -2279,12 +2279,12 @@
 
 def rotate_vector(self,uin,vin,lons,lats,returnxy=False):
 """
- Rotate a vector field (``uin,vin``) on a rectilinear lat/lon grid
+ Rotate a vector field (``uin,vin``) on a rectilinear grid
 with longitudes = ``lons`` and latitudes = ``lats`` from 
 geographical (lat/lon) into map projection (x/y) coordinates.
 
 Differs from transform_vector in that no interpolation is done.
- The vector is returned on the same lat/lon grid, but rotated into
+ The vector is returned on the same grid, but rotated into
 x,y coordinates.
 
 The input vector field is defined in spherical coordinates (it
@@ -2301,11 +2301,11 @@
 For non-cylindrical projections (those other than
 ``cyl``, ``merc`` and ``mill``) lons must fit 
 within range -180 to 180.
- returnxy If True, the x and y values of the native map
+ returnxy If True, the x and y values of the map
 projection grid are also returned (Default False).
 ============== ====================================================
 
- Returns ``uout, vout`` (rotated vector field on map projection grid).
+ Returns ``uout, vout`` (rotated vector field).
 If returnxy=True, returns ``uout,vout,x,y``.
 """
 if lons.ndim == 1 and lats.ndim == 1:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5534
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5534&view=rev
Author: jswhit
Date: 2008年06月14日 05:23:49 -0700 (2008年6月14日)
Log Message:
-----------
cleanups of transform_vector, rotate_vector.
more docstrings restifyied.
Modified Paths:
--------------
 trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008年06月14日 02:31:40 UTC (rev 5533)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2008年06月14日 12:23:49 UTC (rev 5534)
@@ -2165,30 +2165,36 @@
 
 def transform_scalar(self,datin,lons,lats,nx,ny,returnxy=False,checkbounds=False,order=1,masked=False):
 """
- interpolate a scalar field (datin) from a lat/lon grid with longitudes =
- lons and latitudes = lats to a (ny,nx) native map projection grid.
- Typically used to transform data to map projection coordinates
- so it can be plotted on the map with imshow.
+ Interpolate a scalar field (``datin``) from a lat/lon grid with
+ longitudes = ``lons`` and latitudes = ``lats`` to a ``ny`` by ``nx``
+ native map projection grid. Typically used to transform data to
+ map projection coordinates for plotting on a map with 
+ the :meth:`imshow`.
 
- lons, lats must be rank-1 arrays containing longitudes and latitudes
- (in degrees) of datin grid in increasing order
- (i.e. from dateline eastward, and South Pole northward).
- For non-cylindrical projections (those other than
- cylindrical equidistant, mercator and miller)
- lons must fit within range -180 to 180.
+ ============== ====================================================
+ Keyword Description
+ ============== ====================================================
+ datin input data on a lat/lon grid.
+ lons, lats rank-1 arrays containing longitudes and latitudes
+ (in degrees) of input data in increasing order.
+ For non-cylindrical projections (those other than
+ ``cyl``, ``merc`` and ``mill``) lons must fit 
+ within range -180 to 180.
+ returnxy If True, the x and y values of the native map
+ projection grid are also returned (Default False).
+ checkbounds If True, values of lons and lats are checked to see
+ that they lie within the map projection region.
+ Default is False, and data outside map projection
+ region is clipped to values on boundary.
+ masked If True, interpolated data is returned as a masked
+ array with values outside map projection region
+ masked (Default False).
+ order 0 for nearest-neighbor interpolation, 1 for
+ bilinear (Default 1).
+ ============== ====================================================
 
- if returnxy=True, the x and y values of the native map projection grid
- are also returned.
-
- If checkbounds=True, values of lons and lats are checked to see that
- they lie within the map projection region. Default is False.
-
- If checkbounds=False, points outside map projection region will
- be clipped to values on the boundary if masked=False. If masked=True,
- the return value will be a masked array with those points masked.
-
- The order keyword can be 0 for nearest-neighbor interpolation,
- or 1 for bilinear interpolation (default 1).
+ Returns ``datout`` (data on map projection grid).
+ If returnxy=True, returns ``data,x,y``.
 """
 # check that lons, lats increasing
 delon = lons[1:]-lons[0:-1]
@@ -2216,34 +2222,39 @@
 
 def transform_vector(self,uin,vin,lons,lats,nx,ny,returnxy=False,checkbounds=False,order=1,masked=False):
 """
- rotate and interpolate a vector field (uin,vin) from a lat/lon grid
- with longitudes = lons and latitudes = lats to a
- (ny,nx) native map projection grid.
+ Rotate and interpolate a vector field (``uin,vin``) from a
+ lat/lon grid with longitudes = ``lons`` and latitudes = ``lats``
+ to a ``ny`` by ``nx`` native map projection grid.
 
- lons, lats must be rank-1 arrays containing longitudes and latitudes
- (in degrees) of datin grid in increasing order
- (i.e. from dateline eastward, and South Pole northward).
- For non-cylindrical projections (those other than
- cylindrical equidistant, mercator and miller)
- lons must fit within range -180 to 180.
-
 The input vector field is defined in spherical coordinates (it
- has eastward and northward components) while the output
- vector field is rotated to map projection coordinates (relative
- to x and y). The magnitude of the vector is preserved.
+ has eastward and northward components) while the output
+ vector field is rotated to map projection coordinates (relative
+ to x and y). The magnitude of the vector is preserved.
 
- if returnxy=True, the x and y values of the native map projection grid
- are also returned (default False).
+ ============== ====================================================
+ Keyword Description
+ ============== ====================================================
+ uin, vin input vector field on a lat/lon grid.
+ lons, lats rank-1 arrays containing longitudes and latitudes
+ (in degrees) of input data in increasing order.
+ For non-cylindrical projections (those other than
+ ``cyl``, ``merc`` and ``mill``) lons must fit 
+ within range -180 to 180.
+ returnxy If True, the x and y values of the native map
+ projection grid are also returned (Default False).
+ checkbounds If True, values of lons and lats are checked to see
+ that they lie within the map projection region.
+ Default is False, and data outside map projection
+ region is clipped to values on boundary.
+ masked If True, interpolated data is returned as a masked
+ array with values outside map projection region
+ masked (Default False).
+ order 0 for nearest-neighbor interpolation, 1 for
+ bilinear (Default 1).
+ ============== ====================================================
 
- If checkbounds=True, values of lons and lats are checked to see that
- they lie within the map projection region. Default is False.
- 
- If checkbounds=False, points outside map projection region will
- be clipped to values on the boundary if masked=False. If masked=True,
- the return value will be a masked array with those points masked.
-
- The order keyword can be 0 for nearest-neighbor interpolation,
- or 1 for bilinear interpolation (default 1).
+ Returns ``uout, vout`` (vector field on map projection grid).
+ If returnxy=True, returns ``uout,vout,x,y``.
 """
 # check that lons, lats increasing
 delon = lons[1:]-lons[0:-1]
@@ -2264,59 +2275,41 @@
 uin = interp(uin,lons,lats,lonsout,latsout,checkbounds=checkbounds,order=order,masked=masked)
 vin = interp(vin,lons,lats,lonsout,latsout,checkbounds=checkbounds,order=order,masked=masked)
 # rotate from geographic to map coordinates.
- if ma.isMaskedArray(uin):
- mask = ma.getmaskarray(uin)
- uin = uin.filled(1)
- vin = vin.filled(1)
- masked = True # override kwarg with reality
- uvc = uin + 1j*vin
- uvmag = np.abs(uvc)
- delta = 0.1 # increment in longitude
- dlon = delta*uin/uvmag
- dlat = delta*(vin/uvmag)*np.cos(latsout*np.pi/180.0)
- farnorth = latsout+dlat >= 90.0
- somenorth = farnorth.any()
- if somenorth:
- dlon[farnorth] *= -1.0
- dlat[farnorth] *= -1.0
- lon1 = lonsout + dlon
- lat1 = latsout + dlat
- xn, yn = self(lon1, lat1)
- vecangle = np.arctan2(yn-y, xn-x)
- if somenorth:
- vecangle[farnorth] += np.pi
- uvcout = uvmag * np.exp(1j*vecangle)
- uout = uvcout.real
- vout = uvcout.imag
- if masked:
- uout = ma.array(uout, mask=mask)
- vout = ma.array(vout, mask=mask)
- if returnxy:
- return uout,vout,x,y
- else:
- return uout,vout
+ return self.rotate_vector(uin,vin,lonsout,latsout,returnxy=returnxy)
 
 def rotate_vector(self,uin,vin,lons,lats,returnxy=False):
 """
- rotate a vector field (uin,vin) on a rectilinear lat/lon grid
- with longitudes = lons and latitudes = lats from geographical into map
- projection coordinates.
+ Rotate a vector field (``uin,vin``) on a rectilinear lat/lon grid
+ with longitudes = ``lons`` and latitudes = ``lats`` from 
+ geographical (lat/lon) into map projection (x/y) coordinates.
 
- Differs from transform_vector in that no interpolation is done,
- the vector is returned on the same lat/lon grid, but rotated into
+ Differs from transform_vector in that no interpolation is done.
+ The vector is returned on the same lat/lon grid, but rotated into
 x,y coordinates.
 
- lons, lats must be rank-2 arrays containing longitudes and latitudes
- (in degrees) of grid.
-
- if returnxy=True, the x and y values of the lat/lon grid
- are also returned (default False).
-
 The input vector field is defined in spherical coordinates (it
 has eastward and northward components) while the output
 vector field is rotated to map projection coordinates (relative
 to x and y). The magnitude of the vector is preserved.
+
+ ============== ====================================================
+ Keyword Description
+ ============== ====================================================
+ uin, vin input vector field on a lat/lon grid.
+ lons, lats Arrays containing longitudes and latitudes
+ (in degrees) of input data in increasing order.
+ For non-cylindrical projections (those other than
+ ``cyl``, ``merc`` and ``mill``) lons must fit 
+ within range -180 to 180.
+ returnxy If True, the x and y values of the native map
+ projection grid are also returned (Default False).
+ ============== ====================================================
+
+ Returns ``uout, vout`` (rotated vector field on map projection grid).
+ If returnxy=True, returns ``uout,vout,x,y``.
 """
+ if lons.ndim == 1 and lats.ndim == 1:
+ lons, lats = np.meshgrid(lons, lats) 
 x, y = self(lons, lats)
 # rotate from geographic to map coordinates.
 if ma.isMaskedArray(uin):
@@ -2393,9 +2386,10 @@
 
 def scatter(self, *args, **kwargs):
 """
- Plot points with markers on the map (see matplotlib.pyplot.scatter documentation).
+ Plot points with markers on the map
+ (see matplotlib.pyplot.scatter documentation).
 
- extra keyword 'ax' can be used to override the default axes instance.
+ Extra keyword ``ax`` can be used to override the default axes instance.
 """
 if not kwargs.has_key('ax') and self.ax is None:
 try:
@@ -2428,9 +2422,10 @@
 
 def plot(self, *args, **kwargs):
 """
- Draw lines and/or markers on the map (see matplotlib.pyplot.plot documentation).
+ Draw lines and/or markers on the map 
+ (see matplotlib.pyplot.plot documentation).
 
- extra keyword 'ax' can be used to override the default axis instance.
+ Extra keyword ``ax`` can be used to override the default axis instance.
 """
 if not kwargs.has_key('ax') and self.ax is None:
 try:
@@ -2463,11 +2458,13 @@
 
 def imshow(self, *args, **kwargs):
 """
- Display an image over the map (see matplotlib.pyplot.imshow documentation).
- extent and origin keywords set automatically so image will be drawn
- over map region.
+ Display an image over the map 
+ (see matplotlib.pyplot.imshow documentation).
 
- extra keyword 'ax' can be used to override the default axis instance.
+ ``extent`` and ``origin`` keywords set automatically so image
+ will be drawn over map region.
+
+ Extra keyword ``ax`` can be used to override the default axis instance.
 """
 if not kwargs.has_key('ax') and self.ax is None:
 try:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5533
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5533&view=rev
Author: dsdale
Date: 2008年06月13日 19:31:40 -0700 (2008年6月13日)
Log Message:
-----------
added a few incomplete backend APIs
Modified Paths:
--------------
 trunk/matplotlib/doc/api/index_backend_api.rst
Added Paths:
-----------
 trunk/matplotlib/doc/api/backend_gtkagg_api.rst
 trunk/matplotlib/doc/api/backend_qt4agg_api.rst
 trunk/matplotlib/doc/api/backend_wxagg_api.rst
Added: trunk/matplotlib/doc/api/backend_gtkagg_api.rst
===================================================================
--- trunk/matplotlib/doc/api/backend_gtkagg_api.rst	 (rev 0)
+++ trunk/matplotlib/doc/api/backend_gtkagg_api.rst	2008年06月14日 02:31:40 UTC (rev 5533)
@@ -0,0 +1,7 @@
+
+:mod:`matplotlib.backends.backend_gtkagg`
+=========================================
+
+.. automodule:: matplotlib.backends.backend_gtkagg
+ :members:
+ :undoc-members:
\ No newline at end of file
Added: trunk/matplotlib/doc/api/backend_qt4agg_api.rst
===================================================================
--- trunk/matplotlib/doc/api/backend_qt4agg_api.rst	 (rev 0)
+++ trunk/matplotlib/doc/api/backend_qt4agg_api.rst	2008年06月14日 02:31:40 UTC (rev 5533)
@@ -0,0 +1,7 @@
+
+:mod:`matplotlib.backends.backend_qt4agg`
+=========================================
+
+.. automodule:: matplotlib.backends.backend_qt4agg
+ :members:
+ :undoc-members:
\ No newline at end of file
Added: trunk/matplotlib/doc/api/backend_wxagg_api.rst
===================================================================
--- trunk/matplotlib/doc/api/backend_wxagg_api.rst	 (rev 0)
+++ trunk/matplotlib/doc/api/backend_wxagg_api.rst	2008年06月14日 02:31:40 UTC (rev 5533)
@@ -0,0 +1,7 @@
+
+:mod:`matplotlib.backends.backend_wxagg`
+========================================
+
+.. automodule:: matplotlib.backends.backend_wxagg
+ :members:
+ :undoc-members:
\ No newline at end of file
Modified: trunk/matplotlib/doc/api/index_backend_api.rst
===================================================================
--- trunk/matplotlib/doc/api/index_backend_api.rst	2008年06月14日 02:06:44 UTC (rev 5532)
+++ trunk/matplotlib/doc/api/index_backend_api.rst	2008年06月14日 02:31:40 UTC (rev 5533)
@@ -5,4 +5,6 @@
 .. toctree::
 
 backend_bases_api.rst
-
+ backend_gtkagg_api.rst
+ backend_qt4agg_api.rst
+ backend_wxagg_api.rst
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5532
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5532&view=rev
Author: dsdale
Date: 2008年06月13日 19:06:44 -0700 (2008年6月13日)
Log Message:
-----------
convert docstrings to rest
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/__init__.py
 trunk/matplotlib/lib/matplotlib/backend_bases.py
Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2008年06月14日 02:03:20 UTC (rev 5531)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2008年06月14日 02:06:44 UTC (rev 5532)
@@ -1,57 +1,91 @@
 """
 This is an object-orient plotting library.
 
-A procedural interface is provided by the companion pylab
-module, which may be imported directly, e.g.
+A procedural interface is provided by the companion pylab module,
+which may be imported directly, e.g::
 
 from pylab import *
 
-or using ipython:
+or using ipython::
 
 ipython -pylab
 
-For the most part, direct use of the object-oriented library
-is encouraged when programming rather than working
-interactively. The exceptions are the pylab commands
-figure(), subplot(), show(), and savefig(), which can
-greatly simplify scripting.
+For the most part, direct use of the object-oriented library is
+encouraged when programming rather than working interactively. The
+exceptions are the pylab commands :func:`~matplotlib.pyplot.figure`,
+:func:`~matplotlib.pyplot.subplot`,
+:func:`~matplotlib.backends.backend_qt4agg.show`, and
+:func:`~pyplot.savefig`, which can greatly simplify scripting.
 
 Modules include:
- axes: defines the Axes class. Most pylab commands are
- wrappers for Axes methods. The axes module is the
- highest level of OO access to the library.
- figure: defines Figure class.
- artist: defines the Artist base class for all classes
- that draw things.
- line: defines Line2D class for drawing lines and markers
- patches: defines classes for drawing polygons
- text: defines Text, TextWithDash, and Annotate classes
- image: defines AxesImage and FigureImage classes
- collections: classes for efficient drawing of groups of
- lines or polygons
- colors: classes for interpreting color specifications
- and for making colormaps
- cm: colormaps and the ScalarMappable mixin class for
- providing color mapping functionality to other
+
+ :mod:`matplotlib.axes`
+ defines the :class:`~matplotlib.axes.Axes` class. Most pylab
+ commands are wrappers for :class:`~matplotlib.axes.Axes`
+ methods. The axes module is the highest level of OO access to
+ the library.
+
+ :mod:`matplotlib.figure`
+ defines the :class:`~matplotlib.figure.Figure` class.
+
+ :mod:`matplotlib.artist`
+ defines the :class:`~matplotlib.artist.Artist` base class for
+ all classes that draw things.
+
+ :mod:`matplotlib.lines`
+ defines the :class:`~matplotlib.lines.Line2D` class for
+ drawing lines and markers
+
+ :mod`matplotlib.patches`
+ defines classes for drawing polygons
+
+ :mod:`matplotlib.text`
+ defines the :class:`~matplotlib.text.Text`,
+ :class:`~matplotlib.text.TextWithDash`, and
+ :class:`~matplotlib.text.Annotate` classes
+
+ :mod:`matplotlib.image`
+ defines the :class:`~matplotlib.image.AxesImage` and
+ :class:`~matplotlib.image.FigureImage` classes
+
+ :mod:`matplotlib.collections`
+ classes for efficient drawing of groups of lines or polygons
+
+ :mod:`matplotlib.colors`
+ classes for interpreting color specifications and for making
+ colormaps
+
+ :mod:`matplotlib.cm`
+ colormaps and the :class:`~matplotlib.image.ScalarMappable`
+ mixin class for providing color mapping functionality to other
 classes
- ticker: classes for calculating tick mark locations and
- for formatting tick labels
- backends: a subpackage with modules for various gui
- libraries and output formats
 
+ :mod:`matplotlib.ticker`
+ classes for calculating tick mark locations and for formatting
+ tick labels
+
+ :mod:`matplotlib.backends`
+ a subpackage with modules for various gui libraries and output
+ formats
+
 The base matplotlib namespace includes:
- rcParams: a dictionary of default configuration
- settings. It is initialized by code which may be
- overridded by a matplotlibrc file.
- rc(): a function for setting groups of rcParams values
- use(): a function for setting the matplotlib backend.
- If used, this function must be called immediately
- after importing matplotlib for the first time. In
- particular, it must be called *before* importing
- pylab (if pylab is imported).
 
-matplotlib is written by John D. Hunter (jdh2358 at
-gmail.com and a host of others).
+ :data:`~matplotlib.rcParams`
+ a global dictionary of default configuration settings. It is
+ initialized by code which may be overridded by a matplotlibrc
+ file.
+
+ :func:`~matplotlib.rc`
+ a function for setting groups of rcParams values
+
+ :func:`~matplotlib.use`
+ a function for setting the matplotlib backend. If used, this
+ function must be called immediately after importing matplotlib
+ for the first time. In particular, it must be called
+ **before** importing pylab (if pylab is imported).
+
+matplotlib is written by John D. Hunter (jdh2358 at gmail.com) and a
+host of others.
 """
 from __future__ import generators
 
@@ -773,10 +807,8 @@
 rcParams['cairo.format'] = validate_cairo_format(be_parts[1])
 
 def get_backend():
- # Validation is needed because the rcParams entry might have
- # been set directly rather than via "use()".
- return validate_backend(rcParams['backend'])
- #return rcParams['backend'].lower()
+ "Returns the current backend"
+ return rcParams['backend']
 
 def interactive(b):
 """
Modified: trunk/matplotlib/lib/matplotlib/backend_bases.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backend_bases.py	2008年06月14日 02:03:20 UTC (rev 5531)
+++ trunk/matplotlib/lib/matplotlib/backend_bases.py	2008年06月14日 02:06:44 UTC (rev 5532)
@@ -1474,34 +1474,34 @@
 They must also define
 
 :meth:`save_figure`
-	 save the current figure
+ save the current figure
 
 :meth:`set_cursor`
-	 if you want the pointer icon to change
+ if you want the pointer icon to change
 
 :meth:`_init_toolbar`
-	 create your toolbar widget
+ create your toolbar widget
 
 :meth:`draw_rubberband` (optional)
-	 draw the zoom to rect "rubberband" rectangle
+ draw the zoom to rect "rubberband" rectangle
 
 :meth:`press` (optional)
-	 whenever a mouse button is pressed, you'll be
-	 notified with the event
+ whenever a mouse button is pressed, you'll be notified with
+ the event
 
 :meth:`release` (optional)
-	 whenever a mouse button is released, you'll be notified with
-	 the event
+ whenever a mouse button is released, you'll be notified with
+ the event
 
 :meth:`dynamic_update` (optional)
-	 dynamically update the window while navigating
+ dynamically update the window while navigating
 
 :meth:`set_message` (optional)
-	 display message
+ display message
 
 :meth:`set_history_buttons` (optional)
-	 you can change the history back / forward buttons to
-	 indicate disabled / enabled state.
+ you can change the history back / forward buttons to
+ indicate disabled / enabled state.
 
 That's it, we'll do the rest!
 """
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5531
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5531&view=rev
Author: dsdale
Date: 2008年06月13日 19:03:20 -0700 (2008年6月13日)
Log Message:
-----------
reorganized backend_api so we can include numerous backends in seperate 
html pages
Modified Paths:
--------------
 trunk/matplotlib/doc/api/index.rst
Added Paths:
-----------
 trunk/matplotlib/doc/api/backend_bases_api.rst
 trunk/matplotlib/doc/api/index_backend_api.rst
Removed Paths:
-------------
 trunk/matplotlib/doc/api/backend_api.rst
Deleted: trunk/matplotlib/doc/api/backend_api.rst
===================================================================
--- trunk/matplotlib/doc/api/backend_api.rst	2008年06月14日 02:02:08 UTC (rev 5530)
+++ trunk/matplotlib/doc/api/backend_api.rst	2008年06月14日 02:03:20 UTC (rev 5531)
@@ -1,11 +0,0 @@
-*******************
-matplotlib backends
-*******************
-
-
-:mod:`matplotlib.backend_bases`
-================================
-
-.. automodule:: matplotlib.backend_bases
- :members:
- :undoc-members:
Added: trunk/matplotlib/doc/api/backend_bases_api.rst
===================================================================
--- trunk/matplotlib/doc/api/backend_bases_api.rst	 (rev 0)
+++ trunk/matplotlib/doc/api/backend_bases_api.rst	2008年06月14日 02:03:20 UTC (rev 5531)
@@ -0,0 +1,7 @@
+
+:mod:`matplotlib.backend_bases`
+================================
+
+.. automodule:: matplotlib.backend_bases
+ :members:
+ :undoc-members:
Modified: trunk/matplotlib/doc/api/index.rst
===================================================================
--- trunk/matplotlib/doc/api/index.rst	2008年06月14日 02:02:08 UTC (rev 5530)
+++ trunk/matplotlib/doc/api/index.rst	2008年06月14日 02:03:20 UTC (rev 5531)
@@ -15,4 +15,4 @@
 artist_api.rst
 axes_api.rst
 pyplot_api.rst
- backend_api.rst
+ index_backend_api.rst
Copied: trunk/matplotlib/doc/api/index_backend_api.rst (from rev 5529, trunk/matplotlib/doc/api/backend_api.rst)
===================================================================
--- trunk/matplotlib/doc/api/index_backend_api.rst	 (rev 0)
+++ trunk/matplotlib/doc/api/index_backend_api.rst	2008年06月14日 02:03:20 UTC (rev 5531)
@@ -0,0 +1,8 @@
+*******************
+matplotlib backends
+*******************
+
+.. toctree::
+
+ backend_bases_api.rst
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5530
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5530&view=rev
Author: dsdale
Date: 2008年06月13日 19:02:08 -0700 (2008年6月13日)
Log Message:
-----------
updated configuration api
Modified Paths:
--------------
 trunk/matplotlib/doc/api/matplotlib_configuration_api.rst
Modified: trunk/matplotlib/doc/api/matplotlib_configuration_api.rst
===================================================================
--- trunk/matplotlib/doc/api/matplotlib_configuration_api.rst	2008年06月13日 22:32:59 UTC (rev 5529)
+++ trunk/matplotlib/doc/api/matplotlib_configuration_api.rst	2008年06月14日 02:02:08 UTC (rev 5530)
@@ -6,19 +6,7 @@
 :mod:`matplotlib`
 =================
 
-.. autofunction:: matplotlib.get_backend
-.. autofunction:: matplotlib.get_configdir
-.. autofunction:: matplotlib.interactive
-.. autofunction:: matplotlib.rc
-.. autofunction:: matplotlib.rcdefaults
-.. autoclass:: matplotlib.RcParams
-.. autofunction:: matplotlib.use
-.. autoclass:: matplotlib.Verbose
+.. automodule:: matplotlib
+ :members: rc, rcdefaults, use
+ :undoc-members:
 
-
-:mod:`matplotlib.rcsetup`
-=========================
-
-.. automodule:: matplotlib.rcsetup
- :members:
- :undoc-members:
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.