Menu
▾
▴
SF.net SVN: matplotlib: [4491] branches/transforms
|
From: <md...@us...> - 2007-11-28 18:30:12
|
Revision: 4491
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4491&view=rev
Author: mdboom
Date: 2007-11-28 10:30:10 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
Merged revisions 4444-4490 via svnmerge from
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib
........
r4457 | jdh2358 | 2007-11-26 16:53:01 -0500 (Mon, 26 Nov 2007) | 2 lines
fixed a bug in unit processing -- thanks chris
........
r4461 | efiring | 2007-11-26 21:24:22 -0500 (Mon, 26 Nov 2007) | 5 lines
Fixed pcolormesh bug
Integer X input was causing Y to be turned into
an integer as well.
........
r4472 | jdh2358 | 2007-11-27 13:34:38 -0500 (Tue, 27 Nov 2007) | 2 lines
tagged version 91.0 for release
........
r4474 | cmoad | 2007-11-27 20:31:59 -0500 (Tue, 27 Nov 2007) | 1 line
version bumps
........
r4475 | cmoad | 2007-11-27 20:33:15 -0500 (Tue, 27 Nov 2007) | 1 line
rev typo fixed for 0.91 release
........
r4476 | cmoad | 2007-11-27 21:24:40 -0500 (Tue, 27 Nov 2007) | 1 line
CXX/WrapPython.h was missing from sdist build
........
r4477 | cmoad | 2007-11-27 21:25:06 -0500 (Tue, 27 Nov 2007) | 1 line
rev bump for new bug
........
r4478 | cmoad | 2007-11-27 21:48:38 -0500 (Tue, 27 Nov 2007) | 1 line
reverting WrapPython.h inclusion
........
r4482 | mdboom | 2007-11-28 10:18:41 -0500 (Wed, 28 Nov 2007) | 2 lines
Remove fonts/otf directory in list of data files.
........
r4486 | jdh2358 | 2007-11-28 13:11:27 -0500 (Wed, 28 Nov 2007) | 2 lines
updated coding guide with trailing whitespace config suggestion
........
r4490 | jdh2358 | 2007-11-28 13:28:19 -0500 (Wed, 28 Nov 2007) | 2 lines
fixed coding guide bug for trailing whitespace
........
Modified Paths:
--------------
branches/transforms/API_CHANGES
branches/transforms/CHANGELOG
branches/transforms/CODING_GUIDE
branches/transforms/lib/matplotlib/__init__.py
branches/transforms/lib/matplotlib/axes.py
branches/transforms/lib/matplotlib/mlab.py
branches/transforms/license/LICENSE
branches/transforms/setup.py
Property Changed:
----------------
branches/transforms/
Property changes on: branches/transforms
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/matplotlib:1-4443
+ /trunk/matplotlib:1-4490
Modified: branches/transforms/API_CHANGES
===================================================================
--- branches/transforms/API_CHANGES 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/API_CHANGES 2007-11-28 18:30:10 UTC (rev 4491)
@@ -33,11 +33,11 @@
Bbox.height() Bbox.height
Bbox.intervalx().get_bounds() Bbox.intervalx
- Bbox.intervalx().set_bounds()
+ Bbox.intervalx().set_bounds()
[Bbox.intervalx is now a property.]
Bbox.intervaly().get_bounds() Bbox.intervaly
- Bbox.intervaly().set_bounds()
+ Bbox.intervaly().set_bounds()
[Bbox.intervaly is now a property.]
Bbox.xmin() Bbox.x0 or Bbox.xmin
@@ -84,7 +84,7 @@
[Axes.set_position() now accepts either four scalars or a
transforms Bbox instance.]
- [also returns a Bbox]
+ [also returns a Bbox]
Axes.toggle_log_lineary() Axes.set_yscale()
[Since the recfactoring allows for more than two scale types
('log' or 'linear'), it no longer makes sense to have a
@@ -119,10 +119,10 @@
contour.py
Contour._segments Contour.get_paths()
- [Contour.get_paths() now returns a list of path.Path instances.]
+ [Contour.get_paths() now returns a list of path.Path instances.]
figure.py
- Figure.dpi.get()/set() Figure.dpi (a property)
+ Figure.dpi.get()/set() Figure.dpi (a property)
patches.py
get_verts() get_path()
@@ -150,9 +150,9 @@
offsetTrans, facecolors, edgecolors, linewidths,
linestyles, antialiaseds) [optional]
-
+
**changed methods** --->
- draw_image(self, x, y, im, bbox) draw_image(self, x, y, im, bbox,
+ draw_image(self, x, y, im, bbox) draw_image(self, x, y, im, bbox,
clippath, clippath_trans)
**removed methods** --->
@@ -166,9 +166,11 @@
draw_polygon
draw_rectangle
draw_regpoly_collection
-
+
END OF TRANSFORMS REFACTORING
+0.91.0 Released
+
Changed cbook.is_file_like to cbook.is_writable_file_like and
corrected behavior.
Modified: branches/transforms/CHANGELOG
===================================================================
--- branches/transforms/CHANGELOG 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/CHANGELOG 2007-11-28 18:30:10 UTC (rev 4491)
@@ -1,3 +1,6 @@
+===============================================================
+2007-11-27 Released 0.91.0 at revision 4478
+
2007-11-13 All backends now support writing to a file-like object, not
just a regular file. savefig() can be passed a file-like
object in place of a file path. - MGD
Modified: branches/transforms/CODING_GUIDE
===================================================================
--- branches/transforms/CODING_GUIDE 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/CODING_GUIDE 2007-11-28 18:30:10 UTC (rev 4491)
@@ -39,6 +39,8 @@
* If you have altered extension code, do you pass
unit/memleak_hawaii.py?
+
+
== Importing and name spaces ==
For numpy, use:
@@ -103,7 +105,27 @@
to replace a single long line with two shorter and more
readable lines.
+Please do not commit lines with trailing white space, as it causes
+noise in svn diffs. If you are an emacs user, the following in your
+.emacs will cause emacs to strip trailing white space on save for
+python, C and C++
+; and similarly for c++-mode-hook and c-mode-hook
+(add-hook 'python-mode-hook
+ (lambda ()
+ (add-hook 'write-file-functions 'delete-trailing-whitespace)))
+
+
+
+for older versions of emacs (emacs<22) you may need to do
+
+(add-hook 'python-mode-hook
+ (lambda ()
+ (add-hook 'local-write-file-hooks 'delete-trailing-whitespace)))
+
+
+
+
== Licenses ==
matplotlib only uses BSD compatible code. If you bring in code from
Modified: branches/transforms/lib/matplotlib/__init__.py
===================================================================
--- branches/transforms/lib/matplotlib/__init__.py 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/lib/matplotlib/__init__.py 2007-11-28 18:30:10 UTC (rev 4491)
@@ -51,11 +51,11 @@
pylab (if pylab is imported).
matplotlib is written by John D. Hunter (jdh2358 at
-gmail.com).
+gmail.com and a host of others).
"""
from __future__ import generators
-__version__ = '0.90.1'
+__version__ = '0.91.0'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/transforms/lib/matplotlib/axes.py
===================================================================
--- branches/transforms/lib/matplotlib/axes.py 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/lib/matplotlib/axes.py 2007-11-28 18:30:10 UTC (rev 4491)
@@ -180,7 +180,7 @@
def __call__(self, *args, **kwargs):
- if self.axes.xaxis is not None and self.axes.xaxis is not None:
+ if self.axes.xaxis is not None and self.axes.yaxis is not None:
xunits = kwargs.pop( 'xunits', self.axes.xaxis.units)
yunits = kwargs.pop( 'yunits', self.axes.yaxis.units)
if xunits!=self.axes.xaxis.units:
@@ -1305,6 +1305,8 @@
artists = []
+
+
if len(self.images)<=1 or renderer.option_image_nocomposite():
for im in self.images:
im.draw(renderer)
@@ -4798,7 +4800,7 @@
X = X.ravel()
Y = Y.ravel()
- coords = npy.zeros(((Nx * Ny), 2), X.dtype)
+ coords = npy.zeros(((Nx * Ny), 2), dtype=float)
coords[:, 0] = X
coords[:, 1] = Y
Modified: branches/transforms/lib/matplotlib/mlab.py
===================================================================
--- branches/transforms/lib/matplotlib/mlab.py 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/lib/matplotlib/mlab.py 2007-11-28 18:30:10 UTC (rev 4491)
@@ -14,10 +14,7 @@
* find - Return the indices where some condition is true;
numpy.nonzero is similar but more general.
- * polyfit - least squares best polynomial fit of x to y
- * polyval - evaluate a vector for a vector of polynomial coeffs
-
* prctile - find the percentiles of a sequence
* prepca - Principal Component Analysis
@@ -29,11 +26,14 @@
The following are deprecated; please import directly from numpy
(with care--function signatures may differ):
+
* conv - convolution (numpy.convolve)
* corrcoef - The matrix of correlation coefficients
* hist -- Histogram (numpy.histogram)
* linspace -- Linear spaced array from min to max
* meshgrid
+ * polyfit - least squares best polynomial fit of x to y
+ * polyval - evaluate a vector for a vector of polynomial coeffs
* trapz - trapeziodal integration (trapz(x,y) -> numpy.trapz(y,x))
* vander - the Vandermonde matrix
@@ -46,13 +46,13 @@
= record array helper functions =
- rec2csv : store record array in CSV file
- rec2excel : store record array in excel worksheet - required pyExcelerator
- rec2gtk : put record array in GTK treeview - requires gtk
- csv2rec : import record array from CSV file with type inspection
- rec_append_field : add a field/array to record array
- rec_drop_fields : drop fields from record array
- rec_join : join two record arrays on sequence of fields
+ * rec2csv : store record array in CSV file
+ * rec2excel : store record array in excel worksheet - required pyExcelerator
+ * rec2gtk : put record array in GTK treeview - requires gtk
+ * csv2rec : import record array from CSV file with type inspection
+ * rec_append_field : add a field/array to record array
+ * rec_drop_fields : drop fields from record array
+ * rec_join : join two record arrays on sequence of fields
For the rec viewer clases (rec2csv, rec2excel and rec2gtk), there are
a bunch of Format objects you can pass into the functions that will do
Modified: branches/transforms/license/LICENSE
===================================================================
--- branches/transforms/license/LICENSE 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/license/LICENSE 2007-11-28 18:30:10 UTC (rev 4491)
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.90
+LICENSE AGREEMENT FOR MATPLOTLIB 0.91
--------------------------------------
1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@
2. Subject to the terms and conditions of this License Agreement, JDH
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 0.90
+derivative works, distribute, and otherwise use matplotlib 0.91
alone or in any derivative version, provided, however, that JDH's
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
2002-2007 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.90 alone or in any derivative version prepared by
+matplotlib 0.91 alone or in any derivative version prepared by
Licensee.
3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 0.90 or any part thereof, and wants to
+incorporates matplotlib 0.91 or any part thereof, and wants to
make the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 0.90.
+the changes made to matplotlib 0.91.
-4. JDH is making matplotlib 0.90 available to Licensee on an "AS
+4. JDH is making matplotlib 0.91 available to Licensee on an "AS
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.90
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.91
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-0.90 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+0.91 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.90, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 0.91, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
-8. By copying, installing or otherwise using matplotlib 0.90,
+8. By copying, installing or otherwise using matplotlib 0.91,
Licensee agrees to be bound by the terms and conditions of this License
Agreement.
Modified: branches/transforms/setup.py
===================================================================
--- branches/transforms/setup.py 2007-11-28 18:28:19 UTC (rev 4490)
+++ branches/transforms/setup.py 2007-11-28 18:30:10 UTC (rev 4491)
@@ -88,7 +88,6 @@
'mpl-data/fonts/pdfcorefonts/*.afm',
'mpl-data/fonts/pdfcorefonts/*.txt',
'mpl-data/fonts/ttf/*.ttf',
- 'mpl-data/fonts/otf/*.otf',
'mpl-data/images/*.xpm',
'mpl-data/images/*.svg',
'mpl-data/images/*.png',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
