Changeset 1971

Timestamp:

08/19/07 08:31:52 (1 year ago)

Author:

wrobe..@pld-linux.org

Message:

- allow to add more messages to message item on communication diagram (nfy)

Files:

• gaphor/trunk/gaphor/adapters/propertypages.py (modified) (5 diffs)
• gaphor/trunk/gaphor/diagram/message.py (modified) (3 diffs)

gaphor/trunk/gaphor/adapters/propertypages.py

@@ -42 +42 @@
-class UMLCollection(gtk.ListStore):
-    """
-UML association GTK model. 
+GTK tree model for UML collection.
-    """
-    def __init__(self, subject, attr, filter=None):
-        """
-model from UML associa
+tree model for UML collec
-
-        Parameters:
@@ -97 +97 @@
-            item.unlink()
-            super(UMLCollection, self).remove(iter)
+
+
+
+class CommunicationMessageModel(gtk.ListStore):
+    """
+    GTK tree model for list of messages on communication diagram.
+    """
+    def __init__(self, item):
+        """
+        Create GTK model from UML association.
+
+        Parameters:
+
+            item: message item on communication diagram
+        """
+        super(CommunicationMessageModel, self).__init__(str, bool, object)
+        self._item = item
+        subject = item.subject
+
+        def is_inverted(message):
+            return message.sendEvent is subject.sendEvent \
+                    or message.receiveEvent is subject.receiveEvent
+
+        for message in item._messages:
+            data = [message.name, is_inverted(message), message]
+            self.append(data)
+        self.append(['', False, None])
+
+
+    def remove(self, iter):
+        """
+        Remove message from message item and destroy it.
+        """
+        item = self._item
+        path = self.get_path(iter)
+        message = self[path][-1]
+
+        if message:
+            super(CommunicationMessageModel, self).remove(iter)
+
+            item.remove_message(message)
+            message.unlink()
+            item.request_update(matrix=False)
+
-
-
@@ -1158 +1202 @@
-    component.adapts(items.MessageItem)
-
+    element_factory = inject('element_factory')
+
-    MESSAGE_SORT = (
-        ('Call', 'synchCall'),
@@ -1176 +1222 @@
-
-        if context.is_communication():
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else:
-            hbox = create_hbox_label(self, page, _('Message sort'))
@@ -1225 +1290 @@
-        subject.messageSort = ms
-        context.request_update()
+
+
+    @transactional
+    def _on_message_edited(self, renderer, path, name):
+        """
+        """
+        context = self.context
+        subject = context.subject
+
+        data = self._messages[path]
+        data[0] = name
+        message = data[2]
+        if name and not message:
+            # add message to communication diagram
+            new_message = self.element_factory.create(UML.Message)
+            new_message.name = name
+            new_message.sendEvent = subject.sendEvent
+            new_message.receiveEvent = subject.receiveEvent
+            context.add_message(new_message)
+
+            # update gtk tree datamodel
+            data[0] = name
+            data[2] = new_message
+
+            # allow to add another message
+            self._messages.append(['', False, None])
+
+        elif not name and message:
+            # remove message from communication diagram
+            iter = self._messages.get_iter(path)
+            self._messages.remove(iter)
+
+        elif message:
+            # just edit message name
+            message.name = name
+            context.set_message_text(message, name)
+
+        context.request_update(matrix=False)
+
+
+    @transactional
+    def _on_message_reverted(self, renderer, path):
+        """
+        """
+        data = self._messages[path]
+        if data[2]:
+            data[1] = not data[1]
-         
-

gaphor/trunk/gaphor/diagram/message.py

@@ -53 +53 @@
-from gaphor import UML
-from gaphor.diagram.diagramline import NamedLine
+from gaphor.misc.odict import odict
-
-
@@ -73 +74 @@
-        self._arrow_pos = 0, 0
-        self._arrow_angle = 0
+        self._messages = odict()
-
-
@@ -201 +203 @@
-
-
+    def add_message(self, message):
+        txt = self.add_text('name',
+            style={'text-align-group': 'stereotype'})
+        txt.text = message.name
+        self._messages[message] = txt
+
+    def remove_message(self, message):
+        txt = self._messages[message]
+        self.remove_text(txt)
+        del self._messages[message]
+
+    def set_message_text(self, message, text):
+        self._messages[message].text = text
+
+
-# vim:sw=4:et