sync to 0.52 release

svn path=/trunk/matplotlib/; revision=184

Author: jdh2358

LICENSE/LICENSE

@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 0.51
+LICENSE AGREEMENT FOR MATPLOTLIB 0.52
 --------------------------------------
 
 1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and
@@ -9,30 +9,30 @@ documentation.
 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.51
+prepare derivative works, distribute, and otherwise use matplotlib 0.52
 alone or in any derivative version, provided, however, that JDH's
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
 2002, 2003 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 0.51 alone or in any derivative version prepared by
+matplotlib 0.52 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.51 or any part thereof, and wants to make
+or incorporates matplotlib 0.52 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.51.
+the changes made to matplotlib 0.52.
 
-4. JDH is making matplotlib 0.51 available to Licensee on an "AS IS"
+4. JDH is making matplotlib 0.52 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.51 WILL NOT
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.52 WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
-MATPLOTLIB 0.51 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
+MATPLOTLIB 0.52 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES
 OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 0.51, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+MATPLOTLIB 0.52, 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 @@ Licensee.  This License Agreement does not grant permission to use JDH
 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.51, Licensee
+8. By copying, installing or otherwise using matplotlib 0.52, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.

MANIFEST

@@ -6,7 +6,6 @@ GOALS
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
-MANIFEST
 MANIFEST.in
 Makefile
 README
@@ -266,10 +265,12 @@ examples/embedding_in_gtk2.py
 examples/embedding_in_wx.py
 examples/errorbar_demo.py
 examples/figtext.py
+examples/fill_demo.py
 examples/ftface_props.py
 examples/gdtest.py
 examples/histogram_demo.py
 examples/image_demo.py
+examples/image_demo2.py
 examples/interactive.py
 examples/interactive2.py
 examples/legend_demo.py
@@ -286,11 +287,13 @@ examples/mri_with_eeg.py
 examples/multiple_figs_demo.py
 examples/object_picker.py
 examples/pcolor_demo.py
+examples/pcolor_demo2.py
 examples/psd_demo.py
 examples/pstest.py
 examples/scatter_demo.py
 examples/scatter_demo2.py
 examples/simple_plot.py
+examples/specgram_demo.py
 examples/stock_demo.py
 examples/subplot_demo.py
 examples/system_monitor.py
@@ -432,14 +435,19 @@ src/_tkagg.cpp
 src/ft2font.c
 src/ft2font.h
 ttfquery/__init__.py
+ttfquery/__init__.pyc
 ttfquery/_scriptregistry.py
+ttfquery/_scriptregistry.pyc
 ttfquery/describe.py
+ttfquery/describe.pyc
 ttfquery/family_query.py
 ttfquery/findsystem.py
+ttfquery/findsystem.pyc
 ttfquery/font_family_groups.py
 ttfquery/glyph.py
 ttfquery/glyphquery.py
 ttfquery/guessdescription.py
 ttfquery/license.txt
 ttfquery/metadata_query.py
 ttfquery/ttffiles.py
+ttfquery/ttffiles.pyc

Makefile

@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.26  2004/03/16 20:26:36  jdh2358
+# sync to 0.52 release
+#
 # Revision 1.25  2004/03/15 14:49:46  jdh2358
 # updated image to work with data coords; moved image extendsion to _image
 #
@@ -82,7 +85,7 @@ PYTHON = /usr/local/bin/python2.3
 PYDOC = /usr/local/bin/pydoc
 VERSION = `${PYTHON} setup.py --version`
 
-DISTFILES = API_CHANGES KNOWN_BUGS INSTALL README TODO LICENSE	\
+DISTFILES = API_CHANGES KNOWN_BUGS INSTALL README TODO license	\
 	CHANGELOG Makefile GOALS INTERACTIVE			\
 	MANIFEST.in matplotlib examples setup.py
 

TODO

@@ -272,4 +272,6 @@
 
 -- DONE - support partial window expose redraws in agg
 
--- Fix datalim problem with aspect preserved for image backend
+-- Fix datalim problem with aspect preserved for image backend
+
+- add get_xlim and get_ylim for patches

examples/backend_driver.py

@@ -17,8 +17,11 @@
     'barchart_demo.py',
     'color_demo.py',
     'csd_demo.py',
+    'fill_demo.py',
     'figtext.py',
     'histogram_demo.py',
+    'image_demo.py',
+    'image_demo2.py',
     'legend_demo.py',
     'legend_demo2.py',
     'line_styles.py',
@@ -28,11 +31,13 @@
     'mri_with_eeg.py',
     'multiple_figs_demo.py',
     'pcolor_demo.py',
+    'pcolor_demo2.py',
     'psd_demo.py',
     'scatter_demo.py',
     'scatter_demo2.py',
     'simple_plot.py',
     'stock_demo.py',
+    'specgram_demo.py',
     'subplot_demo.py',
     'table_demo.py',
     'text_handles.py',

examples/fill_demo.py

@@ -2,6 +2,6 @@
 t = arange(0.0, 1.01, 0.01)
 s = sin(2*2*pi*t)
 
-fill(t, s, 'r')
+fill(t, s*exp(-5*t), 'r')
 grid(True)
 show()

examples/image_demo.py

@@ -15,11 +15,6 @@ def bivariate_normal(X, Y, sigmax=1.0, sigmay=1.0,
     z = Xmu**2/sigmax**2 + Ymu**2/sigmay - 2*rho*Xmu*Ymu/(sigmax*sigmay)
     return 1.0/(2*pi*sigmax*sigmay*(1-rho**2)) * exp( -z/(2*(1-rho**2)))
 
-def normz(Z):
-    'constrain array to be in 0,1'
-    minz = min(min(Z))
-    maxz = max(max(Z))
-    return 1.0/(maxz-minz)*(Z-minz)
 
 delta = 0.025
 x = arange(-3.0, 3.0, delta)
@@ -29,13 +24,13 @@ def normz(Z):
 Z2 = bivariate_normal(X, Y, 1.5, 0.5, 1, 1)
 
 # difference of Gaussians
-im = imshow(normz(Z2-Z1))
+im = imshow(Z2-Z1)
 
 # set the interpolation method: 'nearest', 'bilinear', 'bicubic' and much more
 im.set_interpolation('bilinear')
 
 
 axis('off')
-savefig('test')
+#savefig('test')
 show()
 

examples/image_demo2.py

@@ -7,7 +7,7 @@
 A.shape = w, h
 
 im = imshow(A)
-im.set_aspect('free')
+#im.set_aspect('preserve')
 
 # plot some data with the image; currently broken with aspect preserve
 gca().set_image_extent(0, 25, 0, 25)

examples/mri_demo.py

@@ -4,10 +4,8 @@
 dfile = 'data/s1045.ima'
 im = fromstring(file(dfile, 'rb').read(), Int16).astype(Float)
 im.shape = 256, 256
-# flip upside down
-im = array([im[i] for i in arange(255,-1,-1)])
 
-pcolor(im, shading='flat')
+imshow(im, ColormapJet(256))
 axis('off')
 #savefig('mri_demo')
 show()

examples/mri_with_eeg.py

@@ -1,10 +1,7 @@
-# note, this is currentl *very slow*.  I'm working on improving the
-# efficiency of pcolor.  If you want to run this example and your
-# computer is not very fast, I suggest you grab a cup of coffee while
-# it runs.  Look for major improvments in pcolor in future releases of
-# matplotlib when we add image handling capability in extension module
-# code
-
+"""
+This now uses the imshow command instead of pcolor which *is much
+faster*
+"""
 from __future__ import division
 from matplotlib.matlab import *
 from matplotlib.lines import Line2D
@@ -16,12 +13,10 @@
     dfile = 'data/s1045.ima'
     im = fromstring(file(dfile, 'rb').read(), Int16).astype(Float)
     im.shape = 256, 256
-    # flip upside down
-    im = array([im[i] for i in arange(255,-1,-1)])
 
 if 1: # plot the MRI in pcolor
     subplot(221)
-    pcolor(im, shading='flat')
+    imshow(im, ColormapJet(256))
     axis('off')
 
 if 1:  # plot the histogram of MRI intensity

examples/pcolor_demo.py

@@ -1,3 +1,6 @@
+"""
+See pcolor_demo2 for a much faster way of generating pcolor plots
+"""
 from __future__ import division
 from matplotlib.matlab import *
 

setup.py

@@ -99,7 +99,7 @@
 
 
 setup(name="matplotlib",
-      version= '0.52c',
+      version= '0.52',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",

src/_backend_agg.cpp

@@ -577,7 +577,7 @@ RendererAgg_draw_image(RendererAggObject *renderer, PyObject* args) {
     return NULL;
 
   //todo: handle x and y
-  agg::rect r(0, 0, image->widthOut, image->heightOut);
+  agg::rect r(0, 0, image->rowsOut, image->colsOut);
 
   renderer->rbase->copy_from(*image->rbufOut, &r, x, y);
   Py_INCREF(Py_None);