Changeset 314

Timestamp:

01/14/09 23:15:00 (4 years ago)

Author:

tal

Message:

I never got around to fully wrapping the lib and the note. That is taken care of now. The classes also moved to properties to prevent tampering.

File:

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

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

@@ -4 +4 @@
 from defcon.tools.notifications import NotificationCenter
 
-
 _representationFactories = {}
 
@@ -17 +16 @@
 
     """
-    XXX lib, note, controlPointBounds
+    XXX controlPointBounds
 
     This object represents a glyph and it contains contour, component, anchor
@@ -51 +50 @@
     _notificationName = "Glyph.Changed"
 
-    def __init__(self, contourClass=None, componentClass=None, anchorClass=None):
+    def __init__(self, contourClass=None, componentClass=None, anchorClass=None, libClass=None):
         super(Glyph, self).__init__()
+
         self._parent = None
         self._dirty = False
@@ -58 +58 @@
         self._unicodes = []
         self._width = 0
-        self.note = None
-        self.lib = {}
+        self._note = None
         self._dispatcher = None
 
@@ -65 +64 @@
         self._components = []
         self._anchors = []
+
+        self._lib = None
 
         self._boundsCache = None
@@ -79 +80 @@
             from anchor import Anchor
             anchorClass = Anchor
-
-        self.contourClass = contourClass
-        self.componentClass = componentClass
-        self.anchorClass = anchorClass
+        if libClass is None:
+            from lib import Lib
+            libClass = Lib
+
+        self._contourClass = contourClass
+        self._componentClass = componentClass
+        self._anchorClass = anchorClass
+
+        self._lib = libClass()
+        self._lib.setParent(self)
 
     def _set_dispatcher(self, dispatcher):
@@ -93 +100 @@
             for anchor in self._anchors:
                 self._setParentDataInAnchor(anchor)
+            self._lib.dispatcher = dispatcher
+            self._lib.addObserver(observer=self, methodName="_libContentChanged", notification="Lib.Changed")
             self.addObserver(observer=self, methodName="destroyAllRepresentations", notification="Glyph.Changed")
 
@@ -103 +112 @@
     # Attributes
     # ----------
+
+    def _get_contourClass(self):
+        return self._contourClass
+
+    contourClass = property(_get_contourClass, doc="The class used for contours.")
+
+    def _get_componentClass(self):
+        return self._componentClass
+
+    componentClass = property(_get_componentClass, doc="The class used for components.")
+
+    def _get_anchorClass(self):
+        return self._anchorClass
+
+    anchorClass = property(_get_anchorClass, doc="The class used for anchors.")
 
     def _set_name(self, value):
@@ -209 +233 @@
 
     anchors = property(_get_anchors, doc="An ordered list of :class:`Anchor` objects stored in the glyph.")
+
+    def _get_note(self):
+        return self._note
+
+    def _set_note(self, value):
+        assert isinstance(value, basestring)
+        self._note = value
+        self.dirty = True
+
+    note = property(_get_note, _set_note, doc="An arbitrary note for the glyph. Setting this will post a *Glyph.Changed* notification.")
+
+    def _get_lib(self):
+        return self._lib
+
+    def _set_lib(self, value):
+        self._lib.clear()
+        self._lib.update(value)
+        self.dirty = True
+
+    lib = property(_get_lib, _set_lib, doc="The glyph's :class:`Lib` object. Setting this will clear any existing lib data and post a *Glyph.Changed* notification if data was replaced.")
 
     # -----------
@@ -678 +722 @@
         self.dirty = True
 
+    def _libContentChanged(self, notification):
+        self.dirty = True
+
 
 # -----