Changeset 1882

Timestamp:

08/09/07 01:34:16 (1 year ago)

Author:

arj..@yirdis.nl

Message:

Line.split_segment and merge_segment now return a list of added/removed handles. also fixed some bugs in merge_segment.

Files:

• gaphas/trunk/gaphas/item.py (modified) (7 diffs)
• gaphas/trunk/gaphas/solver.py (modified) (1 diff)
• gaphas/trunk/undo.txt (modified) (1 diff)

gaphas/trunk/gaphas/item.py

@@ -530 +530 @@
-        The min number of parts is 2.
-
+        A list of new handles is returned.
+
+        Note that ``split_segment`` is not able to reconnect constraints that
+        are connected to the segment. 
+
-        >>> a = Line()
-        >>> a.handles()[1].pos = (20, 0)
@@ -535 +540 @@
-        2
-        >>> a.split_segment(0)
-
-
-
-
+
+
+
+
+
+
-        >>> b = Line()
-        >>> b.handles()[1].pos = (20, 16)
@@ -544 +551 @@
-        [<Handle object on (0, 0)>, <Handle object on (20, 16)>]
-        >>> b.split_segment(0, parts=4)
+        [<Handle object on (5, 4)>, <Handle object on (10, 8)>, <Handle object on (15, 12)>]
-        >>> len(b.handles())
-        5
@@ -561 +569 @@
-                do_split(segment + 1, parts - 1)
-        do_split(segment, parts)
+        # TODO: or reconnect them from here.
+        # Force orthogonal constraints to be recreated
-        self.orthogonal = self.orthogonal
+        return self._handles[segment+1:segment+parts]
-
-    @observed
@@ -569 +580 @@
-        The parts parameter indicates how many segments should be merged
-
+        The deleted handles are returned as a list.
+
-        >>> a = Line()
-        >>> a.handles()[1].pos = (20, 0)
-
+_ = 
-        >>> a.handles()
-        [<Handle object on (0, 0)>, <Handle object on (10, 0)>, <Handle object on (20, 0)>]
-        >>> a.merge_segment(0)
-
-
+
+
+
-        >>> try: a.merge_segment(0)
-        ... except AssertionError: print 'okay'
-        okay
+
+        More than two segments can be merged at once:
+        >>> _ = a.split_segment(0)
+        >>> _ = a.split_segment(0)
+        >>> _ = a.split_segment(0)
+        >>> a.handles()
+        [<Handle object on (0, 0)>, <Handle object on (2.5, 0)>, <Handle object on (5, 0)>, <Handle object on (10, 0)>, <Handle object on (20, 0)>]
+        >>> a.merge_segment(0, parts=4)
+        [<Handle object on (2.5, 0)>, <Handle object on (5, 0)>, <Handle object on (10, 0)>]
+        >>> a.handles()
+        [<Handle object on (0, 0)>, <Handle object on (20, 0)>]
-        """
-        assert len(self._handles) > 2, 'Not enough segments'
@@ -585 +610 @@
-            raise IndexError("index out of range (0 > %d > %d)" % (segment, len(self._handles) - 1))
-        if segment == 0: segment = 1
+        deleted_handles = [self._handles[segment]]
-        del self._handles[segment]
-        if parts > 2:
-merge_segment(segment, parts - 1
+deleted_handles.extend(self.merge_segment(segment, parts - 1)
-        else:
-            # Force orthogonal constraints to be recreated
-            self.orthogonal = self.orthogonal
+        return deleted_handles
-
-    reversible_pair(split_segment, merge_segment)
@@ -639 +666 @@
-        >>> a.handles()[1].pos = 30, 30
-        >>> a.split_segment(0)
+        [<Handle object on (15, 15)>]
-        >>> a.handles()[1].pos = 25, 5
-        >>> a.point(-1, 0)

gaphas/trunk/gaphas/solver.py

@@ -532 +532 @@
-        False
-        """
-use a copy of the original set, so constraints may be deleted in th
-
+Use a copy of the original set, so constraints may b
+deleted in the 
-        variables = set(variables)
-        for c in set(self._constraints):

gaphas/trunk/undo.txt

@@ -377 +377 @@
-
-    >>> l.split_segment(0)
+    [<Handle object on (5, 5)>]
-    >>> l.handles()
-    [<Handle object on (0, 0)>, <Handle object on (5, 5)>, <Handle object on (10, 10)>]