Changeset 1600

Timestamp:

07/08/07 23:50:51 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Fixed bug introduced in [1586] where the second update list was removed.

Files:

• gaphas/trunk/gaphas/canvas.py (modified) (6 diffs)

gaphas/trunk/gaphas/canvas.py

@@ -12 +12 @@
-from gaphas import tree
-from gaphas import solver
-
+nonrecursive, 
-from state import observed, reversible_method, reversible_pair
-
@@ -46 +46 @@
-        self._dirty_items = set()
-        self._dirty_matrix_items = set()
-        self._in_update = False
-
-        self._registered_views = set()
@@ -357 +356 @@
-        update job is scheduled as idle job.
-        """
-if not self._in_update:
-
-
+self.update_now()
+
+
-    def update_now(self):
-        """
-        Peform an update of the items that requested an update.
-        """
-        self._in_update = True
-
-        # Order the dirty items, so they are updated bottom to top
-        dirty_items = [ item for item in reversed(self._tree.nodes) \
@@ -395 +392 @@
-            dirty_matrix_items.update(self._dirty_matrix_items)
-            self.update_matrices()
+
+            # Also need to set up the dirty_items list here, since items
+            # may be marked as dirty during maxtrix update or solving.
+            dirty_items = [ item for item in reversed(self._tree.nodes) \
+                                 if item in self._dirty_items ]
-
-            for item in dirty_items:
@@ -411 +413 @@
-            self._update_views(self._dirty_items, dirty_matrix_items)
-            self._dirty_items.clear()
-            self._in_update = False
-
-    def update_matrices(self):
@@ -470 +471 @@
-            request_resolve(h.x)
-            request_resolve(h.y)
-            
-
-        if recursive: