syncing to 0.73

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

Author: jdh2358

LICENSE/LICENSE

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

Makefile

@@ -15,7 +15,7 @@ clean:
 	rm -f *.png *.ps *.eps *.svg *.jpg
 	find . -name "_tmp*.py" | xargs rm -f;\
 	find . \( -name "*~" -o -name "*.pyc" \) | xargs rm -f;\
-	find examples \( -name "*.svg" -o -name "*.png" -o -name "*.ps"  -o -name "*.jpg" -o -name "*.eps" -o -name "*.tar" -name "*.gz" \) | xargs rm -f
+	find examples \( -name "*.svg" -o -name "*.png" -o -name "*.ps"  -o -name "*.eps" -o -name "*.tar" -name "*.gz" \) | xargs rm -f
 	find unit \( -name "*.png" -o -name "*.ps"  -o -name "*.eps" \) | xargs rm -f
 	find . \( -name "#*" -o -name ".#*" -o -name ".*~" -o -name "*~" \) | xargs rm -f
 

examples/contour_demo.py

@@ -7,11 +7,6 @@
 '''
 from pylab import *
 
-import sys
-fignum = 0
-if len(sys.argv) == 2:
-    fignum = int(sys.argv[1])
-
 delta = 0.025
 x = arange(-3.0, 3.0, delta)
 y = arange(-2.0, 2.0, delta)
@@ -72,5 +67,5 @@
 hot()  # Now change the colormap for the contour lines and colorbar
 
 
-#savefig('contour_demo')
+savefig('contour_demo')
 show()

examples/pcolor_demo.py

@@ -22,7 +22,7 @@ def func3(x,y):
 pcolor(X, Y, Z, shading='flat')
 colorbar()
 axis([-3,3,-3,3])
-#savefig('pcolor_demo')
+savefig('pcolor_demo')
 show()
 
 

lib/matplotlib/__init__.py

@@ -141,7 +141,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.73rc3'
+__version__  = '0.73'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 

lib/matplotlib/backend_bases.py

@@ -114,6 +114,7 @@ def draw_line_collection(self, segments, transform, clipbox,
         faster drawing, but it is already much faster than using draw_lines()
         by itself.
         """
+
         gc = self.new_gc()
         gc.set_clip_rectangle(clipbox.get_bounds())
         gc.set_dashes(*linestyle)
@@ -137,8 +138,9 @@ def draw_line_collection(self, segments, transform, clipbox,
             gc.set_alpha( alpha )
             gc.set_linewidth( linewidths[i % Nlw] )
             gc.set_antialiased( antialiaseds[i % Naa] )
-            
-            x, y = zip(*segments[i % Nsegments])
+            seg = segments[i % Nsegments]
+            if not len(seg): continue
+            x, y = zip(*seg)
             x, y = transform.numerix_x_y(array(x), array(y))
             if usingOffsets:
                 xo, yo = transOffset.xy_tup(offsets[i % Noffsets])

swig/agg_trans_affine.i

@@ -48,4 +48,30 @@ namespace agg{
     %name(get_scaling) void   scaling(double* OUTPUT, double* OUTPUT) const;
   }; 
 
+
+  class trans_affine_rotation : public trans_affine
+  {
+  public:
+    trans_affine_rotation(double a);
+  };
+
+  class trans_affine_scaling : public trans_affine
+  {
+  public:
+    trans_affine_scaling(double sx, double sy);
+    trans_affine_scaling(double s);
+  };
+
+  class trans_affine_translation : public trans_affine
+  {
+  public:
+    trans_affine_translation(double tx, double ty);
+  };
+
+  class trans_affine_skewing : public trans_affine
+  {
+  public:
+    trans_affine_skewing(double sx, double sy);
+  };
+
 }