Changeset 1058

Timestamp:

12/15/11 18:45:03 (17 months ago)

Author:

tal

Message:

Load the Unicode data object lazily. This speeds things up a good bit.

Location:

packages/defcon/branches/ufo3/Lib/defcon/objects

Files:

• font.py (modified) (2 diffs)
• layer.py (modified) (8 diffs)

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

@@ -561 +561 @@
 
     def _get_unicodeData(self):
-        return self._glyphSet._unicodeData
+        return self._glyphSet.unicodeData
 
     unicodeData = property(_get_unicodeData, doc="The font's :class:`UnicodeData` object.")
@@ -1623 +1623 @@
     >>> glyph.unicodes = [65]
     >>> font.unicodeData[65]
-    ['A', 'test']
+    ['test', 'A']
     """
 

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

@@ -85 +85 @@
         self._color = None
         self._lib = None
-        self._unicodeData = self.instantiateUnicodeData()
-        self.beginSelfUnicodeDataNotificationObservation()
+        self._unicodeData = None
 
         self._directory = None
@@ -98 +97 @@
 
         if glyphSet is not None:
-            self._unicodeData.disableNotifications()
             self._keys = set(self._glyphSet.keys())
-            cmap = {}
-            for glyphName, unicodes in glyphSet.getUnicodes().items():
-                for code in unicodes:
-                    if code in cmap:
-                        cmap[code].append(glyphName)
-                    else:
-                        cmap[code] = [glyphName]
-            self._unicodeData.update(cmap)
-            self._unicodeData.enableNotifications()
 
     def __del__(self):
@@ -243 +232 @@
         if beginObservations:
             self.beginSelfGlyphNotificationObservation(glyph)
-        if glyph.unicodes:
+        if glyph.unicodes and self._unicodeData is not None:
             self._unicodeData.addGlyphData(name, glyph.unicodes)
 
@@ -271 +260 @@
 
     def _deleteGlyph(self, name, endObservations=True):
-        self._unicodeData.removeGlyphData(name, self[name].unicodes)
+        if self._unicodeData is not None:
+            self._unicodeData.removeGlyphData(name, self[name].unicodes)
         dataOnDiskTimeStamp = None
         dataOnDisk = None
@@ -546 +536 @@
 
     def endSelfUnicodeDataNotificationObservation(self):
-        if self._unicodeData.dispatcher is None:
+        if self._unicodeData is None or self._unicodeData.dispatcher is None:
             return
         self._unicodeData.endSelfNotificationObservation()
 
     def _get_unicodeData(self):
+        if self._unicodeData is None:
+            cmap = {}
+            for glyphName, glyph in self._glyphs.items():
+                if glyphName in self._scheduledForDeletion:
+                    continue
+                if not glyph.unicodes:
+                    continue
+                for code in glyph.unicodes:
+                    if code in cmap:
+                        cmap[code].append(glyphName)
+                    else:
+                        cmap[code] = [glyphName]
+            if self._glyphSet is not None:
+                glyphNames = set(self._glyphSet.keys()) - set(self._glyphs.keys())
+                for glyphName, unicodes in self._glyphSet.getUnicodes(glyphNames=glyphNames).items():
+                    for code in unicodes:
+                        if code in cmap:
+                            cmap[code].append(glyphName)
+                        else:
+                            cmap[code] = [glyphName]
+
+            self._unicodeData = self.instantiateUnicodeData()
+            self._unicodeData.disableNotifications()        
+            self._unicodeData.update(cmap)
+            self._unicodeData.enableNotifications()
+            self.beginSelfUnicodeDataNotificationObservation()
         return self._unicodeData
 
@@ -722 +738 @@
         glyph = self._glyphs[oldName]
         self._deleteGlyph(oldName, endObservations=False)
-        self._unicodeData.removeGlyphData(oldName, glyph.unicodes)
+        if self._unicodeData is not None:
+            self._unicodeData.removeGlyphData(oldName, glyph.unicodes)
         self._insertGlyph(glyph, beginObservations=False)
         self.postNotification("Layer.GlyphNameChanged", data=dict(oldValue=oldName, newValue=newName))
@@ -731 +748 @@
         oldValues = data["oldValue"]
         newValues = data["newValue"]
-        self._unicodeData.removeGlyphData(glyphName, oldValues)
-        self._unicodeData.addGlyphData(glyphName, newValues)
+        if self._unicodeData is not None:
+            self._unicodeData.removeGlyphData(glyphName, oldValues)
+            self._unicodeData.addGlyphData(glyphName, newValues)
 
 
@@ -1224 +1242 @@
     >>> glyph.unicodes = [65]
     >>> layer.unicodeData[65]
-    ['A', 'test']
+    ['test', 'A']
     """