Changeset 1115

Timestamp:

01/10/07 05:13:54 (2 years ago)

Author:

arjanmol

Message:

• updated stereotype drawing in ClassItem? (stereotype was substituted by 'metaclass')
  
• formalized label drawing on lines
  
• fixed name display for FlowItem?
  
• separated Stereotype code in StereotypeSupport? class
  

Files:

• gaphor/branches/new-canvas/TODO (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/adapters/connectors.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/association.py (modified) (2 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/diagramitem.py (modified) (5 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/diagramline.py (modified) (4 diffs)
• gaphor/branches/new-canvas/gaphor/diagram/elementitem.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/flow.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/klass.py (modified) (1 diff)

gaphor/branches/new-canvas/TODO

@@ -6 +6 @@
- - join/fork node text editing
- - 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/adapters/connectors.py

@@ -731 +731 @@
-                   or (end2.type is head_type and end1.type is tail_type):
-                    return
-
+
+
+
-            # Find all associations and determine if the properties on
-            # the association ends have a type that points to the class.

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

@@ -187 +187 @@
-        self.request_update()
-
-    def update_label(self, context, p1, p2):
-        """Update the name label near the middle of the association.
-        """
-        cr = context.cairo
-        w, h = text_extents(cr, self.subject and self.subject.name)
-
-        x = p1[0] > p2[0] and w + 2 or -2
-        x = (p1[0] + p2[0]) / 2.0 - x
-        y = p1[1] <= p2[1] and h or 0
-        y = (p1[1] + p2[1]) / 2.0 - y
-
-        #log.debug('label pos = (%d, %d)' % (x, y))
-        #return x, y, max(x + 10, x + w), max(y + 10, y + h)
-        return x, y, x + w, y + h
-
-
-    def update(self, context):
-        """
@@ -261 +245 @@
-        
-        # update name label:
-
-
-
+
-
-

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

@@ -147 +147 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        self._stereotype = None
-
-    id = property(lambda self: self._id, doc='Id')
-
-    def set_prop_persistent(self, name):
-        """Specify property of diagram item, which should be saved in file.
-        """
-        self._persistent_props.add(name)
-
-
-    # UML.Element interface used by properties:
-
-    # TODO: Use adapters for load/save functionality
-    def save(self, save_func):
-        if self.subject:
-            save_func('subject', self.subject)
-
-        # save persistent properties
-        for p in self._persistent_props:
-            save_func(p, getattr(self, p.replace('-', '_')), reference=True)
-
-
-    def load(self, name, value):
-        if name == 'subject':
-            type(self).subject.load(self, value)
-        else:
-            #log.debug('Setting unknown property "%s" -> "%s"' % (name, value))
-            try:
-                setattr(self, name.replace('-', '_'), eval(value))
-            except:
-                log.warning('%s has no property named %s (value %s)' % (self, name, value))
-
-    def postload(self):
-        if self.subject:
-            self.on_subject_notify(type(self).subject)
-
-    def save_property(self, save_func, name):
-        """Save a property, this is a shorthand method.
-        """
-        save_func(name, getattr(self, name.replace('-', '_')))
-
-    def save_properties(self, save_func, *names):
-        """Save a property, this is a shorthand method.
-        """
-        for name in names:
-            self.save_property(save_func, name)
-
-    def unlink(self):
-        """
-        Remove the item from the canvas and set subject to None.
-        """
-        if self.canvas:
-            self.canvas.remove(self)
-        self.subject = None
-        super(DiagramItem, self).unlink()
-
-    def get_popup_menu(self):
-        """In the popup menu a submenu is created with Stereotypes than can be
-        applied to this classifier (Class, Interface).
-        If the class itself is a metaclass, an option is added to check if the class
-        exists.
-        """
-        subject = self.subject
-        stereotype_list = self.stereotype_list
-        stereotype_list[:] = []
-
-        # UML specs does not allow to extend stereotypes with stereotypes
-        if subject and not isinstance(subject, UML.Stereotype):
-            # look for stereotypes to put them into context menu of an item
-            # this can be only done when subject exists
-
-            from gaphor.actions.itemactions import ApplyStereotypeAction, register_action
-
-            cls = type(subject)
-
-            # find out names of classes, which are superclasses of our
-            # subject
-            names = set(c.__name__ for c in cls.__mro__ if issubclass(c, Element))
-
-            # find stereotypes that extend out metaclass
-            classes = subject._factory.select(lambda e: e.isKindOf(UML.Class) and e.name in names)
-
-            for class_ in classes:
-                for extension in class_.extension:
-                    stereotype = extension.ownedEnd.type
-                    stereotype_action = ApplyStereotypeAction(stereotype)
-                    register_action(stereotype_action, 'ItemFocus')
-                    stereotype_list.append(stereotype_action.id)
-        return self.popup_menu
-
-
-    def on_subject_notify__appliedStereotype(self, subject, pspec=None):
-        if self.subject:
-            self.update_stereotype()
-
-    def request_update(self):
-        pass
-
-    def on_subject_notify(self, pspec, notifiers=()):
-        SubjectSupport.on_subject_notify(self, pspec, notifiers + ('appliedStereotype',))
-        if self.subject:
-            self.update_stereotype()
-
-    #
-    # Stereotypes
-    #
-    def get_stereotype(self):
-        if self._stereotype:
-            return self._stereotype
-
-    def set_stereotype(self, text=None):
@@ -305 +169 @@
-        self.request_update()
-
-get
+lambda s: s.
-
-    def update_stereotype(self):
@@ -346 +210 @@
-        # Phew! :]
-        self.set_stereotype(stereotype)
-
-    #
-    # utility methods
-    #
-
-    def parse_stereotype(self, data):
@@ -371 +231 @@
-            ok = True
-            if cls:
-
+type(subject) is cls #
-            if predicate:
-                ok = predicate(self)
@@ -378 +238 @@
-                return stereotype
-        return None
+
+
+class DiagramItem(SubjectSupport, StereotypeSupport):
+    """
+    Basic functionality for all model elements (lines and elements!).
+
+    This class contains common functionallity for model elements and
+    relationships.
+    It provides an interface similar to UML.Element for connecting and
+    disconnecting signals.
+
+    This class is not very useful on its own. It contains some glue-code for
+    diacanvas.DiaCanvasItem and gaphor.UML.Element.
+
+    Example:
+        class ElementItem(diacanvas.CanvasElement, DiagramItem):
+            connect = DiagramItem.connect
+            disconnect = DiagramItem.disconnect
+            ...
+
+    @cvar style: styles information (derived from DiagramItemMeta)
+    """
+
+    __metaclass__ = DiagramItemMeta
+
+    stereotype_list = []
+    popup_menu = ('Stereotype', stereotype_list)
+
+    def __init__(self, id=None):
+        SubjectSupport.__init__(self)
+        StereotypeSupport.__init__(self)
+
+        self._id = id
+
+        # properties, which should be saved in file
+        self._persistent_props = set()
+
+    id = property(lambda self: self._id, doc='Id')
+
+    def set_prop_persistent(self, name):
+        """Specify property of diagram item, which should be saved in file.
+        """
+        self._persistent_props.add(name)
+
+
+    # UML.Element interface used by properties:
+
+    # TODO: Use adapters for load/save functionality
+    def save(self, save_func):
+        if self.subject:
+            save_func('subject', self.subject)
+
+        # save persistent properties
+        for p in self._persistent_props:
+            save_func(p, getattr(self, p.replace('-', '_')), reference=True)
+
+
+    def load(self, name, value):
+        if name == 'subject':
+            type(self).subject.load(self, value)
+        else:
+            #log.debug('Setting unknown property "%s" -> "%s"' % (name, value))
+            try:
+                setattr(self, name.replace('-', '_'), eval(value))
+            except:
+                log.warning('%s has no property named %s (value %s)' % (self, name, value))
+
+    def postload(self):
+        if self.subject:
+            self.on_subject_notify(type(self).subject)
+
+    def save_property(self, save_func, name):
+        """Save a property, this is a shorthand method.
+        """
+        save_func(name, getattr(self, name.replace('-', '_')))
+
+    def save_properties(self, save_func, *names):
+        """Save a property, this is a shorthand method.
+        """
+        for name in names:
+            self.save_property(save_func, name)
+
+    def unlink(self):
+        """
+        Remove the item from the canvas and set subject to None.
+        """
+        if self.canvas:
+            self.canvas.remove(self)
+        self.subject = None
+        super(DiagramItem, self).unlink()
+
+    def get_popup_menu(self):
+        """In the popup menu a submenu is created with Stereotypes than can be
+        applied to this classifier (Class, Interface).
+        If the class itself is a metaclass, an option is added to check if the class
+        exists.
+        """
+        subject = self.subject
+        stereotype_list = self.stereotype_list
+        stereotype_list[:] = []
+
+        # UML specs does not allow to extend stereotypes with stereotypes
+        if subject and not isinstance(subject, UML.Stereotype):
+            # look for stereotypes to put them into context menu of an item
+            # this can be only done when subject exists
+
+            from gaphor.actions.itemactions import ApplyStereotypeAction, register_action
+
+            cls = type(subject)
+
+            # find out names of classes, which are superclasses of our
+            # subject
+            names = set(c.__name__ for c in cls.__mro__ if issubclass(c, Element))
+
+            # find stereotypes that extend out metaclass
+            classes = subject._factory.select(lambda e: e.isKindOf(UML.Class) and e.name in names)
+
+            for class_ in classes:
+                for extension in class_.extension:
+                    stereotype = extension.ownedEnd.type
+                    stereotype_action = ApplyStereotypeAction(stereotype)
+                    register_action(stereotype_action, 'ItemFocus')
+                    stereotype_list.append(stereotype_action.id)
+        return self.popup_menu
+
+
+    def on_subject_notify__appliedStereotype(self, subject, pspec=None):
+        if self.subject:
+            self.request_update()
+
+    def request_update(self):
+        """Placeholder for gaphor.Item's request_update() method.
+        """
+        pass
+
+    def on_subject_notify(self, pspec, notifiers=()):
+        SubjectSupport.on_subject_notify(self, pspec, notifiers + ('appliedStereotype',))
+
+# vim:sw=4:et:ai

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

@@ -7 +7 @@
-import gaphas
-from gaphas.util import text_extents
+from gaphas.geometry import Rectangle
-from diagramitem import DiagramItem
-from interfaces import IConnect
@@ -21 +22 @@
-        DiagramItem.__init__(self, id)
-        self.fuzzyness = 2
-
-
-
+
-
-    head = property(lambda self: self._handles[0])
-    tail = property(lambda self: self._handles[-1])
-
-
-
+
+
+
+
+
+
-        cr = context.cairo
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        handles = self._handles
@@ -47 +65 @@
-        y = (p1[1] + p2[1]) / 2.0 - y
-
-
-
-
+
+
+
+
+
+
+
+
-
-    def draw(self, context):
@@ -55 +78 @@
-        cr = context.cairo
-        if self._stereotype:
-*self._stereotype_pos
+self._stereotype_bounds[0], self._stereotype_bounds[1]
-            cr.show_text(self._stereotype)
-

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

@@ -36 +36 @@
-            DiagramItem.load(self, name, value)
-
+    def pre_update(self, context):
+        super(ElementItem, self).pre_update(context)
+        self.update_stereotype()
-
-# vim:sw=4

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

@@ -60 +60 @@
-
-    def update_name(self, context):
+        cr = context.cairo
+        ofs = 5
+
-        handles = self._handles
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def update(self, context):
-        super(FlowItem, self).update(context)
-        self.update_name(context)
-
+
+
-
-    def point(self, x, y):

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

@@ -26 +26 @@
-    __stereotype__ = {
-        'stereotype': UML.Stereotype,
-(UML.Class, lambda self: hasattr(self.subject, 'extension') and self.subject.extension)
+lambda self: (not isinstance(self.subject, UML.Stereotype)) and hasattr(self.subject, 'extension') and self.subject.extension
-    }
-