Changeset 1101

Timestamp:

12/08/06 01:56:37 (2 years ago)

Author:

arjanmol

Message:

added editor for objectNode

Files:

• gaphor/branches/new-canvas/gaphor/actions/tests/test_placementactions.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/adapters/editors.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/items.py (modified) (1 diff)
• gaphor/branches/new-canvas/gaphor/diagram/objectnode.py (modified) (5 diffs)

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

@@ -104 +104 @@
-        self.do_test_placement(placementactions.FlowFinalNodePlacementAction())
-
+    def test_objectnode_placement(self):
+        self.do_test_placement(placementactions.ObjectNodePlacementAction())
+
-    def test_flow_placement(self):
-        self.do_test_placement(placementactions.FlowPlacementAction())

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

@@ -66 +66 @@
-
-component.provideAdapter(NamedItemEditor)
+
+
+class ObjectNodeItemEditor(NamedItemEditor):
+    component.adapts(items.ObjectNodeItem)
+
+    def is_editable(self, x, y):
+        self.edit_tag = (x, y) in self._item.tag_bounds
+        return True
+
+    def get_text(self):
+        if self.edit_tag:
+            return self._item.subject.upperBound.value
+        else:
+            return super(ObjectNodeItemEditor, self).get_text()
+
+    def update_text(self, text):
+        if self.edit_tag:
+            self._item.subject.upperBound.value = text
+        else:
+            return super(ObjectNodeItemEditor, self).update_text(text)
+        self._item.request_update()
+
+component.provideAdapter(ObjectNodeItemEditor)
-
-

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

@@ -37 +37 @@
-from gaphor.diagram.activitynodes import ForkNodeItem
-from gaphor.diagram.flow import FlowItem
+from gaphor.diagram.objectnode import ObjectNodeItem
-
-# Use Cases:

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

@@ -11 +11 @@
-#from gaphor.diagram.groupable import GroupBase
-from gaphor.diagram.nameditem import NamedItem
+from gaphas.util import text_extents, text_multiline
+from gaphas.geometry import Rectangle, distance_rectangle_point
-
-
@@ -21 +23 @@
-    """
-
-     
+
-
-    __style__ = {
@@ -42 +44 @@
-        self._tag = '' #TextElement('value', '{ upperBound = %s }', '*')
-        self._tag_bounds = None
-        #self.add(self._upper_bound)
-
-        #self._ordering = diacanvas.shape.Text()
-        #self._ordering.set_font_description(pango.FontDescription(font.FONT))
-        #self._ordering.set_alignment(pango.ALIGN_CENTER)
-        #self._ordering.set_markup(False)
-
-        self._show_ordering = False
@@ -59 +55 @@
-
-    ordering = property(lambda s: s.subject.ordering, _set_ordering)
+
+    tag_bounds = property(lambda s: s._tag_bounds)
-
-    def _set_show_ordering(self, value):
@@ -100 +98 @@
-        # TODO: format tag properly:
-        if self.subject.upperBound:
-
+\n
-
-        self._tag += '{ ordering = %s }' % self.subject.ordering
-
-self._tag
+context.cairo, self._tag, multiline=True
-        x = (self.width - w) / 2
-0
+2
-        self._tag_bounds = Rectangle(x, y, width=w, height=h)
+
+    def point(self, x, y):
+        """
+        Return the distance from (x, y) to the item.
+        """
+        d1 = super(ObjectNodeItem, self).point(x, y)
+        d2 = distance_rectangle_point(self._tag_bounds, (x, y))
+        return min(d1, d2)
-
-    def draw(self, context):