Changeset 2266

Timestamp:

03/07/08 06:20:56 (9 months ago)

Author:

arj..@yirdis.nl

Message:

fixed #107, undo issues with Line.split_segment and Line.merge_segment

Files:

• gaphas/trunk/gaphas/item.py (modified) (4 diffs)
• gaphas/trunk/gaphas/tests/test_line.py (modified) (1 diff)

gaphas/trunk/gaphas/item.py

@@ -542 +542 @@
-        """
-        super(Line, self).setup_canvas()
-orthogonal = self.orthogonal
+_update_orthogonal_constraints(self.orthogonal)
-
-    def teardown_canvas(self):
@@ -609 +609 @@
-        do_split(segment, parts)
-        # Force orthogonal constraints to be recreated
-orthogonal = self.orthogonal
+_update_orthogonal_constraints(self.orthogonal)
-        return self._handles[segment+1:segment+parts]
-
@@ -653 +653 @@
-        else:
-            # Force orthogonal constraints to be recreated
-orthogonal = self.orthogonal
+_update_orthogonal_constraints(self.orthogonal)
-        return deleted_handles
-
@@ -755 +755 @@
-__test__ = {
-    'Line._set_orthogonal': Line._set_orthogonal,
-    'Line._set_horizontal': Line._set_horizontal,
-    'Line.split_segment': Line.split_segment,
-    'Line.merge_segment': Line.merge_segment,
-    }
-

gaphas/trunk/gaphas/tests/test_line.py

@@ -84 +84 @@
-        assert canvas.solver._constraints == after_ortho
-
+        line.split_segment(0)
+
+        assert len(canvas.solver._constraints) == 3
+        assert len(line.handles()) == 4
+        after_split = set(canvas.solver._constraints)
+
+        del undo_list[:]
+
+        line.merge_segment(0)
+
+        assert len(canvas.solver._constraints) == 2
+        assert len(line.handles()) == 3
+
+        undo()
+
+        assert len(canvas.solver._constraints) == 3
+        assert len(line.handles()) == 4
+        assert canvas.solver._constraints == after_split
+
-
-# vim:sw=4:et