From 7d7a031240a4e2a205ebfa9e6d01c045356eb854 Mon Sep 17 00:00:00 2001 From: Arjan Molenaar Date: Sat, 23 May 2020 23:46:09 +0200 Subject: [PATCH] Make extend_dirty_items() more intuitive --- gaphas/canvas.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gaphas/canvas.py b/gaphas/canvas.py index a086bbf..bcd5b63 100644 --- a/gaphas/canvas.py +++ b/gaphas/canvas.py @@ -636,7 +636,8 @@ class Canvas: dirty_items.extend(self._dirty_items) self._dirty_items.clear() - dirty_items = self.sort(set(dirty_items), reverse=True) + return self.sort(dirty_items, reverse=True) + return dirty_items @nonrecursive def update_now(self): @@ -680,11 +681,7 @@ class Canvas: ), f"No matrices may have been marked dirty ({self._dirty_matrix_items})" # item's can be marked dirty due to external constraints solving - extend_dirty_items(dirty_items) - - assert ( - not self._dirty_items - ), f"No items may have been marked dirty {self._dirty_items}" + dirty_items = extend_dirty_items(dirty_items) # normalize items, which changed after constraint solving; # store those items, whose matrices changed @@ -697,11 +694,7 @@ class Canvas: self._solver.solve() # item's can be marked dirty due to normalization and solving - extend_dirty_items(dirty_items) - - assert ( - not self._dirty_items - ), f"No items may have been marked dirty ({self._dirty_items})" + dirty_items = extend_dirty_items(dirty_items) self._post_update_items(dirty_items, context)