patched some mem leaks in new agg backend methods

jdh2358 · jdh2358 · commit fec122aeceeb · 2005-02-14T16:56:11.000Z
svn path=/trunk/matplotlib/; revision=968
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,5 @@
 New entries should be added at the top
 
-
 2005-02-14 fix bug in cbook alltrue() and onetrue() - SC
 
 2005-02-11 updated qtagg backend from Ted - JDH
@@ -9,8 +8,6 @@ New entries should be added at the top
 
 2005-02-09 new zorder example for fine control in zorder_demo.py - FP
 
-2005-02-09 backend renderer draw_lines now has transform in backend,
-
 2005-02-09 backend renderer draw_lines now has transform in backend,
            as in draw_markers; use numerix in _backend_agg, aded small
            line optimization to agg
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -28,9 +28,10 @@ class Artist:
     aname = 'Artist'
     zorder = 0
     def __init__(self):
-
         self.figure = None
+
         self._transform = identity_transform()
+        self._transform = None
         self._transformSet = False
         self._visible = True
         self._alpha = 1.0
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -706,7 +706,7 @@ def add_line(self, l):
                 l.get_transform(), zip(xdata, ydata))
             xdata, ydata = zip(*xys)
         self.update_datalim_numerix( xdata, ydata )        
-        
+        #self.update_datalim(zip(xdata, ydata))
         self.lines.append(l)
 
     def _get_verts_in_data_coords(self, trans, xys):
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -73,7 +73,8 @@ def __init__(self, axes, loc, label,
         self._loc = loc
         self._size = size
         self._pad = Value(pad)
-        self._padPixels = self.figure.dpi*self._pad*Value(1/72.0)
+        
+        self._padPixels = self.figure.dpi*self._pad*Value(1/72.0) 
 
 
         self.tick1line = self._get_tick1line(loc)
@@ -233,18 +234,19 @@ def _get_text2(self, loc):
         self._set_artist_props(t)
         return t
         
-    def _get_tick1line(self, loc):
+    def _get_tick1line(self, loc): 
         'Get the default line2D instance'
         # x in data coords, y in axes coords
         l = Line2D( xdata=(loc, loc), ydata=(0, 0),
                     color='k',
+                    linestyle = 'None',
                     antialiased=False,
                     marker = TICKUP,
                     markersize=self._size,
                     )
 
         l.set_transform( blend_xy_sep_transform( self.axes.transData,
-                                                 self.axes.transAxes) )
+                                       self.axes.transAxes) )
         self._set_artist_props(l)
         return l
 
@@ -253,6 +255,7 @@ def _get_tick2line(self, loc):
         # x in data coords, y in axes coords
         l = Line2D( xdata=(loc, loc), ydata=(1,1),
                        color='k',
+                       linestyle = 'None',
                        antialiased=False, 
                        marker = TICKDOWN,
                        markersize=self._size,
@@ -350,17 +353,18 @@ def _get_text2(self, loc):
         self._set_artist_props(t)
         return t
 
-    def _get_tick1line(self, loc):
+    def _get_tick1line(self, loc): 
         'Get the default line2D instance'
         # x in axes coords, y in data coords
 
         l = Line2D( (0, 0), (loc, loc), color='k',
                     antialiased=False,
                     marker = TICKRIGHT,
+                    linestyle = 'None',
                     markersize=self._size,
                        )
         l.set_transform( blend_xy_sep_transform( self.axes.transAxes,
-                                                 self.axes.transData) )
+                                       self.axes.transData) )
         self._set_artist_props(l)
         return l
     
@@ -370,6 +374,7 @@ def _get_tick2line(self, loc):
         l = Line2D( (1, 1), (0, 0), color='k',
                     antialiased=False, 
                     marker = TICKLEFT,
+                    linestyle = 'None',
                     markersize=self._size,
                     )
 
@@ -378,7 +383,7 @@ def _get_tick2line(self, loc):
         self._set_artist_props(l)
         return l
     
-    def _get_gridline(self, loc):
+    def _get_gridline(self, loc): 
         'Get the default line2D instance'
         # x in axes coords, y in data coords
         l = Line2D( xdata=(0,1), ydata=(loc,loc), 
@@ -439,10 +444,16 @@ def __init__(self, axes):
         """
         Artist.__init__(self)
         self.set_figure(axes.figure)
-        
+
         self.axes = axes
         self.major = Ticker()
         self.minor = Ticker()
+        #class dummy:
+        #    locator = None
+        #    formatter = None
+        #self.major = dummy()
+        #self.minor = dummy()
+
         self.label = self._get_label()
         self.majorTicks = []
         self.minorTicks = []
@@ -470,6 +481,7 @@ def cla(self):
 
         popall(self.majorTicks)
         popall(self.minorTicks)        
+
         self.majorTicks.extend([self._get_tick(major=True)  for i in range(1)])
         self.minorTicks.extend([self._get_tick(major=False) for i in range(1)])
         
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -95,6 +95,7 @@ def __init__(self, xdata, ydata,
 
         """
         Artist.__init__(self)
+
         #convert sequences to numeric arrays
         if not iterable(xdata):
             raise RuntimeError('xdata must be a sequence')
@@ -260,7 +261,6 @@ def draw(self, renderer):
         #renderer.open_group('line2d')
 
         self._newstyle = hasattr(renderer, 'draw_markers')
-
         gc = renderer.new_gc()
         gc.set_foreground(self._color)
         gc.set_antialiased(self._antialiased)
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -893,7 +893,6 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
 
   _VERBOSE("RendererAgg::draw_lines");
   args.verify_length(4);  
-
   GCAgg gc = GCAgg(args[0], dpi);
   set_clipbox_rasterizer(gc.cliprect);
 
@@ -963,13 +962,8 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
     
     //don't render line segments less that on pixel long!
     if (!moveto && (i>0) && fabs(thisx-lastx)<1.0 && fabs(thisy-lasty)<1.0) {
-      //std::cout << "skipping " << thisx << " " << thisy << " " << lastx << " " << lasty << " " << fabs(thisx-lastx) << " " << fabs(thisy-lasty) << std::endl;
       continue;
     }
-    else {
-      //std::cout << "drawing " << thisx << " " << thisy << " " << lastx << " " << lasty << std::endl;
-
-    }
 
     lastx = thisx;
     lasty = thisy;
@@ -980,18 +974,13 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
     
     moveto = false;
     
-    /*
-    if ((i>0) && (i%100000==0)) {
-      //render the sucker
-      _render_lines_path(path, gc);
-      path.remove_all();
-      path.move_to(thisx, thisy);
-    }
-    */
   }
   
+  Py_XDECREF(xa);
+  Py_XDECREF(ya);
 
   _render_lines_path(path, gc);
+
   _VERBOSE("RendererAgg::draw_lines DONE");
   return Py::Object();
   
@@ -1046,6 +1035,7 @@ Py::Object
 RendererAgg::draw_markers(const Py::Tuple& args) {
   //draw_markers(gc, path, xo, yo, transform)
   theRasterizer->reset_clipping();
+
   _VERBOSE("RendererAgg::draw_markers");
   args.verify_length(5);  
 
@@ -1195,7 +1185,10 @@ RendererAgg::draw_markers(const Py::Tuple& args) {
     agg::render_scanlines(sa, sl, *rendererAA);
 
   } //for each marker
-    
+
+  Py_XDECREF(xa);
+  Py_XDECREF(ya);
+     
   delete [] strokeCache;
   delete [] fillCache;
   return Py::Object();
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -460,7 +460,7 @@ Bbox::update_numerix(const Py::Tuple &args) {
 
   Py_XDECREF(x);
   Py_XDECREF(y);
-
+ 
 
   _ll->x_api()->set_api(minx);
   _ll->y_api()->set_api(miny);
diff --git a/unit/memleak_hawaii3.py b/unit/memleak_hawaii3.py
@@ -2,9 +2,9 @@
 
 import os, sys, time
 import matplotlib
-matplotlib.interactive(True)
+#matplotlib.interactive(True)
 #matplotlib.use('Cairo')
-matplotlib.use('TkAgg')
+matplotlib.use('Agg')
 from pylab import *
 
 
@@ -17,33 +17,38 @@ def report_memory(i):
 
 
 # take a memory snapshot on indStart and compare it with indEnd
-indStart, indEnd = 30, 150
+
+indStart, indEnd = 30, 201
 for i in range(indEnd):
-    ind = arange(100)
-    xx = rand(len(ind))
+
     figure(1); clf()
-    ioff()
+
     subplot(221)
-    plot(ind, xx)
+    t1 = arange(0.0, 2.0, 0.01)
+    y = sin(2*pi*t1)
+    plot(t1,y,'-')
+    plot(t1, rand(len(t1)), 's', hold=True)
+
 
     subplot(222)
     X = rand(50,50)
-    
+
     imshow(X)
     subplot(223)
-    scatter(rand(50), rand(50))
+    scatter(rand(50), rand(50), s=100*rand(50), c=rand(50))
     subplot(224)
     pcolor(10*rand(50,50))
-    ion()
-    draw()
+    #ion()
+    #draw()
 
     #ioff()
-    #savefig('tmp%d' % i, dpi = 75)
+
     #fd = file('tmp%d' % i, 'wb')
     #savefig(fd, dpi = 75)
     #fd.close()
-    #close(1)
-
+    savefig('tmp%d' % i, dpi = 75)
+    close(1)
+    #break
 
     val = report_memory(i)
     if i==indStart: start = val # wait a few cycles for memory usage to stabilize
