Changeset 1100

Timestamp:

12/07/06 07:56:40 (2 years ago)

Author:

arjanmol

Message:

First fixes FlowItem?, ObjectNode?. May not work.

Files:

• gaphor/branches/new-canvas/gaphor/actions/placementactions.py (modified) (2 diffs)
• gaphor/branches/new-canvas/gaphor/actions/tests/test_placementactions.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/association.py (modified) (3 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/connector.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/flow.py (modified) (12 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/interaction.py (modified) (2 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/items.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/itemtool.py (deleted)
• gaphor/branches/new-canvas/gaphor/diagram/lifeline.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/message.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/objectnode.py (modified) (3 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/util.py (deleted)
• gaphor/branches/new-canvas/utils/genUML2.py (modified) (1 diff)

gaphor/branches/new-canvas/gaphor/actions/placementactions.py

@@ -300 +300 @@
-
-
-#
-#
-#
-#
-#
-#
-#    type = diagram
-#
-
-#
+
+
+
+
+
+
+    type = items
+
+
+
-
-
@@ -396 +396 @@
-
-
-#
-#
-#
-#
-#
-#
-#    type = diagram
-
-#
+
+
+
+
+
+
+    type = items
+
+
-
-

gaphor/branches/new-canvas/gaphor/actions/tests/test_placementactions.py

@@ -104 +104 @@
-        self.do_test_placement(placementactions.FlowFinalNodePlacementAction())
-
+    def test_flow_placement(self):
+        self.do_test_placement(placementactions.FlowPlacementAction())
+
-
-# vim:sw=4:et:ai

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

@@ -609 +609 @@
-            if h:
-                name_dx = ofs
- # - height
+
-                mult_dx = ofs
-                mult_dy = ofs
-            else:
-                name_dx = -ofs - name_w
- # - height
+
-                mult_dx = -ofs - mult_w
-                mult_dy = ofs
@@ -620 +620 @@
-            #print 'vertical line'
-            if v:
- # - width
+
-                name_dy = ofs
-                mult_dx = ofs
-                mult_dy = ofs
-            else:
- # - width
- # - height
+
+
-                mult_dx = ofs
- # - height
+
-        else:
-            r = abs_rc < 1.0
@@ -637 +637 @@
-                mult_dx = ofs
-            else:
- # - width
- # - width
+
+
-            if align_bottom:
- # - height
- # - height
+
+
-            else:
-                name_dy = ofs 

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

@@ -50 +50 @@
-"""
-
-import diacanvas
-from gaphor import resource, UML
-from diagramline import DiagramLine, FreeLine

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

@@ -4 +4 @@
-Contains also implementation to split flows using activity edge connectors.
-"""
-
-
-
-
-
+
+
-
-from gaphor import resource
+
-from gaphor import UML
-from gaphor.diagram import TextElement
-from gaphor.diagram.diagramline import DiagramLine
-
-
+
+
-
-import itertools
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    """
-
-    __uml__ = UML.ControlFlow
-
+
+
+
+
+
-
-    def __init__(self, id = None):
-        GroupBase.__init__(self)
-        DiagramLine.__init__(self, id)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-    def on_subject_notify(self, pspec, notifiers = ()):
-
-
-
-
-
-
-
-
-
-
+
-
-        self.request_update()
-
-
-
-
+
+
+
+
+
+
+
+
-
-        def get_pos(p1, p2, width, height):
@@ -72 +68 @@
-            return x, y
-
-get_pos_i()
-get_pos_i()
-self._name.get_size(
+pos
+pos
+text_extents(context.cairo, self.subject and self.subject.name
-        x, y = get_pos(p1, p2, w, h)
-.update_label(x, y
-
-
-affine
-
+_bounds = Rectangle(x, y, width=max(10, w), height=max(10, h)
+
+
+context
+_
-        middle = len(handles)/2
-
@@ -90 +86 @@
-            return x, y
-
-get_pos_i()
-get_pos_i()
-self._guard.get_size(
+pos
+pos
+text_extents(context.cairo, self.subject and self.subject.guard and self.subject.guard.value
-        x, y = get_pos_centered(p1, p2, w, h)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    """
-    Activity edge connector. It is a circle with name inside.
@@ -219 +131 @@
-    RADIUS = 10
-    def __init__(self, id):
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
-
-        # set new value notification function to change activity edge
@@ -284 +196 @@
-
-
-Base
+Item
-    """
-    Abstract class for flows with activity edge connector. Flow with
@@ -300 +212 @@
-
-    def __init__(self, id = None):
-Base
+Item
-
-        self._connector = ACItem('value')
@@ -324 +236 @@
-        Save connector name and opposite flow with activity edge connector.
-        """
-Base
+Item
-        save_func('opposite', self._opposite, True)
-        save_func('connector-name', self._connector.subject.value)
@@ -338 +250 @@
-            self._opposite = value
-        else:
-Base
+Item
-
-
@@ -354 +266 @@
-        x = p1[0] < p2[0] and -r or r
-        y = 0
-gaphor.diagram.util.
+
-
-        self._connector.move_center(x, y)
-
-Base
+Item
-
-
@@ -380 +292 @@
-        if handle == self.get_inactive_handle():
-            return False
-Base
+Item
-
-
@@ -395 +307 @@
-class CFlowItemA(CFlowItem):
-    """
+    * Is used for split flows, as is CFlowItemB *
+
-    Flow with activity edge connector, which starts from node and points to
-    activity edge connector.
@@ -462 +376 @@
-        """
-        return self.handles[0]
+
+
+
+
+def move_collection(src, target, name):
+    """
+    Copy collection from one object to another.
+
+    src    - source object
+    target - target object
+    name   - name of attribute, which is collection to copy
+    """
+    # first make of copy of collection, because assigning
+    # element to target collection moves this element
+    for flow in list(getattr(src, name)):
+        getattr(target, name).append(flow)
+
+
+def is_fd(node):
+    """
+    Check if node is fork or decision node.
+    """
+    return isinstance(node, (UML.ForkNode, UML.DecisionNode))
+
+
+def change_node_class(node):
+    """
+    If UML constraints for fork, join, decision and merge nodes are not
+    met, then create new node depending on input node class, i.e. create
+    fork node from join node or merge node from decision node.
+
+    If constraints are met, then return node itself.
+    """
+    if is_fd(node) and len(node.incoming) > 1 \
+            or not is_fd(node) and len(node.incoming) < 2:
+
+        factory = resource(UML.ElementFactory)
+        cls = node_classes[node.__class__]
+        log.debug('creating %s' % cls)
+        nn = factory.create(cls)
+        move_collection(node, nn, 'incoming')
+        move_collection(node, nn, 'outgoing')
+    else:
+        nn = node
+
+    assert nn is not None
+
+    # we have to accept zero of outgoing edges in case of fork/descision
+    # nodes
+    assert is_fd(nn) and len(nn.incoming) <= 1 \
+        or not is_fd(nn) and len(nn.incoming) >= 1, '%s' % nn
+    assert is_fd(nn) and len(nn.outgoing) >= 0 \
+        or not is_fd(nn) and len(nn.outgoing) <= 1, '%s' % nn
+    return nn
+
+
+def combine_nodes(node):
+    """
+    Create fork/join (decision/merge) nodes combination as described in UML
+    specification.
+    """
+    log.debug('combining nodes')
+
+    cls = node_classes[node.__class__]
+    log.debug('creating %s' % cls)
+    factory = resource(UML.ElementFactory)
+    target = factory.create(cls)
+
+    source = node
+    if is_fd(node):
+        source = target
+        move_collection(node, source, 'incoming')
+
+        # create new fork node
+        cls = node_classes[source.__class__]
+        log.debug('creating %s' % cls)
+        target = factory.create(cls)
+        move_collection(node, target, 'outgoing')
+    else:
+        # fork node is created, referenced by target
+        move_collection(source, target, 'outgoing')
+
+    assert not is_fd(source)
+    assert is_fd(target)
+
+    # create flow
+    c1 = count_object_flows(source, 'incoming')
+    c2 = count_object_flows(target, 'outgoing')
+
+    if c1 > 0 or c2 > 0:
+        flow = factory.create(UML.ControlFlow)
+    else:
+        flow = factory.create(UML.ObjectFlow)
+    flow.source = source
+    flow.target = target
+
+    assert len(source.incoming) > 1
+    assert len(source.outgoing) == 1
+
+    assert len(target.incoming) == 1
+    assert len(target.outgoing) > 1
+
+    return source
+
+
+def decombine_nodes(source):
+    """
+    Create node depending on source argument which denotes combination of
+    fork/join (decision/merge) nodes as described in UML specification.
+
+    Combination of nodes is destroyed.
+    """
+    log.debug('decombining nodes')
+    flow = source.outgoing[0]
+    target = flow.target
+
+    if len(source.incoming) < 2:
+        # create fork or decision
+        cls = target.__class__
+    else:
+        # create join or merge
+        cls = source.__class__
+
+    factory = resource(UML.ElementFactory)
+    node = factory.create(cls)
+
+    move_collection(source, node, 'incoming')
+    move_collection(target, node, 'outgoing')
+
+    assert source != node
+
+    # delete target and combining flow
+    # source should be deleted by caller
+    target.unlink()
+    flow.unlink()
+
+    # return new node
+    return node
+
+
+def determine_node_on_connect(el):
+    """
+    Determine classes of nodes depending on amount of incoming
+    and outgoing edges. This method is called when flow is attached
+    to node.
+
+    If there is more than one incoming edge and more than one
+    outgoing edge, then create two nodes and combine them with
+    flow as described in UML specification.
+    """
+    subject = el.subject
+    if not isinstance(subject, tuple(node_classes.keys())):
+        return
+
+    new_subject = subject
+
+    if len(subject.incoming) > 1 and len(subject.outgoing) > 1:
+        new_subject = combine_nodes(subject)
+        el.props.combined = True
+
+    else:
+        new_subject = change_node_class(subject)
+
+    change_node_subject(el, new_subject)
+
+    if el.props.combined:
+        check_combining_flow(el)
+
+
+def determine_node_on_disconnect(el):
+    """
+    Determine classes of nodes depending on amount of incoming
+    and outgoing edges. This method is called when flow is dettached
+    from node.
+
+    If there are combined nodes and there is no need for them, then replace
+    combination with appropriate node (i.e. replace with fork node when
+    there are less than two incoming edges). This way data model is kept as
+    simple as possible.
+    """
+    subject = el.subject
+    if not isinstance(subject, tuple(node_classes.keys())):
+        return
+
+    new_subject = subject
+
+    if el.props.combined:
+        cs = subject.outgoing[0].target
+        # decombine node when there is no more than one incoming
+        # and no more than one outgoing flow
+        if len(subject.incoming) < 2 or len(cs.outgoing) < 2:
+            new_subject = decombine_nodes(subject)
+            el.props.combined = False
+        else:
+            check_combining_flow(el)
+
+    else: 
+        new_subject = change_node_class(subject)
+
+    change_node_subject(el, new_subject)
+
+
+def change_node_subject(el, new_subject):
+    """
+    Change element's subject if new subject is different than element's
+    subject. If subject is changed, then old subject is destroyed.
+    """
+    subject = el.subject
+    if new_subject != subject:
+        log.debug('changing subject of ui node %s' % el)
+        el.set_subject(new_subject)
+
+        log.debug('deleting node %s' % subject)
+        subject.unlink()
+
+
+def create_flow(cls, flow):
+    """
+    Create new flow of class cls. Flow data from flow argument are copied
+    to new created flow. Old flow is destroyed.
+    """
+    factory = resource(UML.ElementFactory)
+    f = factory.create(cls)
+    f.source = flow.source
+    f.target = flow.target
+    flow.unlink()
+    return f
+
+
+def count_object_flows(node, attr):
+    """
+    Count incoming or outgoing object flows.
+    """
+    return len(getattr(node, attr)
+        .select(lambda flow: isinstance(flow, UML.ObjectFlow)))
+
+
+def check_combining_flow(el):
+    """
+    Set object flow as combining flow when incoming or outgoing flow count
+    is greater than zero. Otherwise change combining flow to control flow.
+    """
+    subject = el.subject
+    flow = subject.outgoing[0] # combining flow
+    combined = flow.target     # combined node
+
+    c1 = count_object_flows(subject, 'incoming')
+    c2 = count_object_flows(combined, 'outgoing')
+
+    log.debug('combined incoming and outgoing object flow count: (%d, %d)' % (c1, c2))
+
+    if (c1 > 0 or c2 > 0) and isinstance(flow, UML.ControlFlow):
+        log.debug('changing combing flow to object flow')
+        create_flow(UML.ObjectFlow, flow)
+    elif c1 == 0 and c2 == 0 and isinstance(flow, UML.ObjectFlow):
+        log.debug('changing combing flow to control flow')
+        create_flow(UML.ControlFlow, flow)
+
+
+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
+
+
+def rotate(p1, p2, a, b, x, y):
+    """
+    Rotate point (a, b) by angle, which is determined by line (p1, p2).
+
+    Rotated point is moved by vector (x, y).
+    """
+    try:
+        angle = atan((p1[1] - p2[1]) / (p1[0] - p2[0]))
+    except ZeroDivisionError:
+        da = p1[1] < p2[1] and 1.5 or -1.5
+        angle = pi * da
+
+    sin_angle = sin(angle)
+    cos_angle = cos(angle)
+    return (cos_angle * a - sin_angle * b + x,
+            sin_angle * a + cos_angle * b + y)
+
+# vim:sw=4:et:ai

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

@@ -2 +2 @@
-InteractionItem diagram item
-'''
-# vim:sw=4:et
-
-from __future__ import generators
-
-import gobject
-import pango
-import diacanvas
-from gaphor import UML
-from nameditem import NamedItem
@@ -134 +128 @@
-    def on_groupable_iter(self):
-        return iter(self._children)
+
+# vim:sw=4:et

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

@@ -36 +36 @@
-from gaphor.diagram.activitynodes import DecisionNodeItem
-from gaphor.diagram.activitynodes import ForkNodeItem
+from gaphor.diagram.flow import FlowItem
-
-# Use Cases:

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

@@ -3 +3 @@
-"""
-
-import gobject
-import pango
-import diacanvas
-from gaphor import UML
-from gaphor.diagram.align import V_ALIGN_MIDDLE
-from gaphor.diagram.diagramline import FreeLine
-from gaphor.diagram.groupable import GroupBase
-from gaphor.diagram.nameditem import NamedItem
-

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

@@ -5 +5 @@
-import itertools
-
-import gobject
-import pango
-import diacanvas
-
-from gaphor import resource, UML
-
-from gaphor.diagram.diagramline import DiagramLine
-from gaphor.diagram.lifeline import LifelineItem, LifetimeItem
-
-
+
-
-#

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

@@ -40 +40 @@
-        NamedItem.__init__(self, id)
-
-
-
+
+
+
-
-
-
-
-
+#
+#
+#
+#
-
-        self._show_ordering = False
+
+    def _set_ordering(self, ordering):
+        """
+        Set ordering of object node.
+        """
+        self.subject.ordering = ordering
+        self.request_update()
+
+    ordering = property(lambda s: s.subject.ordering, _set_ordering)
+
+    def _set_show_ordering(self, value):
+        #self.preserve_property(pspec.name)
+        self._show_ordering = value
+        self.request_update()
+
+    show_ordering = property(lambda s: s._show_ordering, _set_show_ordering)
-
-    def save(self, save_func):
@@ -67 +84 @@
-        NamedItem.on_subject_notify(self, pspec, notifiers)
-        if self.subject:
-            factory = UML
-            if not self.subject.upperBound:
-factory
+UML
-                self.subject.upperBound.value = '*'
-
-
-
+#
+#
+#
-        self.request_update()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        """
-        Update object node, its ordering and upper bound specification.
@@ -112 +98 @@
-        NamedItem.update(self, context)
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    def draw(self, context):
+        cr = context.cairo
+        cr.rectangle(0, 0, self.width, self.height)
+        cr.stroke()
+
-        super(ObjectNodeItem, self).draw(context)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-

gaphor/branches/new-canvas/utils/genUML2.py

@@ -284 +284 @@
-        tag = tag.value
-
-
+#
-
-    if tag and tag.find('subsets') != -1: