Changeset 1838

Timestamp:

08/05/07 23:39:39 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Free resources (e.g. Item.matrix_[vi]2[iv]) when a GtkView is destroyed. also free registration from canvas.

Files:

• gaphas/trunk/gaphas/tests/test_view.py (modified) (2 diffs)
• gaphas/trunk/gaphas/view.py (modified) (3 diffs)

gaphas/trunk/gaphas/tests/test_view.py

@@ -5 +5 @@
-import unittest
-import gtk
-
+View, 
-from gaphas.canvas import Canvas, Context
-from gaphas.item import Line
@@ -112 +112 @@
-        window.destroy()
-
+    def test_view_registration(self):
+        canvas = Canvas()
+
+        # Simple views do not register on the canvas
+        
+        view = View(canvas)
+        assert len(canvas._registered_views) == 0
+        
+        # GTK view does register for updates though
+
+        view = GtkView(canvas)
+        assert len(canvas._registered_views) == 1
+        
+        view.canvas = None
+        assert len(canvas._registered_views) == 0
+
+        view.canvas = canvas
+        assert len(canvas._registered_views) == 1
+
+    def test_view_registration_2(self):
+        """
+        Test view registration and destroy when view is destroyed.
+        """
+        canvas = Canvas()
+        view = GtkView(canvas)
+        window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+        window.add(view)
+        window.show_all()
+
+        box = Box()
+        canvas.add(box)
+
+        assert hasattr(box, '_matrix_i2v')
+        assert hasattr(box, '_matrix_v2i')
+
+        assert box._matrix_i2v[view]
+        assert box._matrix_v2i[view]
+
+        assert len(canvas._registered_views) == 1
+        assert view in canvas._registered_views
+
+        window.destroy()
+
+        assert len(canvas._registered_views) == 0
+
+        assert not box._matrix_i2v.has_key(view)
+        assert not box._matrix_v2i.has_key(view)
+        
+
-        
-if __name__ == '__main__':

gaphas/trunk/gaphas/view.py

@@ -390 +390 @@
-
-    def __init__(self, canvas=None):
-super(GtkView, self).__init__(
-
+gtk.DrawingArea.__init__(self
+, canvas
-        self.set_flags(gtk.CAN_FOCUS)
-        self.add_events(gtk.gdk.BUTTON_PRESS_MASK
@@ -405 +405 @@
-
-        self._tool = DefaultTool()
-        self.canvas = canvas
-
-        # Set background to white.
@@ -634 +633 @@
-        gtk.DrawingArea.do_realize(self)
-        allocation = self.allocation
-        print 'allocation', allocation.width, allocation.height
-
-        if self._canvas:
-            self.request_update(self._canvas.get_all_items())
-
+    def do_unrealize(self):
+        if self.canvas:
+            for item in self.canvas.get_all_items():
+                try:
+                    del item._matrix_i2v[self]
+                    del item._matrix_v2i[self]
+                except KeyError:
+                    pass
+            self.canvas = None
+        self._qtree = None
+
+        self._dirty_items = None
+        self._dirty_matrix_items = None
+
+        gtk.DrawingArea.do_unrealize(self)
-
-    def do_expose_event(self, event):