Changeset 273:066f7271e849 for src/mlx/config.py

Timestamp:

07/03/12 17:30:04 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added the playback of approach callouts

File:

• src/mlx/config.py (modified) (2 diffs)

src/mlx/config.py

@@ -157 +157 @@
             index += 1
 
+    def getAltitudes(self, descending = True):
+        """Get the altitudes in decreasing order by default."""
+        altitudes = self._mapping.keys()
+        altitudes.sort(reverse = descending)
+        return altitudes
+
+    def __nonzero__(self):
+        """Return if there is anything in the mapping."""
+        return not not self._mapping
+
     def __eq__(self, other):
         """Determine if the approach callout mapping is equal to the given
@@ -172 +182 @@
 
     def __getitem__(self, altitude):
-        """Get the file that is associated with the highest altitude not higher
-        than the given one.
+        """Get the file that is associated with the given altitude.
 
         If no such file found, return None."""
-        candidate = None
-        for (alt, path) in self._mapping.iteritems():
-            if alt<=altitude:
-                if candidate is None or alt>candidate[0]:
-                    candidate = (alt, path)
-
-        return candidate
+        return self._mapping[altitude] if altitude in self._mapping else None
 
     def __iter__(self):
         """Iterate over the pairs of altitudes and paths in decreasing order of
         the altitude."""
-        altitudes = self._mapping.keys()
-        altitudes.sort(reverse = True)
+        altitudes = self.getAltitudes()
 
         for altitude in altitudes: