sync to 0.63.0

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

Author: jdh2358

CHANGELOG

@@ -1,6 +1,12 @@
 New entries should be added at the top
 
 ==============================================================
+
+
+
+==============================================================
+2004-09-28 Released 0.63.0
+
 2004-09-28 Added save to file object for agg - see
            examples/print_stdout.py
 

lib/matplotlib/axes.py

@@ -695,7 +695,7 @@ def draw(self, renderer, *args, **kwargs):
         self.transAxes.freeze()  # eval the lazy objects
         if self.axison:
             if self._frameon: self._axesPatch.draw(renderer)
-            
+
         if len(self._images)==1:
             im = self._images[0]
             im.draw(renderer)
@@ -722,6 +722,7 @@ def draw(self, renderer, *args, **kwargs):
             self.xaxis.draw(renderer)
             self.yaxis.draw(renderer)
 
+
         for c in self._collections:
             c.draw(renderer)
 

lib/matplotlib/axis.py

@@ -463,12 +463,12 @@ def draw(self, renderer, *args, **kwargs):
         self._majorFormatter.set_locs(majorLocs)
         majorLabels = [self._majorFormatter(val, i) for i, val in enumerate(majorLocs)]
 
+
         seen = {}
 
         interval = self.get_view_interval()
         for tick, loc, label in zip(majorTicks, majorLocs, majorLabels):
             if not interval.contains(loc): continue
-            #print loc, label, interval.get_bounds()
             seen[loc] = 1
             tick.update_position(loc)
             tick.set_label1(label)
@@ -477,12 +477,12 @@ def draw(self, renderer, *args, **kwargs):
             extent = tick.label1.get_window_extent(renderer) 
             ticklabelBoxes.append(extent)
 
-
         minorTicks = self.get_minor_ticks()
         minorLocs = self._minorLocator()
         self._minorFormatter.set_locs(minorLocs)
         minorLabels = [self._minorFormatter(val, i) for i, val in enumerate(minorLocs)]
 
+
         for tick, loc, label in zip(minorTicks, minorLocs, minorLabels):
             if not interval.contains(loc): continue
             if seen.has_key(loc): continue

lib/matplotlib/na_imports.py

@@ -42,10 +42,12 @@ def _rc(self, a):
 
     def __mul__(self, other):
         aother = asarray(other)
-        if len(aother.shape) == 0:
-            return self._rc(self*aother)
-        else:
-            return self._rc(dot(self, aother))
+        #if len(aother.shape) == 0:
+        #    return self._rc(self*aother)
+        #else:
+        #    return self._rc(dot(self, aother))
+        #return self._rc(dot(self, aother))
+        return dot(self, aother)
 
     def __rmul__(self, other):
         aother = asarray(other)

lib/matplotlib/text.py

@@ -143,6 +143,7 @@ def _get_layout(self, renderer):
 
         # now rotate the bbox
         cornersRotated = [M*Matrix([[thisx],[thisy],[1]]) for thisx, thisy in cornersHoriz]
+
         txs = [float(v[0][0]) for v in cornersRotated]
         tys = [float(v[1][0]) for v in cornersRotated]
 
@@ -179,6 +180,7 @@ def _get_layout(self, renderer):
         # now rotate the positions around the first x,y position
         xys = [M*Matrix([[thisx],[thisy],[1]]) for thisx, thisy in offsetLayout]
 
+
         tx = [float(v[0][0])+offsetx for v in xys]
         ty = [float(v[1][0])+offsety for v in xys]
 

unit/memleak_hawaii3.py

@@ -13,24 +13,24 @@ def report_memory(i):
 
 
 # take a memory snapshot on indStart and compare it with indEnd
-indStart, indEnd = 10, 110
+indStart, indEnd = 10, 60
 for i in range(indEnd):
     ind = arange(100)
     xx = rand(len(ind))
     figure(1)
 
     subplot(221)
-    plot(ind, xx)
-    subplot(222)
+    #plot(ind, xx)
+    #subplot(222)
     X = rand(50,50)
-    imshow(X)
+    #imshow(X)
 
-    subplot(223)
-    scatter(rand(50), rand(50))
-    subplot(224)
-    pcolor(10*rand(50,50))
+    #subplot(223)
+    #scatter(rand(50), rand(50))
+    #subplot(224)
+    #pcolor(10*rand(50,50))
 
-    #savefig('tmp%d' % i, dpi = 75)
+    savefig('tmp%d' % i, dpi = 75)
     #fd = file('tmp%d' % i, 'wb')
     #savefig(fd, dpi = 75)
     #fd.close()

unit/transform_memleak.py

@@ -1,5 +1,6 @@
 import sys, time, os
 from helpers import rand_val, rand_point, rand_bbox, rand_transform
+from matplotlib.numerix import rand
 
 def report_memory(i):
     pid = os.getpid()
@@ -18,6 +19,10 @@ def report_memory(i):
     p1 = rand_point()
     box1 = rand_bbox()
     t = rand_transform()
+    N = 10000
+    x, y = rand(N), rand(N)
+    xt, yt = t.numerix_x_y(x, y)
+    xys = t.seq_xy_tups( zip(x,y) ) 
     val = report_memory(i)
     if i==1: start = val