Changeset 2172

Timestamp:

12/18/07 00:41:59 (8 months ago)

Author:

arj..@yirdis.nl

Message:

Added swap method to ToolChain

Files:

• gaphas/trunk/gaphas/quadtree.py (modified) (2 diffs)
• gaphas/trunk/gaphas/tool.py (modified) (3 diffs)

gaphas/trunk/gaphas/quadtree.py

@@ -2 +2 @@
-Quadtree
-========
-From Wikipedia, the free encyclopedia
-
-A quadtree is a tree data structure in which each internal node has up to four
@@ -17 +16 @@
-* The tree directory follows the spatial decomposition of the Quadtree
-
+(From Wikipedia, the free encyclopedia)
-"""
-

gaphas/trunk/gaphas/tool.py

@@ -190 +190 @@
-
-    def append(self, tool):
+        """
+        Append a tool to the chain. Self is returned.
+        """
-        self._tools.append(tool)
+        return self
-
-    def prepend(self, tool):
+        """
+        Prepend a tool to the chain. Self is returned.
+        """
-        self._tools.insert(0, tool)
+        return self
+
+    def swap(self, old_tool_class, new_tool):
+        """
+        Swap one tool for another. Note that the first argument is the tool's
+        class (type), not an instance.
+
+        >>> chain = ToolChain().append(HoverTool()).append(RubberbandTool())
+        >>> chain._tools # doctest: +ELLIPSIS
+        [<gaphas.tool.HoverTool object at 0x...>, <gaphas.tool.RubberbandTool object at 0x...>]
+        >>> chain.swap(HoverTool, ItemTool()) # doctest: +ELLIPSIS
+        <gaphas.tool.ToolChain object at 0x...>
+
+        Now the HoverTool has been substituted for the ItemTool:
+        
+        >>> chain._tools # doctest: +ELLIPSIS
+        [<gaphas.tool.ItemTool object at 0x...>, <gaphas.tool.RubberbandTool object at 0x...>]
+        """
+        tools = self._tools
+        for i in xrange(len(tools)):
+            if type(tools[i]) is old_tool_class:
+                if self._grabbed_tool is tools[i]:
+                    raise ValueError, 'Can\'t swap tools since %s is grabbed' % tools[i]
+                tools[i] = new_tool
+                break
+        return self
-
-    def grab(self, tool):
@@ -289 +322 @@
-        if view.hovered_item:
-            if view.hovered_item in view.selected_items and \
-
+     
-                view.focused_item = None
-                view.unselect_item(view.hovered_item)
@@ -652 +685 @@
-    The default tool chain build from HoverTool, ItemTool and HandleTool.
-    """
-
-chain.append(HoverTool())
-chain.append(HandleTool())
-chain.append(ItemTool())
-chain.append(TextEditTool())
-chain.
+.\
+    append(HoverTool()).\
+    append(HandleTool()).\
+    append(ItemTool()).\
+    append(TextEditTool()).\
+    
-    return chain
-