Changeset 174

Timestamp:

03/22/09 06:09:56 (3 years ago)

Author:

erik

Message:

Remove AllFonts? import, as it is defined in this file. Add functions for getting the data in the mask as a fab glyph, and setting the mask data with a fab glyph.

Files:

• trunk/Lib/robofab/objects/objectsFL.py (modified) (3 diffs)

trunk/Lib/robofab/objects/objectsFL.py

@@ -3 +3 @@
-from FL import *        
-
-
-
+
-from robofab.objects.objectsBase import BaseFont, BaseGlyph, BaseContour, BaseSegment,\
-                BasePoint, BaseBPoint, BaseAnchor, BaseGuide, BaseComponent, BaseKerning, BaseInfo, BaseFeatures, BaseGroups, BaseLib,\
@@ -344 +343 @@
-def CurrentGlyph():
-        """Return a RoboFab glyph object for the currently selected glyph."""
-        from robofab.world import AllFonts
-        currentPath = fl.font.file_name
-        if fl.glyph is None:
@@ -392 +390 @@
-                all.append(RFont(naked))
-        return all
+        
+        from robofab.world import CurrentGlyph
+
+def getGlyphFromMask(g):
+        """Get a Fab glyph object for the data in the mask layer."""
+        from robofab.objects.objectsFL import RGlyph as FL_RGlyph
+        from robofab.objects.objectsRF import RGlyph as RF_RGlyph
+        n = g.naked()
+        mask = n.mask
+        fg = FL_RGlyph(mask)
+        rf = RF_RGlyph()
+        pen = rf.getPointPen()
+        fg.drawPoints(pen)
+        rf.width = g.width      # can we get to the mask glyph width without flipping the UI?
+        return rf
+
+def setMaskToGlyph(maskGlyph, targetGlyph, clear=True):
+        """Set the maskGlyph as a mask layer in targetGlyph.
+        maskGlyph is a FontLab or RoboFab RGlyph, orphaned or not.
+        targetGlyph is a FontLab RGLyph.
+        clear is a bool. False: keep the existing mask data, True: clear the existing mask data.
+        """
+        from robofab.objects.objectsFL import RGlyph as FL_RGlyph
+        from FL import Glyph as FL_NakedGlyph
+        flGlyph = FL_NakedGlyph()               # new, orphaned FL glyph
+        wrapped = FL_RGlyph(flGlyph)    # rf wrapper for FL glyph
+        if not clear:
+                        # copy the existing mask data first
+                        existingMask = getGlyphFromMask(targetGlyph)
+                        pen = wrapped.getPointPen()             # get a pen for the wrapper
+                        existingMask.drawPoints(pen)
+        pen = wrapped.getPointPen()             # get a pen for the wrapper
+        maskGlyph.drawPoints(pen)               # draw the data
+        targetGlyph.naked().mask = wrapped .naked()     
+        targetGlyph.update()
-
-# the lib getter and setter are shared by RFont and RGlyph