Changeset 1788

Timestamp:

07/30/07 01:14:15 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Only pre_update after solving for items that did not pre-update before.

Added extra assertions in update method.

Files:

• gaphas/trunk/gaphas/canvas.py (modified) (1 diff)

gaphas/trunk/gaphas/canvas.py

@@ -436 +436 @@
-            # some item's can be marked dirty due to external constraints
-            # solving;
+            # Only items that have not yet been updates receive a pre_update.
-            # NOTE: no matrix can change during constraint solving
+
+            assert not self._dirty_matrix_items, 'No matrices may have been marked dirty (%s)' % (self._dirty_matrix_items,)
+
-            if self._dirty_items:
-
+
+
+
+
+
-                self._dirty_items.clear()
-
-                self._pre_update_items(c_dirty_items, cr)
-
-                # TODO: sort dirty_items and c_dirty_items (with no
-                # duplicates in dirty_items) using some nice merge
-                # algorithm
-                dirty_items.extend(c_dirty_items)
-                dirty_items = sort(set(dirty_items), reverse=True)
-
+                # Also matrices may change due to an update.
+                if self._dirty_matrix_items:
+                    dirty_matrix_items.update(self.update_matrices(self._dirty_matrix_items))
+                    self._dirty_matrix_items.clear()
+
+            assert not self._dirty_items, 'No items may have been marked dirty (%s)' % (self._dirty_matrix_items,)
+            assert not self._dirty_matrix_items, 'No matrices may have been marked dirty (%s)' % (self._dirty_matrix_items,)
-
-            # normalize items, which changed after constraint solving;
-ich
+ose
-            normalized_items = self._normalize(dirty_items)
-
-            # recalculate matrices of normalized items
-
+
+
-
-            self._post_update_items(dirty_items, cr)
+
+            assert not self._dirty_items, 'No items may have been marked dirty (%s)' % (self._dirty_matrix_items,)
+            assert not self._dirty_matrix_items, 'No matrices may have been marked dirty (%s)' % (self._dirty_matrix_items,)
-
-        finally: