matplotlib-checkins Mailing List for matplotlib

Revision: 8095
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8095&view=rev
Author: efiring
Date: 2010年01月22日 23:48:35 +0000 (2010年1月22日)
Log Message:
-----------
Add units module to documentation
Modified Paths:
--------------
 trunk/matplotlib/doc/api/index.rst
Added Paths:
-----------
 trunk/matplotlib/doc/api/units_api.rst
Modified: trunk/matplotlib/doc/api/index.rst
===================================================================
--- trunk/matplotlib/doc/api/index.rst	2010年01月22日 23:47:14 UTC (rev 8094)
+++ trunk/matplotlib/doc/api/index.rst	2010年01月22日 23:48:35 UTC (rev 8095)
@@ -32,4 +32,5 @@
 pyplot_api.rst
 spine_api.rst
 ticker_api.rst
+ units_api.rst
 index_backend_api.rst
Added: trunk/matplotlib/doc/api/units_api.rst
===================================================================
--- trunk/matplotlib/doc/api/units_api.rst	 (rev 0)
+++ trunk/matplotlib/doc/api/units_api.rst	2010年01月22日 23:48:35 UTC (rev 8095)
@@ -0,0 +1,12 @@
+*****************
+matplotlib units
+*****************
+
+
+:mod:`matplotlib.units`
+========================
+
+.. automodule:: matplotlib.units
+ :members:
+ :undoc-members:
+ :show-inheritance:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8094
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8094&view=rev
Author: efiring
Date: 2010年01月22日 23:47:14 +0000 (2010年1月22日)
Log Message:
-----------
Fix units support for contour and contourf
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/contour.py
Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py	2010年01月22日 02:18:13 UTC (rev 8093)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2010年01月22日 23:47:14 UTC (rev 8094)
@@ -643,7 +643,7 @@
 if self.levels is None:
 self.levels = args[0].levels
 else:
- x, y, z = self._contour_args(*args)
+ x, y, z = self._contour_args(args, kwargs)
 
 x0 = ma.minimum(x)
 x1 = ma.maximum(x)
@@ -808,7 +808,7 @@
 y = y[::-1]
 return np.meshgrid(x,y)
 
- def _check_xyz(self, args):
+ def _check_xyz(self, args, kwargs):
 '''
 For functions like contour, check that the dimensions
 of the input arrays match; if x and y are 1D, convert
@@ -817,9 +817,10 @@
 Possible change: I think we should make and use an ArgumentError
 Exception class (here and elsewhere).
 '''
- # We can strip away the x and y units
- x = self.ax.convert_xunits( args[0] )
- y = self.ax.convert_yunits( args[1] )
+ x, y = args[:2]
+ self.ax._process_unit_info(xdata=x, ydata=y, kwargs=kwargs)
+ x = self.ax.convert_xunits(x)
+ y = self.ax.convert_yunits(y)
 
 x = np.asarray(x, dtype=np.float64)
 y = np.asarray(y, dtype=np.float64)
@@ -840,8 +841,7 @@
 return x,y,z
 
 
-
- def _contour_args(self, *args):
+ def _contour_args(self, args, kwargs):
 if self.filled: fn = 'contourf'
 else: fn = 'contour'
 Nargs = len(args)
@@ -849,7 +849,7 @@
 z = ma.asarray(args[0], dtype=np.float64)
 x, y = self._initialize_x_y(z)
 elif Nargs <=4:
- x,y,z = self._check_xyz(args[:3])
+ x,y,z = self._check_xyz(args[:3], kwargs)
 else:
 raise TypeError("Too many arguments to %s; see help(%s)" % (fn,fn))
 z = ma.masked_invalid(z, copy=False)
@@ -1103,9 +1103,14 @@
 are included. These added ranges are then mapped to the
 special colormap values which default to the ends of the
 colormap range, but can be set via
- :meth:`matplotlib.cm.Colormap.set_under` and
- :meth:`matplotlib.cm.Colormap.set_over` methods.
+ :meth:`matplotlib.colors.Colormap.set_under` and
+ :meth:`matplotlib.colors.Colormap.set_over` methods.
 
+ *xunits*, *yunits*: [ None | registered units ]
+ Override axis units by specifying an instance of a
+ :class:`matplotlib.units.ConversionInterface`.
+
+
 contour-only keyword arguments:
 
 *linewidths*: [ None | number | tuple of numbers ]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8093
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8093&view=rev
Author: efiring
Date: 2010年01月22日 02:18:13 +0000 (2010年1月22日)
Log Message:
-----------
Contourf: change method of making bottom bound include zmin.
This avoids a problem in colorbar tick labeling when zmin is 0.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/contour.py
Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py	2010年01月19日 00:26:16 UTC (rev 8092)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2010年01月22日 02:18:13 UTC (rev 8093)
@@ -676,8 +676,17 @@
 if self.filled:
 if self.linewidths is not None:
 warnings.warn('linewidths is ignored by contourf')
+
 lowers = self._levels[:-1]
+ if self.zmin == lowers[0]:
+ # Include minimum values in lowest interval
+ lowers = lowers.copy() # so we don't change self._levels
+ if self.logscale:
+ lowers[0] = 0.99 * self.zmin
+ else:
+ lowers[0] -= 1
 uppers = self._levels[1:]
+
 for level, level_upper in zip(lowers, uppers):
 nlist = C.trace(level, level_upper, nchunk = self.nchunk)
 nseg = len(nlist)//2
@@ -756,14 +765,6 @@
 zmin = self.zmin
 self.locator.set_bounds(zmin, zmax)
 lev = self.locator()
- zmargin = (zmax - zmin) * 0.000001 # so z < (zmax + zmargin)
- if zmax >= lev[-1]:
- lev[-1] += zmargin
- if zmin <= lev[0]:
- if self.logscale:
- lev[0] = 0.99 * zmin
- else:
- lev[0] -= zmargin
 self._auto = True
 if self.filled:
 return lev
@@ -1141,6 +1142,15 @@
 be removed. Chunking introduces artifacts at the chunk boundaries
 unless *antialiased* is *False*.
 
+ Note: contourf fills intervals that are closed at the top; that
+ is, for boundaries *z1* and *z2*, the filled region is::
+
+ z1 < z <= z2
+
+ There is one exception: if the lowest boundary coincides with
+ the minimum value of the *z* array, then that minimum value
+ will be included in the lowest interval.
+
 **Examples:**
 
 .. plot:: mpl_examples/pylab_examples/contour_demo.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.