Changeset 1017

Timestamp:

11/22/11 19:10:35 (18 months ago)

Author:

tal

Message:

Recent change from the trunk.

File:

• packages/defcon/branches/ufo3/Lib/defcon/objects/component.py (modified) (4 diffs)

packages/defcon/branches/ufo3/Lib/defcon/objects/component.py

@@ -1 +1 @@
 import weakref
 from warnings import warn
+from fontTools.misc.transform import Transform
 from defcon.objects.base import BaseObject
+
+_defaultTransformation = (1, 0, 0, 1, 0, 0)
 
 
@@ -28 +31 @@
         self._dirty = False
         self._baseGlyph = None
-        self._transformation = (1, 0, 0, 1, 0, 0)
+        self._transformation = tuple(_defaultTransformation)
         self._identifier = None
 
@@ -66 +69 @@
     glyph = property(_get_glyph, doc="The :class:`Glyph` that this component belongs to.")
 
+    # bounds
+
+    def _getBounds(self, boundsAttr):
+        layer = self.layer
+        if layer is None:
+            return None
+        if self.baseGlyph not in layer:
+            return None
+        glyph = layer[self.baseGlyph]
+        bounds = getattr(glyph, boundsAttr)
+        if bounds is None:
+            return None
+        if self.transformation == _defaultTransformation:
+            return bounds
+        xMin, yMin, xMax, yMax = bounds
+        t = Transform(*self.transformation)
+        points = [(xMin, yMin), (xMax, yMax)]
+        (xMin, yMin), (xMax, yMax) = t.transformPoints(points)
+        return xMin, yMin, xMax, yMax
+
     def _get_bounds(self):
-        from robofab.pens.boundsPen import BoundsPen
-        glyph = self.glyph
-        if glyph is None:
-            return None
-        font = glyph.font
-        if font is None:
-            return None
-        pen = BoundsPen(font)
-        self.draw(pen)
-        return pen.bounds
+        return self._getBounds("bounds")
 
     bounds = property(_get_bounds, doc="The bounds of the components's outline expressed as a tuple of form (xMin, yMin, xMax, yMax).")
 
     def _get_controlPointBounds(self):
-        from fontTools.pens.boundsPen import ControlBoundsPen
-        glyph = self.glyph
-        if glyph is None:
-            return None
-        font = glyph.font
-        if font is None:
-            return None
-        pen = ControlBoundsPen(font)
-        self.draw(pen)
-        return pen.bounds
+        return self._getBounds("controlPointBounds")
 
     controlPointBounds = property(_get_controlPointBounds, doc="The control bounds of all points in the components. This only measures the point positions, it does not measure curves. So, curves without points at the extrema will not be properly measured.")
+
+    # base glyph
 
     def _set_baseGlyph(self, value):
@@ -106 +113 @@
 
     baseGlyph = property(_get_baseGlyph, _set_baseGlyph, doc="The glyph that the components references. Setting this will post *Component.BaseGlyphChanged* and *Component.Changed* notifications.")
+
+    # transformation
 
     def _set_transformation(self, value):