Changeset 2214

Show
Ignore:
Timestamp:
02/13/08 01:55:21 (8 months ago)
Author:
arj..@yirdis.nl
Message:
  • incremented version to 0.3.5
  • made Item.canvas read-only (can be set by calling Canvas.add() and Canvas.remove())
  • fixed unit tests
  • looks like this is a fixes #95
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gaphas/trunk/demo.py

    r1850 r2214  
    198198        saveapply = state.saveapply 
    199199        for event in apply_me: 
     200            print 'Undo: invoking', event 
    200201            saveapply(*event) 
    201202            # Visualize each event: 

  • gaphas/trunk/gaphas/canvas.py

    r1972 r2214  
    7070        """ 
    7171        assert item not in self._tree.nodes, 'Adding already added node %s' % item 
    72         item.canvas = self 
     72        item._set_canvas(self) 
    7373        self._tree.add(item, parent) 
    7474        item._sort_key = self.sorter.get_key(item) 
    …… 
    8686        can restore removed items in the right order. 
    8787        """ 
    88         item.canvas = None 
     88        self.remove_connections_to_item(item) 
    8989        self._tree.remove(item) 
    90         self.remove_connections_to_item(item) 
     90        item._set_canvas(None) 
    9191        self._update_views(removed_items=(item,)) 
    9292        self._dirty_items.discard(item) 

  • gaphas/trunk/gaphas/item.py

    r2159 r2214  
    163163 
    164164 
    165     @observed 
     165    # _set_canvas() is not observed, since this operation is initialized by 
     166    # Canvas.add() and Canvas.remove() 
     167    #@observed 
    166168    def _set_canvas(self, canvas): 
    167169        """ 
    168         Set the canvas. 
     170        Set the canvas. Should only be called from Canvas.add and 
     171        Canvas.remove(). 
    169172        """ 
    170173        assert not canvas or not self._canvas or self._canvas is canvas 
    …… 
    175178            self.setup_canvas() 
    176179 
    177     def _del_canvas(self): 
    178         """ 
    179         Unset the canvas. 
    180         """ 
    181         self._set_canvas(None) 
    182  
    183     canvas = reversible_property(lambda s: s._canvas, _set_canvas, _del_canvas, 
    184                 doc="Set canvas for the item. Application should use " + \ 
    185                     "Canvas.add() and Canvas.remove().") 
     180    canvas = reversible_property(lambda s: s._canvas, 
     181                doc="Canvas owning this item") 
    186182 
    187183 
    …… 
    219215 
    220216    matrix = reversible_property(lambda s: s._matrix, _set_matrix) 
     217 
    221218 
    222219    def request_update(self, update=True, matrix=True): 

  • gaphas/trunk/setup.py

    r2159 r2214  
    11 
    2 VERSION = '0.3.4' 
     2VERSION = '0.3.5' 
    33 
    44from ez_setup import use_setuptools 

  • gaphas/trunk/undo.txt

    r2212 r2214  
    196196 
    197197    >>> len(undo_list) 
    198     3 
     198    2 
    199199    >>> canvas.request_update(item) 
    200200    >>> len(undo_list) 
    201     4 
     201    3 
    202202 
    203203On the canvas only ``add()`` and ``remove()`` are monitored: 
    …… 
    336336     
    337337    >>> canvas = Canvas() 
    338     >>> e.canvas = canvas 
     338    >>> canvas.add(e) 
    339339    >>> undo() 
    340340    >>> e.canvas