Changeset 1036

Timestamp:

12/02/11 21:59:11 (18 months ago)

Author:

tal

Message:

New notifications and improved glyph renaming behavior.

File:

• packages/defcon/branches/ufo3/Lib/defcon/objects/layer.py (modified) (9 diffs)

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

@@ -22 +22 @@
     Layer.GlyphsChanged
     Layer.GlyphChanged
+    Layer.GlyphWillBeAdded
     Layer.GlyphAdded
+    Layer.GlyphWillBeDeleted
     Layer.GlyphDeleted
-    Layer.GlyphWillBeDeleted
     Layer.GlyphNameChanged
     Layer.NameChanged
@@ -175 +176 @@
             raise KeyError, "%s not in layer" % name
         glyph = self.instantiateGlyphObject()
-        self.beginSelfGlyphNotificationObservation(glyph)
         glyph.disableNotifications()
+        glyph.name = name
+        self._insertGlyph(glyph)
         pointPen = glyph.getPointPen()
         self._glyphSet.readGlyph(glyphName=name, glyphObject=glyph, pointPen=pointPen)
         glyph.dirty = False
         glyph.enableNotifications()
-        self._glyphs[name] = glyph
         self._stampGlyphDataState(glyph)
         return glyph
@@ -191 +192 @@
         with the new glyph.
 
-        This posts *Layer.GlyphAdded* and *Layer.Changed* notifications.
-        """
+        This posts *Layer.GlyphWillBeAdded*, *Layer.GlyphAdded*
+        and *Layer.Changed* notifications.
+        """
+        self.postNotification("Layer.GlyphWillBeAdded", data=(dict(name=name)))
         if name in self:
             self._unicodeData.removeGlyphData(name, self[name].unicodes)
         glyph = self.instantiateGlyphObject()
-        self.beginSelfGlyphNotificationObservation(glyph)
         glyph.disableNotifications()
         glyph.name = name
+        self._insertGlyph(glyph)
         glyph.enableNotifications()
-        self._glyphs[name] = glyph
-        if name in self._scheduledForDeletion:
-            del self._scheduledForDeletion[name]
-        self._keys.add(name)
         self.postNotification("Layer.GlyphAdded", data=(dict(name=name)))
         self.dirty = True
@@ -215 +214 @@
         be replaced with the new glyph.
 
-        This posts *Layer.GlyphAdded* and *Layer.Changed* notifications.
+        This posts *Layer.GlyphWillBeAdded*, *Layer.GlyphAdded*
+        and *Layer.Changed* notifications.
         """
         # DO NOT ACTUALLY INSERT THE GLYPH!
@@ -225 +225 @@
         if name is None:
             name = source.name
+        self.postNotification("Layer.GlyphWillBeAdded", data=(dict(name=name)))
         self.holdNotifications()
         self.newGlyph(name)
         dest = self[name]
-        dest.disableNotifications()
         dest.copyDataFromGlyph(glyph)
-        dest.enableNotifications()
-        if dest.unicodes:
-            self._unicodeData.addGlyphData(name, dest.unicodes)
         self.releaseHeldNotifications()
         return dest
+
+    def _insertGlyph(self, glyph, beginObservations=True):
+        name = glyph.name
+        self._glyphs[name] = glyph
+        if name in self._scheduledForDeletion:
+            del self._scheduledForDeletion[name]
+        self._keys.add(name)
+        if beginObservations:
+            self.beginSelfGlyphNotificationObservation(glyph)
+        if glyph.unicodes:
+            self._unicodeData.addGlyphData(name, glyph.unicodes)
 
     # -------------
@@ -256 +264 @@
             raise KeyError, "%s not in layer" % name
         self.postNotification("Layer.GlyphWillBeDeleted", data=dict(name=name))
+        self._deleteGlyph(name)
+        self.postNotification("Layer.GlyphDeleted", data=dict(name=name))
+        self.dirty = True
+
+    def _deleteGlyph(self, name, endObservations=True):
         self._unicodeData.removeGlyphData(name, self[name].unicodes)
         dataOnDiskTimeStamp = None
@@ -261 +274 @@
         if name in self._glyphs:
             glyph = self._glyphs.pop(name)
-            self.endSelfGlyphNotificationObservation(glyph)
+            if endObservations:
+                self.endSelfGlyphNotificationObservation(glyph)
             dataOnDiskTimeStamp = glyph._dataOnDiskTimeStamp
             dataOnDisk = glyph._dataOnDisk
@@ -268 +282 @@
         if self._glyphSet is not None and name in self._glyphSet:
             self._scheduledForDeletion[name] = dict(dataOnDiskTimeStamp=dataOnDiskTimeStamp, dataOnDisk=dataOnDisk)
-        self.postNotification("Layer.GlyphDeleted", data=dict(name=name))
-        self.dirty = True
 
     def __len__(self):
@@ -707 +719 @@
         newName = data["newValue"]
         glyph = self._glyphs[oldName]
-        self.disableNotifications()
-        del self[oldName] # use __del__ because *lots* of things have to be adjusted
-        self.enableNotifications()
-        self._glyphs[newName] = glyph
-        self._keys.add(newName)
+        self._deleteGlyph(oldName, endObservations=False)
         self._unicodeData.removeGlyphData(oldName, glyph.unicodes)
-        self._unicodeData.addGlyphData(newName, glyph.unicodes)
+        self._insertGlyph(glyph, beginObservations=False)
         self.postNotification("Layer.GlyphNameChanged", data=dict(oldValue=oldName, newValue=newName))