Changeset 1104

Timestamp:

12/14/06 02:45:13 (2 years ago)

Author:

arjanmol

Message:

updated flow/actions stuff

Files:

• gaphor/branches/new-canvas/TODO (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/UML/elementfactory.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/adapters/connectors.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/adapters/editors.py (modified) (2 diffs)
• gaphor/branches/new-canvas/gaphor/adapters/tests/test_connector.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/adapters/tests/test_editor.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/activitynodes.py (modified) (5 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/connector.py (modified) (2 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/flow.py (modified) (5 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/items.py (modified) (1 diff)

gaphor/branches/new-canvas/TODO

@@ -7 +7 @@
- - text placement for action nodes.
- - implement ObjectNode and flow items
+ - create a generic method to swap class types
-
-For 0.10.0 and later:

gaphor/branches/new-canvas/gaphor/UML/elementfactory.py

@@ -10 +10 @@
-from gaphor.UML.event import CreateElementEvent, RemoveElementEvent, \
-                             FlushFactoryEvent, ModelFactoryEvent
+
+# TODO: create an ElementFactory method that allows to swap instances of
+#       one type to another (e.g. ForkNode <-> DescisionNode)
-
-

gaphor/branches/new-canvas/gaphor/adapters/connectors.py

@@ -891 +891 @@
-
-
+class FlowConnect(RelationshipConnect):
+    """
+    Connect FlowItem and Action/ObjectNode, initial/final nodes.
+    """
+
+    def glue(self, handle, x, y):
+        """
+        In addition to the normal check, both line ends may not be connected
+        to the same element. Same goes for subjects.
+        """
+        opposite = self.line.opposite(handle)
+        line = self.line
+        element = self.element
+        subject = element.subject
+        connected_to = opposite.connected_to
+
+        if handle is line.head and isinstance(subject, UML.FinalNode) \
+           or handle is line.tail and isinstance(subject, UML.InitialNode):
+            return None
+
+        # Another flow may not be connected:
+        #connected = line.canvas.get_connected_items(element)
+        #if handle is line.head:
+        #    for i, h in connected:
+        #        if isinstance(i, items.FlowItem) and h is i.head:
+        #            return None
+
+        #if handle is line.tail:
+        #    for i, h in connected:
+        #        if isinstance(i, items.FlowItem) and h is i.tail:
+        #            return None
+
+        #if handle is line.head and subject.outgoing and subject.outgoing is not line.subject:
+        #    return None
+
+        #if handle is line.tail and subject.incoming and subject.incoming is not line.subject:
+        #    return None
+
+        return super(FlowConnect, self).glue(handle, x, y)
+
+    def connect_subject(self):
+        line = self.line
+        element = self.element
+        if isinstance(line.head.connected_to, items.ObjectNodeItem) \
+           or isinstance(line.tail.connected_to, items.ObjectNodeItem):
+            relation = self.relationship_or_new(UML.ObjectFlow,
+                        ('source', 'outgoing'),
+                        ('target', 'incoming'))
+        else:
+            relation = self.relationship_or_new(UML.ControlFlow,
+                        ('source', 'outgoing'),
+                        ('target', 'incoming'))
+        if not relation.guard:
+            relation.guard = UML.create(UML.LiteralSpecification)
+        self.line.subject = relation
+
+component.provideAdapter(factory=FlowConnect,
+                         adapts=(items.ActionItem, items.FlowItem))
+component.provideAdapter(factory=FlowConnect,
+                         adapts=(items.ActivityNodeItem, items.FlowItem))
+component.provideAdapter(factory=FlowConnect,
+                         adapts=(items.ObjectNodeItem, items.FlowItem))
+
+
+class FlowForkNodeConnect(FlowConnect):
+    """
+    Connect Flow to a ForkNode
+    """
+    component.adapts(items.ForkNodeItem, items.FlowItem)
+
+    def glue(self, handle, x, y):
+        """
+        In addition to the normal check, one end should have at most one
+        edge (incoming or outgoing).
+        """
+        line = self.line
+        element = self.element
+        subject = element.subject
+
+        # If one side of self.element has more than one edge, the
+        # type of node is determined (either join or fork).
+        if handle is line.head and len(subject.incoming) > 1 and len(subject.outgoing) > 0:
+            print 'head: type determined'
+            return None
+
+        if handle is line.tail and len(subject.incoming) > 0 and len(subject.outgoing) > 1:
+            print 'tail: type determined'
+            return None
+
+        return super(FlowForkNodeConnect, self).glue(handle, x, y)
+
+    def connect_subject(self):
+        super(FlowForkNodeConnect, self).connect_subject()
+        # Switch class for self.element Join/Fork depending on the number
+        # of incoming/outgoing edges.
+
+component.provideAdapter(FlowForkNodeConnect)
+
+
-# vim:sw=4:et:ai

gaphor/branches/new-canvas/gaphor/adapters/editors.py

@@ -71 +71 @@
-    component.adapts(items.ObjectNodeItem)
-
+    def __init__(self, item):
+        super(ObjectNodeItemEditor, self).__init__(item)
+        self.edit_tag = False
+
-    def is_editable(self, x, y):
-        self.edit_tag = (x, y) in self._item.tag_bounds
@@ -89 +93 @@
-
-component.provideAdapter(ObjectNodeItemEditor)
+
+
+class FlowItemEditor(object):
+    """Text edit support for Named items.
+    """
+    interface.implements(IEditor)
+    component.adapts(items.FlowItem)
+
+    def __init__(self, item):
+        self._item = item
+        self.edit_name = False
+        self.edit_guard = False
+
+    def is_editable(self, x, y):
+        if not self._item.subject:
+            return False
+        if (x, y) in self._item.name_bounds:
+            self.edit_name = True
+        elif (x, y) in self._item.guard_bounds:
+            self.edit_guard = True
+        return self.edit_name or self.edit_guard
+
+    def get_text(self):
+        if self.edit_name:
+            return self._item.subject.name
+        elif self.edit_guard:
+            return self._item.subject.guard.value
+
+    def get_bounds(self):
+        return None
+
+    def update_text(self, text):
+        if self.edit_name:
+            self._item.subject.name = text
+        elif self.edit_guard:
+            self._item.subject.guard.value = text
+
+    def key_pressed(self, pos, key):
+        pass
+
+component.provideAdapter(FlowItemEditor)
-
-

gaphor/branches/new-canvas/gaphor/adapters/tests/test_connector.py

@@ -450 +450 @@
-        assert len(list(UML.select())) == 3, list(UML.select())
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# vim:sw=4:et:ai

gaphor/branches/new-canvas/gaphor/adapters/tests/test_editor.py

@@ -44 +44 @@
-        assert adapter._edit is assoc.tail_end
-        
+    def test_objectnode_editor(self):
+        diagram = UML.create(UML.Diagram)
+        node = diagram.create(items.ObjectNodeItem, subject=UML.create(UML.ObjectNode))
+        diagram.canvas.update_now()
+
+        adapter = IEditor(node)
+        assert adapter.is_editable(10, 10)
+        assert not adapter.edit_tag
+
+        assert adapter.is_editable(*node.tag_bounds[:2])
+        assert adapter.edit_tag
+
+

gaphor/branches/new-canvas/gaphor/diagram/activitynodes.py

@@ -120 +120 @@
-
-class FDNode(ActivityNodeItem):
-
+
+
-    combined property, which determines if the they represent combination
-    of fork/join or decision/merge nodes as described in UML
@@ -176 +177 @@
-        cr.stroke()
-
-FDNode
+DecisionNodeItem
-
-
@@ -198 +199 @@
-        self._join_spec_y = 0
-
-#        for h in self.handles:
-#            h.props.movable = False
-#            h.props.visible = False
-#        self.handles[diacanvas.HANDLE_N].props.visible = True
-#        self.handles[diacanvas.HANDLE_S].props.visible = True
-#        self.handles[diacanvas.HANDLE_N].props.movable = True
-#        self.handles[diacanvas.HANDLE_S].props.movable = True
-
-    def update(self, context):
-        """
@@ -211 +204 @@
-        """
-        self._join_spec_x, self._join_spec_y = get_text_point(
-_join_spec
+subject.joinSpec.value
-                self.width, self.height,
-                (ALIGN_CENTER, ALIGN_TOP),
-                (10, 0, 0, 0),
-                True)
-
+
-
-    def draw(self, context):
@@ -225 +218 @@
-        cr = context.cairo
-        cr.set_line_width(self.width)
-
-
+
+
+
-        cr.move_to(self.name_x, self.name_y)
-
-        cr.move_to(self._join_spec_x, self._join_spec_y)
-_join_spec
+subject.joinSpec.value
-
-        cr.stroke()
-        super(ForkNodeItem, self).draw(context)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# vim:sw=4:et

gaphor/branches/new-canvas/gaphor/diagram/connector.py

@@ -54 +54 @@
-from elementitem import ElementItem
-from component import ComponentItem
-from util import create_connector_end
-
-from gaphor.diagram.interfaceicon import AssembledInterfaceIcon
@@ -586 +585 @@
-#            return DiagramLine.on_shape_iter(self)
-
+def create_connector_end(connector, role):
+    """
+    Create Connector End, set role and attach created end to
+    connector.
+    """
+    end = resource(UML.ElementFactory).create(UML.ConnectorEnd)
+    end.role = role
+    connector.end = end
+    assert end in role.end
+    return end 
+
-# vim:sw=4:et

gaphor/branches/new-canvas/gaphor/diagram/flow.py

@@ -13 +13 @@
-from gaphas.geometry import Rectangle
-from gaphas.util import text_extents, text_multiline
-
-
+
-
-
@@ -46 +45 @@
-        #         tail_a=0.0, tail_b=15.0, tail_c=6.0, tail_d=6.0)
-
+    name_bounds = property(lambda s: s._name_bounds)
+    guard_bounds = property(lambda s: s._guard_bounds)
-
-    def on_subject_notify(self, pspec, notifiers = ()):
@@ -97 +98 @@
-        self.update_guard(context)
-
+    def point(self, x, y):
+        d1 = super(FlowItem, self).point(x, y)
+        drp = distance_rectangle_point
+        d2 = drp(self._name_bounds, (x, y))
+        d3 = drp(self._guard_bounds, (x, y))
+        return min(d1, d2, d3)
-
-    def draw_tail(self, context):
@@ -111 +118 @@
-        if self.subject:
-            text_multiline(cr, self._name_bounds[0], self._name_bounds[3], self.subject.name)
-t
+
-
-        if context.hovered or context.focused or context.draw_all:
@@ -185 +192 @@
-        """
-        pass
-
-
-    def on_shape_iter(self):
-        """
-        Return activity edge name and circle.
-        """
-        it = TextElement.on_shape_iter(self)
-        return itertools.chain([self._circle], it)
-
-
-

gaphor/branches/new-canvas/gaphor/diagram/items.py

@@ -32 +32 @@
-# Actions:
-from gaphor.diagram.action import ActionItem
+from gaphor.diagram.activitynodes import ActivityNodeItem
-from gaphor.diagram.activitynodes import InitialNodeItem, ActivityFinalNodeItem
-from gaphor.diagram.activitynodes import FlowFinalNodeItem