Changeset 318

Timestamp:

01/15/09 02:31:17 (4 years ago)

Author:

tal

Message:

Removed the autoContourDirection method. It was an application specific thing that somehow made it into defcon. If this is needed by other apps, it can come back.

File:

• packages/defcon/branches/ufo2/Lib/defcon/objects/glyph.py (modified) (2 diffs)

packages/defcon/branches/ufo2/Lib/defcon/objects/glyph.py

@@ -548 +548 @@
         return pen.getResult()
 
-    def autoContourDirection(self, baseDirectionIsClockwise=False):
-        """
-        Try to set the "proper" contour direction in the glyph.
-
-        Known Problems:
-
-        * Speed. This could be sped up by not testing every
-          point in overlapping contours, but that would
-          result in less accurate results.
-        * Contours with points that overlap, but lines
-          which intersect with the other contour. Consider
-          an "A" with the crossbar defined as a rectangle.
-        """
-        baseDirection = baseDirectionIsClockwise
-        # if only one contour is present, set
-        # the default direction and return
-        contourCount = len(self._contours)
-        if contourCount < 2:
-            for contour in self._contours:
-                contour.clockwise = baseDirection
-            return
-        #
-        countIter = xrange(contourCount)
-        intersections = {}
-        for index1 in countIter:
-            for index2 in countIter:
-                # don't test the same contour with itself
-                if index1 == index2:
-                    continue
-                # test for intersection of the two contours
-                bounds1 = self._contours[index1].bounds
-                bounds2 = self._contours[index2].bounds
-                intersects, position = arrayTools.sectRect(bounds1, bounds2)
-                if intersects:
-                    # only flag the contours if they are complete overlaps
-                    combinedRect = arrayTools.unionRect(bounds1, bounds2)
-                    if combinedRect == bounds1 or combinedRect == bounds2:
-                        if index1 not in intersections:
-                            intersections[index1] = []
-                        intersections[index1].append(index2)
-        for index in countIter:
-            direction = baseDirection
-            contour = self[index]
-            intersectingContours = intersections.get(index)
-            if intersectingContours:
-                for otherContourIndex in intersectingContours:
-                    otherContour = self[otherContourIndex]
-                    foundPointOutside = False
-                    for point in contour:
-                        if not point.segmentType:
-                            continue
-                        pt = (point.x, point.y)
-                        if not otherContour.pointInside(pt):
-                            foundPointOutside = True
-                            break
-                    if foundPointOutside:
-                        continue
-                    direction += 1
-            contour.clockwise = direction % 2
-
     # ---------------
     # Representations
@@ -1114 +1054 @@
     """
 
-def _testAutoContourDirection():
-    """
-    >>> from defcon.test.testTools import getTestFontPath
-    >>> from defcon.objects.font import Font
-    >>> font = Font(getTestFontPath('TestContourDirection.ufo'))
-    >>> glyph = font['TestContourDirection1']
-    >>> for contour in glyph:
-    ...     contour.clockwise = True
-    >>> glyph.autoContourDirection()
-    >>> [contour.clockwise for contour in glyph]
-    [False, True, False]
-    >>> glyph = font['TestContourDirection2']
-    >>> for contour in glyph:
-    ...     contour.clockwise = True
-    >>> glyph.autoContourDirection()
-    >>> [contour.clockwise for contour in glyph]
-    [False, False, True]
-    >>> glyph = font['TestContourDirection3']
-    >>> for contour in glyph:
-    ...     contour.clockwise = True
-    >>> glyph.autoContourDirection()
-    >>> [contour.clockwise for contour in glyph]
-    [False, True, True, True, True]
-    >>> glyph = font['TestContourDirection4']
-    >>> for contour in glyph:
-    ...     contour.clockwise = True
-    >>> glyph.autoContourDirection()
-    >>> [contour.clockwise for contour in glyph]
-    [False, False, True]
-    """
-
 if __name__ == "__main__":
     import doctest