Changeset 1797

Show
Ignore:
Timestamp:
07/31/07 07:15:19 (1 year ago)
Author:
arj..@yirdis.nl
Message:

Simplified Canavs.update_now(): no pre_udpate() call to items that have been changed due to constraint solving.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gaphas/trunk/gaphas/canvas.py

    r1794 r1797  
    439439 
    440440            if self._dirty_items: 
    441  
    442                 c_dirty_items = sort(self._dirty_items.difference(dirty_items), reverse=True) 
    443                  
     441                dirty_items.extend(self._dirty_items) 
    444442                self._dirty_items.clear() 
    445443 
    446                 self._pre_update_items(c_dirty_items, cr) 
    447  
    448                 dirty_items.extend(c_dirty_items) 
    449444                dirty_items = sort(set(dirty_items), reverse=True) 
    450445 
    451                 # Also matrices may change due to an update. 
    452                 if self._dirty_matrix_items: 
    453                     dirty_matrix_items.update(self.update_matrices(self._dirty_matrix_items)) 
    454                     self._dirty_matrix_items.clear() 
    455  
    456446            assert not self._dirty_items, 'No items may have been marked dirty (%s)' % (self._dirty_matrix_items,) 
    457             assert not self._dirty_matrix_items, 'No matrices may have been marked dirty (%s)' % (self._dirty_matrix_items,) 
    458447 
    459448            # normalize items, which changed after constraint solving; 
     
    462451 
    463452            # recalculate matrices of normalized items 
    464             #dirty_matrix_items.update(self.update_matrices(normalized_items)) 
    465             self.update_matrices(normalized_items) 
     453            dirty_matrix_items.update(self.update_matrices(normalized_items)) 
    466454 
    467455            self._post_update_items(dirty_items, cr) 
    468  
    469             assert not self._dirty_items, 'No items may have been marked dirty (%s)' % (self._dirty_matrix_items,) 
    470             assert not self._dirty_matrix_items, 'No matrices may have been marked dirty (%s)' % (self._dirty_matrix_items,) 
    471456 
    472457        finally: