Changeset 997

Timestamp:

09/06/06 02:24:06 (2 years ago)

Author:

arjanmol

Message:

Updated item removal.

Files:

• gaphas/trunk/ChangeLog (modified) (1 diff)
• gaphas/trunk/demo.py (modified) (1 diff)
• gaphas/trunk/gaphas/canvas.py (modified) (4 diffs)
• gaphas/trunk/gaphas/constraint.py (modified) (1 diff)
• gaphas/trunk/gaphas/item.py (modified) (1 diff)
• gaphas/trunk/gaphas/tree.py (modified) (1 diff)
• gaphas/trunk/gaphas/view.py (modified) (5 diffs)

gaphas/trunk/ChangeLog

@@ +1 @@
+2006-09-06  Arjan Molenaar  <arjan_at_yirdis_dot_nl>
+
+        * There have been several fixes from within the gaphas tree.
+        * util.py: new file.
+        * canvas.py: fixed remove behavior up to some degree (should still
+        handle handles and constraints).
+
-2006-08-26  Arjan Molenaar  <arjan_at_yirdis_dot_nl>
-

gaphas/trunk/demo.py

@@ -212 +212 @@
-    v.add(b)
-
+    b = gtk.Button('Delete focused')
+
+    def on_clicked(button):
+        if view.focused_item:
+            canvas.remove(view.focused_item)
+            print 'items:', canvas.get_all_items()
+
+    b.connect('clicked', on_clicked)
+    v.add(b)
+
-#    b = gtk.Button('Cursor')
-#

gaphas/trunk/gaphas/canvas.py

@@ -79 +79 @@
-            []
-            >>> i._canvas
+        
+        TODO: Remove constraints on items connected to the removed item
-        """
-        self._tree.remove(item)
-        item.canvas = None
+
+        self._update_views((item,))
-        self._dirty_items.discard(item)
-        self._dirty_matrix_items.discard(item)
-        
-
-    def get_all_items(self):
-        """Get a list of all items
@@ -164 +167 @@
-            [<gaphas.item.Item ...>]
-            >>> list(c.get_children(i))
-, <gaphas.item.Item ...>
+
-        """
-        return self._tree.get_children(item)
+
+    def get_connected_items(self, item):
+        """Return a set of items that are connected to @item.
+        The list contains tuples (item, handle). As a result an item may be
+        in the list more than once (depending on the number of handles that
+        are connected). If @item is connected to itself it will also appear
+        in the list.
+
+            >>> c = Canvas()
+            >>> from gaphas import item
+            >>> i = item.Line()
+            >>> c.add(i)
+            >>> ii = item.Line()
+            >>> c.add(ii)
+            >>> iii = item.Line()
+            >>> c.add (iii)
+            >>> i.handles()[0].connected_to = ii
+            >>> list(c.get_connected_items(i))
+            []
+            >>> ii.handles()[0].connected_to = iii
+            >>> list(c.get_connected_items(ii))
+            [(<gaphas.item.Line ...>, <Handle object on (0, 0)>)]
+            >>> list(c.get_connected_items(iii))
+            [(<gaphas.item.Line ...>, <Handle object on (0, 0)>)]
+        """
+        connected_items = set()
+        for i in self.get_all_items():
+            for h in i.handles():
+                if h.connected_to is item:
+                    connected_items.add((i, h))
+        return connected_items
-
-    def get_matrix_i2w(self, item, calculate=False):
@@ -254 +288 @@
-    @async(single=True, priority=PRIORITY_HIGH_IDLE)
-    def update(self):
+        """Update the canavs, if called from within a gtk-mainloop, the
+        update job is scheduled as idle job.
+        """
-        if not self._in_update:
-            self.update_now()
@@ -405 +442 @@
-if __name__ == '__main__':
-    import doctest
-
+optionflags=doctest.ELLIPSIS
-
-# vim:sw=4:et

gaphas/trunk/gaphas/constraint.py

@@ -32 +32 @@
-
-    def variables(self):
+        """return an iterator which iterates over the variables that are
+        held by this constraint.
+        """
-        raise NotImplemented
-
-    def solve_for(self, var):
+        """Solve the constraint for a given variable.
+        The variable itself is updated.
+        """
-        raise NotImplemented
-

gaphas/trunk/gaphas/item.py

@@ -381 +381 @@
-        """
-        for c in self._orthogonal:
-
+_constraint
-
-    def split_segment(self, segment, parts=2):

gaphas/trunk/gaphas/tree.py

@@ -97 +97 @@
-        """
-        # First remove children:
-self._children[node]
+list(self._children[node])
-        for c in children:
-            self.remove(c)

gaphas/trunk/gaphas/view.py

@@ -328 +328 @@
-
-        # Make sure everything's updated
-
+_
-        a = self.allocation
-        super(View, self).queue_draw_area(0, 0, a.width, a.height)
@@ -385 +385 @@
-        assert self.canvas
-        wx, wy = self.transform_point_c2w(x, y)
-
+_
-
-    def transform_point_i2c(self, item, x, y):
@@ -391 +391 @@
-        """
-        assert self.canvas
-
+_
-        return self.transform_point_w2c(wx, wy)
-
@@ -473 +473 @@
-        with_handles.add(self._focused_item)
-
+        all_items = self._canvas.get_all_items()
+        removed = [i for i in items if i not in all_items]
+        
-        for i in items:
-            self.queue_draw_item(i, handles=(i in with_handles))
+
+        # Remove removed items:
+        for i in removed:
+            self.selected_items.discard(i)
+            if i is self.focused_item:
+                self.focused_item = None
+            if i is self.hovered_item:
+                self.hovered_item = None
-
-        # Pseudo-draw
@@ -552 +563 @@
-
-        # Force recalculation of the bounding boxes:
-
+_
-
-        a = self.allocation