Changeset 41 for trunk

Timestamp:

02/23/08 13:22:35 (5 years ago)

Author:

erik

Message:

Rather than a list of tuples, the zone information is now returned and accepted as a list of lists. It won't make any difference in the way the data is handled, but it makes it possible to compare results in FL with results from UFO. (the pairs are stored as lists in the UFO, not tuples). Two internal method names are updated as well as they're no longer making tuples.

File:

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

trunk/robofab/Lib/robofab/objects/objectsFL.py

@@ -145 +145 @@
         # you really have to _get_ and _set_ a list.
         
-        def _asTuplePairs(self, l):
+        def _asPairs(self, l):
                 """Split a list of numbers into a list of pairs"""
                 assert len(l)%2 == 0, "Even number of values required: %s"%(`l`)
-                n = [(l[i], l[i+1]) for i in range(0, len(l), 2)]
+                n = [[l[i], l[i+1]] for i in range(0, len(l), 2)]
                 n.sort()
                 return n
         
-        def _flattenTuplePairs(self, l):
-                """The reverse of _asTuplePairs"""
+        def _flattenPairs(self, l):
+                """The reverse of _asPairs"""
                 n = []
                 l.sort()
@@ -163 +163 @@
         
         def _getBlueValues(self):
-                        return self._asTuplePairs(self._object.blue_values[self._masterIndex])
+                        return self._asPairs(self._object.blue_values[self._masterIndex])
         def _setBlueValues(self, values):
                 # FL says max 13 elements for this attribute
-                values = self._flattenTuplePairs(values)
+                values = self._flattenPairs(values)
                 self._object.blue_values_num = min(self._attrs['blueValues']['max'], len(values))
                 for i in range(self._object.blue_values_num):
@@ -172 +172 @@
 
         def _getOtherBlues(self):
-                        return self._asTuplePairs(self._object.other_blues[self._masterIndex])
+                        return self._asPairs(self._object.other_blues[self._masterIndex])
         def _setOtherBlues(self, values):
                 # FL says max 9 elements for this attribute
-                values = self._flattenTuplePairs(values)
+                values = self._flattenPairs(values)
                 self._object.other_blues_num = min(self._attrs['otherBlues']['max'], len(values))
                 for i in range(self._object.other_blues_num):
@@ -181 +181 @@
 
         def _getFamilyBlues(self):
-                        return self._asTuplePairs(self._object.family_blues[self._masterIndex])
+                        return self._asPairs(self._object.family_blues[self._masterIndex])
         def _setFamilyBlues(self, values):
                 # FL says max 13 elements for this attribute
-                values = self._flattenTuplePairs(values)
+                values = self._flattenPairs(values)
                 self._object.family_blues_num = min(self._attrs['familyBlues']['max'], len(values))
                 for i in range(self._object.family_blues_num):
@@ -190 +190 @@
 
         def _getFamilyOtherBlues(self):
-                        return self._asTuplePairs(self._object.family_other_blues[self._masterIndex])
+                        return self._asPairs(self._object.family_other_blues[self._masterIndex])
         def _setFamilyOtherBlues(self, values):
                 # FL says max 9 elements for this attribute
-                values = self._flattenTuplePairs(values)
+                values = self._flattenPairs(values)
                 self._object.family_other_blues_num = min(self._attrs['familyOtherBlues']['max'], len(values))
                 for i in range(self._object.family_other_blues_num):