Changeset 1633

Timestamp:

07/13/07 06:39:54 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Fix ForkNode save/load. Only joinSpec is not assigned properly after loading.

Files:

• gaphor/trunk/gaphor/diagram/activitynodes.py (modified) (1 diff)
• gaphor/trunk/setup.py (modified) (4 diffs)

gaphor/trunk/gaphor/diagram/activitynodes.py

@@ -218 +218 @@
-
-    def save(self, save_func):
+        save_func('matrix', tuple(self.matrix))
+        save_func('height', float(self._handles[1].y))
-        if self._combined:
-            save_func('combined', self._combined, reference=True)
-super(ForkNodeItem, self).save(
+DiagramItem.save(self, 
-
-    def load(self, name, value):
-
+
+
+
+
+
-            self._combined = value
-        else:
-
+
+
-
-    @observed

gaphor/trunk/setup.py

@@ -67 +67 @@
-        except ImportError:
-            print 'epydoc not installed, skipping API documentation.'
+
+
+#if sys.platform == 'darwin':
+#    # Mac OS X
+#    import pkg_resources
+#    pkg_resources.require('zope.component')
+#    platform_setup_requires=['py2app']
+#    platform_setup = dict(
+#        app=['gaphor-osx.py'],
+#        )
+#else:
+platform_setup_requires = []
+platform_setup = dict()
+
-
-setup(
@@ -153 +167 @@
-    },
-
-'nose >= 0.9.2'
+['nose >= 0.9.2'] + platform_setup_requires
-
-    test_suite = 'nose.collector',
@@ -159 +173 @@
-    options = dict(
-        py2app = dict(
-
-
-
+
+
+
+
+
+
+
+
-        ),
-        build_pot = dict(
@@ -169 +188 @@
-            all_linguas = ','.join(LINGUAS),
-        ),
-
+
+
+
+
+
-)
-