Changeset 924

Timestamp:

06/02/06 02:37:25 (2 years ago)

Author:

arjanmol

Message:

--

Files:

• gaphor/trunk/ChangeLog (modified) (1 diff)
• gaphor/trunk/gaphor/UML/diagram.py (modified) (1 diff)
• gaphor/trunk/gaphor/UML/element.py (modified) (6 diffs)
• gaphor/trunk/gaphor/diagram/__init__.py (modified) (2 diffs)
• gaphor/trunk/gaphor/diagram/diagramitem.py (modified) (6 diffs)
• gaphor/trunk/gaphor/diagram/groupable.py (modified) (1 diff)
• gaphor/trunk/gaphor/misc/uniqueid.py (modified) (1 diff)
• gaphor/trunk/setup.py (modified) (4 diffs)
• gaphor/trunk/tests/test-uml2.py (modified) (1 diff)

gaphor/trunk/ChangeLog

@@ +1 @@
+2006-06-01  arjan <arjan at yirdis dot nl>
+
+        * some cleanup, added TODO: comments for conversion to Gaphas.
+
-2006-05-29  arjan <arjan at yirdis dot nl>
-

gaphor/trunk/gaphor/UML/diagram.py

@@ -96 +96 @@
-        return obj
-
+    # TODO: remove
-    def substitute_item(self, item, new_item_type):
-        """Create a new item and replace item with the new item.

gaphor/trunk/gaphor/UML/element.py

@@ -15 +15 @@
-     '__unlink__' signal to all attached signals. unlink() can not be called
-     recursively.
-#relink()
-#    Inverse operation of unlink(). Used by diagram items during undo operations.
-
-connect ('name', callback, *data) or
@@ -54 +52 @@
-                       doc="The factory that created this element")
-
+    # TODO: move save/load code to adapters
-    def save(self, save_func):
-        """Save the state by calling save_func(name, value)."""
@@ -88 +87 @@
-                    prop.postload(self)
-
-
-
-
+
+
-        """
-        # Uses a mutex to make sure it is not called recursively
-        if self.__in_unlink.testandset():
-            try:
-signal
+'__unlink__'
-            finally:
-                self.__in_unlink.unlock()
-
-    def unlink(self):
-        """Unlink the element."""
-        #log.debug('Element.unlink(%s)' % self)
-        self.__unlink('__unlink__')
-
-#    def relink(self):
-#        """Undo the unlink operation."""
-#        log.debug('Element.relink(%s)' % self)
-#        self.__unlink('__relink__')
-
-    def connect(self, names, callback, *data):
-        """Attach 'callback' to a list of names. Names may also be a string.
-d
+f
-        """
-        #log.debug('Element.connect(%s, %s, %s)' % (names, callback, data))
@@ -118 +106 @@
-        cb = (callback,) + data
-        for name in names:
-
-
-
-
-
-
-
+
-
-    def disconnect(self, callback, *data):
@@ -140 +122 @@
-    def notify(self, name, cb_name=None, pspec=None):
-        """Send notification to attached callbacks that a property
- the __relink__ signal uses the callbacks for __unlink__.
+
-        """
-        cb_list = self._observers.get(cb_name or name, ())
@@ -180 +162 @@
-    psyco.bind(Element)
-
-if __name__ == '__main__':
-    a = Element()
-    b = Element()
-    def cb_func(name, *args):
-        print '  cb_func:', name, args
-
-    a.connect('ev1', cb_func, a)
-    a.connect('ev1', cb_func, a)
-    a.connect('ev2', cb_func, 'ev2', a)
-
-    print 'notify: ev1'
-    a.notify('ev1')
-    print 'notify: ev2'
-    a.notify('ev2')
- 
-    a.disconnect(cb_func, a)
-
-    print 'notify: ev1'
-    a.notify('ev1')
-    print 'notify: ev2'
-    a.notify('ev2')
- 

gaphor/trunk/gaphor/diagram/__init__.py

@@ -23 +23 @@
-def get_diagram_item(element):
-    global _uml_to_item_map
-
-
-
-
+
-
-def set_diagram_item(element, item):
@@ -55 +52 @@
-                (diacanvas.CanvasElement in all_bases) or \
-                (diacanvas.CanvasBox in all_bases) or \
-                (diacanvas.CanvasText in all_bases) or \
-                (diacanvas.CanvasImage in all_bases):
-            diacanvas.set_callbacks(item_class)

gaphor/trunk/gaphor/diagram/diagramitem.py

@@ -9 +9 @@
-
-from gaphor import resource
-from gaphor.misc import uniqueid
-from gaphor.UML import Element, Presentation
-from gaphor.UML.properties import association
@@ -87 +86 @@
-    # UML.Element interface used by properties:
-
+    # TODO: Use adapters for load/save functionality
-    def save(self, save_func):
-        if self.subject:
@@ -111 +111 @@
-            self.on_subject_notify(type(self).subject)
-
+    # TODO: remove, use signaling from gaphor.UML.Element
-    def unlink(self):
-        """Send the unlink signal and remove itself from the canvas.
@@ -123 +124 @@
-        self.set_property('parent', None)
-
-#    def relink(self):
-#        """Relinking is done by popping the undo stack...
-#        """
-#        log.info('RELINK DiagramItem')
-#        #self.emit('__unlink__', '__relink__')
-
-    # gaphor.UML.Element like signal interface:
-
+    # TODO: remove, use signaling from gaphor.UML.Element
-    def connect(self, name, handler, *args):
-        """Connect a handler to signal name with args.
@@ -146 +142 @@
-        return id
-
+    # TODO: remove, use signaling from gaphor.UML.Element
-    def disconnect(self, handler_or_id, *args):
-        """Disconnect a signal handler. If handler_or_id is an integer (int)
@@ -318 +315 @@
-    # DiaCanvasItem callbacks
-
+    # TODO: use connectable adapter here.
-    def _on_glue(self, handle, wx, wy, parent_class):
-        """This function is used to notify the connecting item

gaphor/trunk/gaphor/diagram/groupable.py

@@ -8 +8 @@
-import diacanvas
-
+# TODO: Remove alltogether (no longer used for Gaphas)
-class GroupBase(diacanvas.CanvasGroupable):
-    """

gaphor/trunk/gaphor/misc/uniqueid.py

@@ -81 +81 @@
-                        f.close()
-                        break;
-
+
+
-                #
-
+Darwin (Mac OS X) and 
-                #
-                f = os.popen("/sbin/ifconfig -a")

gaphor/trunk/setup.py

@@ -18 +18 @@
-from glob import glob
-from commands import getoutput, getstatus, getstatusoutput
+
+# Py2App should be imported before the utils classes are loaded
-try:
-    import py2app
-except ImportError:
-
-
+
-else:
-
+
+
+
-
-from distutils.core import setup, Command
@@ -196 +199 @@
-        outfile = os.path.join(self.build_lib, py_model)
-        self.mkpath(os.path.dirname(outfile))
-
-
-
-
-
+
+
+
-            print 'generating %s from %s...' % (py_model, model)
-            print '  (warnings can be ignored)'
@@ -380 +381 @@
-      "It uses the GNOME2 environment for user interaction.",
-      platforms=['GNOME2'],
-ca', 'es', 'nl', 'sv
+nl', 'es
-      packages=['gaphor',
-                'gaphor.UML',
@@ -427 +428 @@
-                'run': run_Gaphor
-      },
-
+
+
+
+
+
+
+
+
-)
-

gaphor/trunk/tests/test-uml2.py

@@ -6 +6 @@
-
-class TestUML2(unittest.TestCase):
+
+    def test_element(self):
+        a = UML.Element()
+        b = UML.Element()
+        def cb_func(name, *args):
+            print '  cb_func:', name, args
+
+        a.connect('ev1', cb_func, a)
+        a.connect('ev1', cb_func, a)
+        a.connect('ev2', cb_func, 'ev2', a)
+
+        print 'notify: ev1'
+        a.notify('ev1')
+        print 'notify: ev2'
+        a.notify('ev2')
+
+        a.disconnect(cb_func, a)
+
+        print 'notify: ev1'
+        a.notify('ev1')
+        print 'notify: ev2'
+        a.notify('ev2')
-
-    def test1(self):