Changeset 1087

Timestamp:

11/23/06 00:31:59 (2 years ago)

Author:

arjanmol

Message:

• made line endings of association draw well
  
• added tests for commentline connected to association
  
• diagramitem.py: extracted code related to item.subject and
  created a special support class for it.
  
• fixed notation of '<None>' in treeview
  

Files:

• gaphor/branches/new-canvas/TODO (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/actions/itemactions.py (modified) (16 diffs)
• gaphor/branches/new-canvas/gaphor/adapters/connectors.py (modified) (14 diffs)
• gaphor/branches/new-canvas/gaphor/adapters/tests/test_connector.py (modified) (2 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/association.py (modified) (17 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/diagramitem.py (modified) (6 diffs)
• gaphor/branches/new-canvas/gaphor/misc/ipair.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/ui/namespace.py (modified) (1 diff)

gaphor/branches/new-canvas/TODO

@@ -6 +6 @@
- - split DiagramItem in a stereotype support, SubjectSupport and some
-   other support classes.
+
+ - Currently (r1085) relations (association, dependency) can be created between
+   model elements. Some items (e.g. comment lines) can be connected to the
+   relationship at the time it realizes a relation at model level (both ends
+   get connected). This should result in a trigger to the attached
+   (comment-)line so it can also establish it's relationship at model level.
+   This can be solved in two places:
+   1. handle it in the DiagramItem. This will ensure such relationship is
+      always up to date, but may result in weird behavior in the loading code.
+   2. handle it in the IConnect adapters. That's the only place where
+      relationship are established so doing some extra work there won't hurt
+   Hmm.. Option 2 I guess..
-
- - using stereotypes

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

@@ -497 +497 @@
-
-    def get_association_end(self):
-_parent_focus_item(self._window).get_property(
+attr(get_parent_focus_item(self._window), 
-
-    def update(self):
@@ -503 +503 @@
-            item = get_parent_focus_item(self._window)
-            if isinstance(item, items.AssociationItem):
-item.get_property(
+getattr(item, 
-                if end.subject:
-                    self.active = (end.get_navigability() == self.navigable)
@@ -520 +520 @@
-    id = 'Head_isNavigable'
-    label = 'Navigable'
-
+
+
-    navigable = True
-
@@ -529 +530 @@
-    id = 'Head_isNotNavigable'
-    label = 'Non-Navigable'
-
+
+
-    navigable = False
-
@@ -538 +540 @@
-    id = 'Head_unknownNavigation'
-    label = 'Unknown'
-
+
+
-    navigable = None
-
@@ -547 +550 @@
-    id = 'Tail_isNavigable'
-    label = 'Navigable'
-
+
+
-    navigable = True
-
@@ -556 +560 @@
-    id = 'Tail_isNotNavigable'
-    label = 'Non-Navigable'
-
+
+
-    navigable = False
-
@@ -565 +570 @@
-    id = 'Tail_unknownNavigation'
-    label = 'Unknown'
-
+
+
-    navigable = None
-
@@ -579 +585 @@
-        try:
-            item = get_parent_focus_item(self._window)
-
-item.get_property(
+items.
+getattr(item, 
-                if end.subject:
-                    self.active = (end.subject.aggregation == self.aggregation)
@@ -589 +595 @@
-    def execute(self):
-        if self.active:
-_parent_focus_item(self._window).get_property(
+attr(get_parent_focus_item(self._window), 
-            assert isinstance(subject, UML.Property)
-            subject.aggregation = self.aggregation
@@ -598 +604 @@
-    label = 'None'
-    group = 'head_aggregation'
-
+_end
-    aggregation = 'none'
-
@@ -608 +614 @@
-    label = 'Shared'
-    group = 'head_aggregation'
-
+_end
-    aggregation = 'shared'
-
@@ -618 +624 @@
-    label = 'Composite'
-    group = 'head_aggregation'
-
+_end
-    aggregation = 'composite'
-
@@ -628 +634 @@
-    label = 'None'
-    group = 'tail_aggregation'
-
+_end
-    aggregation = 'none'
-
@@ -638 +644 @@
-    label = 'Shared'
-    group = 'tail_aggregation'
-
+_end
-    aggregation = 'shared'
-
@@ -648 +654 @@
-    label = 'Composite'
-    group = 'tail_aggregation'
-
+_end
-    aggregation = 'composite'
-

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

@@ -146 +146 @@
-    Base class for connecting two lines to each other.
-    The line that is conencted to is called 'element', as in ElementConnect.
+
+    Once a line has been connected at both ends, and a model element is
+    assigned to it, all items connectedt to this line (e.g. Comments)
+    receive a connect() call. This allows already connected lines to set
+    up relationships at model level too.
-    """
-
@@ -281 +286 @@
-        if super(CommentLineLineConnect, self).connect(handle, x, y):
-            opposite = self.line.opposite(handle)
-
+ and self.element.subject
-                if isinstance(opposite.connected_to.subject, UML.Comment):
-                    opposite.connected_to.subject.annotatedElement = self.element.subject
@@ -301 +306 @@
-class RelationshipConnect(ElementConnect):
-    """
-Association
+associations
-    dependencies and implementations.
-
@@ -374 +379 @@
-        return relation
-
+    def trigger_connected_items(self, line):
+        """
+        Cause items connected to @line to reconnect, allowing them to
+        establish or destroy relationships at model level.
+        """
+        canvas = line.canvas
+        solver = canvas.solver
+
+        # First make sure coordinates match
+        solver.solve()
+        for item, handle in self.line.canvas.get_connected_items(line):
+            adapter = component.queryMultiAdapter((line, item), IConnect)
+            assert adapter
+            adapter.connect(handle, handle.x, handle.y)
+        
-    def glue(self, handle, x, y):
-        opposite = self.line.opposite(handle)
@@ -392 +412 @@
-        return super(RelationshipConnect, self).glue(handle, x, y)
-
+    def connect_subject(self):
+        """
+        Establish the relationship at model level.
+        """
+        raise NotImplemented, 'Implement connect_subject() in a subclass'
+
+    def connect(self, handle, x, y):
+        """
+        Connect the items to each other. The model level relationship
+        is created by create_subject()
+        """
+        if super(RelationshipConnect, self).connect(handle, x, y):
+            opposite = self.line.opposite(handle)
+            if opposite.connected_to:
+                self.connect_subject()
+                line = self.line
+                if line.subject:
+                    self.trigger_connected_items(line)
+
-    def disconnect(self, handle):
-        """
@@ -400 +439 @@
-            old = self.line.subject
-            del self.line.subject
+            if old:
+                self.trigger_connected_items(self.line)
-            if old and len(old.presentation) == 0:
-                old.unlink()
@@ -428 +469 @@
-        return super(DependencyConnect, self).glue(handle, x, y)
-
-(self, handle, x, y
+_subject(self
-        """
-        TODO: cleck for existing relationships (use self.relation())
-        """
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-component.provideAdapter(DependencyConnect)
@@ -479 +517 @@
-        return super(ImplementationConnect, self).glue(handle, x, y)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-component.provideAdapter(ImplementationConnect)
@@ -511 +545 @@
-#        return super(GeneralizationConnect, self).glue(handle, x, y)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-component.provideAdapter(GeneralizationConnect)
@@ -542 +572 @@
-        return super(IncludeConnect, self).glue(handle, x, y)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-component.provideAdapter(IncludeConnect)
@@ -573 +599 @@
-        return super(ExtendConnect, self).glue(handle, x, y)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-component.provideAdapter(ExtendConnect)
@@ -614 +636 @@
-        return super(ExtensionConnect, self).glue(handle, x, y)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#                                    if (end1.type is head_type and end2.type is tail_type):
-#                                        line.head_subject = end1
@@ -655 +675 @@
-#                                        line.head_subject = end2
-#                                        line.tail_subject = end1
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-
-        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def disconnect(self, handle):
@@ -715 +735 @@
-        return super(AssociationConnect, self).glue(handle, x, y)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            return
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def disconnect(self, handle):

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

@@ -150 +150 @@
-        assert assoc.subject in comment.subject.annotatedElement, comment.subject.annotatedElement
-
-actor
+comment
-
-        adapter.disconnect(handle)
@@ -158 +158 @@
-        assert len(comment.subject.annotatedElement) == 0, comment.subject.annotatedElement
-        assert not assoc.subject in comment.subject.annotatedElement, comment.subject.annotatedElement
+
+        # Connect again:
+
+        adapter.connect(handle, handle.x, handle.y)
+        assert handle.connected_to is not None, handle.connected_to
+
+
+    def test_connector_association_connect(self):
+        """
+        Test behaviour when the CommentLine's subject (association) is
+        connected after the comment line is connected.
+        """
+        diagram = UML.create(UML.Diagram)
+        comment = diagram.create(items.CommentItem, subject=UML.create(UML.Comment))
+        line = diagram.create(items.CommentLineItem)
+        line.head.pos = 100, 100
+        line.tail.pos = 100, 100
+        c1 = diagram.create(items.ClassItem, subject=UML.create(UML.Class))
+        c2 = diagram.create(items.ClassItem, subject=UML.create(UML.Class))
+        assoc = diagram.create(items.AssociationItem)
+
+        # connect the comment
+
+        adapter = component.queryMultiAdapter((comment, line), IConnect)
+
+        handle = line.tail
+        adapter.connect(handle, handle.x, handle.y)
+
+        assert handle.connected_to is comment
+        assert handle._connect_constraint is not None
+        assert len(comment.subject.annotatedElement) == 0, comment.subject.annotatedElement
+
+        # connect opposite end to the association:
+
+        adapter = component.queryMultiAdapter((assoc, line), IConnect)
+        handle = line.head
+        adapter.connect(handle, handle.x, handle.y)
+
+        assert handle.connected_to is assoc
+        assert handle._connect_constraint is not None
+        assert len(comment.subject.annotatedElement) == 0, comment.subject.annotatedElement
+        assert assoc.subject is None
+
+        # Now connect the association to the classes:
+
+        adapter = component.queryMultiAdapter((c1, assoc), IConnect)
+        handle = assoc.head
+        adapter.connect(handle, handle.x, handle.y)
+
+        assert handle.connected_to is c1
+        assert handle._connect_constraint is not None
+        assert len(comment.subject.annotatedElement) == 0, comment.subject.annotatedElement
+        assert assoc.subject is None
+
+        adapter = component.queryMultiAdapter((c2, assoc), IConnect)
+        handle = assoc.tail
+        adapter.connect(handle, handle.x, handle.y)
+
+        assert assoc.head.connected_to is c1
+        assert assoc.tail.connected_to is c2
+        assert assoc.subject
+        assert len(comment.subject.annotatedElement) == 1, comment.subject.annotatedElement
+        assert assoc.subject in comment.subject.annotatedElement
+
+        # And now disconnect again:
+
+        adapter.disconnect(handle)
+        assert assoc.tail.connected_to is None
+        assert assoc.subject is None
+        assert comment.subject is not None
+        assert len(comment.subject.annotatedElement) == 0, comment.subject.annotatedElement
+
+        # TODO: add test
+        # What happens when an association is displayed in two diagrams and
+        # the comment is connected in one diagram. That assoc. is broken.
-
-

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

@@ -24 +24 @@
-from gaphor.undomanager import undoable
-#from gaphor.diagram import Relationship
-DiagramItem
+SubjectSupport
-from gaphor.diagram.diagramline import DiagramLine
-
@@ -74 +74 @@
-        'AssociationInvertDirection',
-        'separator',
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    )
-
@@ -141 +145 @@
-        self._tail_end.postload()
-
-#    def do_set_property(self, pspec, value):
-#        if pspec.name == 'head-subject':
-#            self._head_end.subject = value
-#        elif pspec.name == 'tail-subject':
-#            self._tail_end.subject = value
-#        elif pspec.name == 'show-direction':
-#            self.preserve_property('show-direction')
-#            self._show_direction = value
-#            self.request_update()
-#        else:
-#            DiagramLine.do_set_property(self, pspec, value)
-
-#    def do_get_property(self, pspec):
-#        if pspec.name == 'head':
-#            return self._head_end
-#        if pspec.name == 'tail':
-#            return self._tail_end
-#        elif pspec.name == 'head-subject':
-#            return self._head_end.subject
-#        elif pspec.name == 'tail-subject':
-#            return self._tail_end.subject
-#        elif pspec.name == 'show-direction':
-#            return self._show_direction
-#        else:
-#            return DiagramLine.do_get_property(self, pspec)
-
-    head_end = property(lambda self: self._head_end)
-
@@ -224 +202 @@
-
-    def update(self, context):
-
+
+
+
-
-        handles = self.handles()
@@ -240 +220 @@
-            elif self._head_end.get_navigability():
-                self.draw_head = self.draw_head_navigable
-
+el
-                self.draw_head = self.draw_head_none
-            else:
@@ -250 +230 @@
-                self.draw_tail = self.draw_tail_shared
-            elif self._tail_end.get_navigability():
-
-
+
-            elif self._tail_end.get_navigability() == False:
-
+self.
-            else:
-                self.draw_tail = self.draw_tail_undefined
@@ -305 +284 @@
-        cr = context.cairo
-        cr.line_to(0, 0)
--14
+6
-        cr.rel_line_to(8, 8)
-        cr.rel_move_to(0, -8)
@@ -321 +300 @@
-        """
-        self.draw_tail_shared(context)
-
+
+
-        cr.stroke()
-
@@ -338 +318 @@
-        """
-        cr = context.cairo
--
-
--
+
+#
+
-        cr.line_to(0, 0)
--
--
+
+
-
-    def draw_head_navigable(self, context):
@@ -360 +340 @@
-        cr = context.cairo
-        cr.line_to(0, 0)
--
+
-        cr.line_to(0, 0)
--
+
-        cr.stroke()
-
@@ -397 +377 @@
-
-
-
-
+
+
+
-    has two ends. An association end has two labels: one for the name and
-    one for the multiplicity (and maybe one for tagged values in the future).
@@ -409 +390 @@
-      the first 20-30 units of the line, for association end popup menu.
-    """
-#    __gproperties__ = {
-#        'name': (gobject.TYPE_STRING, 'name', '', '', gobject.PARAM_READWRITE),
-#        'mult': (gobject.TYPE_STRING, 'mult', '', '', gobject.PARAM_READWRITE)
-#    }
-#    __gproperties__.update(DiagramItem.__gproperties__)
-
-    head_popup_menu = (
@@ -436 +412 @@
-
-    def __init__(self, owner, id=None, end=None):
-DiagramItem.__init__(self, id
+SubjectSupport.__init__(self
-        self._owner = owner
-        self._end = end
@@ -447 +423 @@
-        self._mult_bounds = Rectangle()
-        self._point1 = self._point2 = (0, 0)
-
-    def postload(self):
-        DiagramItem.postload(self)
-        #self.set_text()
-
-    def get_popup_menu(self):
@@ -478 +450 @@
-                self._mult = m
-                self.request_update()
-
-
-    def get_navigability(self):
@@ -660 +631 @@
-
-    def on_subject_notify(self, pspec, notifiers=()):
-DiagramItem
+SubjectSupport
-                        notifiers + ('aggregation', 'visibility',
-                        'name', 'lowerValue.value',
@@ -684 +655 @@
-
-    def on_subject_notify__upperValue_value(self, upper_value, pspec):
-
+#
-        self.set_text()
-        self.request_update()

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

@@ -13 +13 @@
-STEREOTYPE_CLOSE = '\xc2\xbb' # '>>'
-
-DiagramItem
+SubjectSupport
-    """
-
-
-
-
-
-
-
-
-
-
-
-