Changeset 264:6fbadb22b2c3 for src

Timestamp:

07/01/12 07:58:44 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Started implementing the approach callout editor

Location:

src/mlx

Files:

• config.py (modified) (10 diffs)
• gui/callouts.py (added)
• gui/checklist.py (modified) (1 diff)
• gui/common.py (modified) (2 diffs)
• gui/gui.py (modified) (4 diffs)
• i18n.py (modified) (2 diffs)

src/mlx/config.py

@@ -42 +42 @@
                self.key == other.key
 
+    def __ne__(self, other):
+        """Check if the given hotkey is not equal to the other one."""
+        return not self==other
+        
     def __str__(self):
         """Construct the hotkey to a string."""
@@ -92 +96 @@
         return self._fileList == other._fileList
 
+    def __ne__(self, other):
+        """Determine if the checklist is not equal to the given other one."""
+        return not self==other
+        
     def __len__(self):
         """Get the length of the file list."""
@@ -103 +111 @@
         """Iterate over the files."""
         return iter(self._fileList)
+
+#-------------------------------------------------------------------------------
+
+class ApproachCallouts(object):
+    """The approach callouts for a certain aircraft type."""
+    # The name of the section of the approach callouts
+    SECTION="callouts"
+    
+    @staticmethod
+    def fromConfig(config, aircraftType):
+        """Create a checklist for the given aircraft type from the given
+        config."""
+        baseName = "callouts." + const.icaoCodes[aircraftType] + "."
+        mapping = {}
+        while True:
+            option = baseName + str(len(mapping))
+            if config.has_option(ApproachCallouts.SECTION, option):
+                value = config.get(ApproachCallouts.SECTION, option)
+                (altitude, path) = value.split(",")
+                altitude = int(altitude.strip())
+                path = path.strip()
+                mapping[altitude] = path
+            else:
+                break
+
+        return ApproachCallouts(mapping)    
+
+    def __init__(self, mapping = None):
+        """Construct the check list with the given mapping of altitudes to
+        files."""
+        self._mapping = {} if mapping is None else mapping.copy()
+
+    def clone(self):
+        """Clone the callout information."""
+        return ApproachCallouts(self._mapping)
+
+    def toConfig(self, config, aircraftType):
+        """Add this checklist to the given config."""
+        baseName = "callouts." + const.icaoCodes[aircraftType] + "."
+        index = 0
+        for (altitude, path) in self._mapping.iteritems():
+            option = baseName + str(index)
+            config.set(ApproachCallouts.SECTION, option,
+                       "%d, %s" % (altitude, path))
+            index += 1
+
+    def __eq__(self, other):
+        """Determine if the approach callout mapping is equal to the given
+        other one."""
+        return self._mapping == other._mapping
+
+    def __ne__(self, other):
+        """Determine if the approach callout mapping is not equal to the given
+        other one."""
+        return not self==other
+
+    def __len__(self):
+        """Get the number of elements in the mapping."""
+        return len(self._mapping)
+
+    def __getitem__(self, altitude):
+        """Get the file that is associated with the highest altitude not higher
+        than the given one.
+
+        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
+
+    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)
+
+        for altitude in altitudes:
+            yield (altitude, self._mapping[altitude])
 
 #-------------------------------------------------------------------------------
@@ -137 +226 @@
         self._pilotHotkey = Hotkey(ctrl = True, shift = False, key = "0")
 
-        #self._approachCallOuts = False
+        self._enableApproachCallouts = False
         self._speedbrakeAtTD = True
 
@@ -149 +238 @@
 
         self._checklists = {}
+        self._approachCallouts = {}
         for aircraftType in const.aircraftTypes:
             self._checklists[aircraftType] = Checklist()
-        
+            self._approachCallouts[aircraftType] = ApproachCallouts()
+            
         self._modified = False
 
@@ -404 +495 @@
             self._modified = True
 
-    # @property
-    # def approachCallOuts(self):
-    #     """Get whether the approach callouts should be played."""
-    #     return self._approachCallOuts
-
-    # @approachCallOuts.setter
-    # def approachCallOuts(self, approachCallOuts):
-    #     """Set whether the approach callouts should be played."""
-    #     if approachCallOuts!=self._approachCallOuts:
-    #         self._approachCallOuts = approachCallOuts
-    #         self._modified = True
+    @property
+    def enableApproachCallouts(self):
+        """Get whether the approach callouts should be played."""
+        return self._enableApproachCallouts
+
+    @enableApproachCallouts.setter
+    def enableApproachCallouts(self, enableApproachCallouts):
+        """Set whether the approach callouts should be played."""
+        if enableApproachCallouts!=self._enableApproachCallouts:
+            self._enableApproachCallouts = enableApproachCallouts
+            self._modified = True
 
     @property
@@ -484 +575 @@
         if checklist!=self._checklists[aircraftType]:
             self._checklists[aircraftType] = checklist.clone()
+            self._modified = True
+
+    def getApproachCallouts(self, aircraftType):
+        """Get the approach callouts for the given aircraft type."""
+        return self._approachCallouts[aircraftType]
+
+    def setApproachCallouts(self, aircraftType, approachCallouts):
+        """Set the approach callouts for the given aircraft type."""
+        if not approachCallouts==self._approachCallouts[aircraftType]:
+            print "Updating approach callouts"
+            self._approachCallouts[aircraftType] = approachCallouts.clone()
             self._modified = True
 
@@ -538 +640 @@
         self._pilotHotkey.set(self._get(config, "sounds",
                                         "pilotHotkey", "C0"))
-        #self._approachCallOuts = self._getBoolean(config, "sounds",
-        #                                          "approachCallOuts", False)
+        self._enableApproachCallOuts = \
+            self._getBoolean(config, "sounds", "enableApproachCallOuts", False)
         self._speedbrakeAtTD = self._getBoolean(config, "sounds",
                                                 "speedbrakeAtTD", True)
@@ -555 +657 @@
             self._checklists[aircraftType] = \
                 Checklist.fromConfig(config, aircraftType)
+            self._approachCallouts[aircraftType] = \
+                ApproachCallouts.fromConfig(config, aircraftType)
 
         self._modified = False
@@ -626 +730 @@
 
         config.add_section(Checklist.SECTION)
+        config.add_section(ApproachCallouts.SECTION)
         for aircraftType in const.aircraftTypes:
             self._checklists[aircraftType].toConfig(config, aircraftType)
+            self._approachCallouts[aircraftType].toConfig(config, aircraftType)
 
         try:

src/mlx/gui/checklist.py

@@ -203 +203 @@
         selection = self._fileList.get_selection()
         (model, paths) = selection.get_selected_rows()
-        while paths:
-            model.remove(model.get_iter(paths[0]))
-            (model, paths) = selection.get_selected_rows()
+
+        iters = [model.get_iter(path) for path in paths]
+
+        for i in iters:
+            if i is not None:
+                model.remove(i)
         
     def _moveUpButtonClicked(self, button):

src/mlx/gui/common.py

@@ -62 +62 @@
     WINDOW_STATE_ICONIFIED = gdk.WINDOW_STATE_ICONIFIED
     WINDOW_STATE_WITHDRAWN = gdk.WINDOW_STATE_WITHDRAWN
+
+    SORT_ASCENDING = gtk.SORT_ASCENDING
+    SORT_DESCENDING = gtk.SORT_DESCENDING
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
@@ -118 +121 @@
     WINDOW_STATE_WITHDRAWN = gdk.WindowState.WITHDRAWN
 
+    SORT_ASCENDING = gtk.SortType.ASCENDING
+    SORT_DESCENDING = gtk.SortType.DESCENDING
+
     pixbuf_new_from_file = gdkPixbuf.Pixbuf.new_from_file
 

src/mlx/gui/gui.py

@@ -13 +13 @@
 from mlx.gui.prefs import Preferences
 from mlx.gui.checklist import ChecklistEditor
+from mlx.gui.callouts import ApproachCalloutsEditor
 from mlx.gui.pirep import PIREPViewer
 
@@ -95 +96 @@
         self._preferences = Preferences(self)
         self._checklistEditor = ChecklistEditor(self)
+        self._approachCalloutsEditor = ApproachCalloutsEditor(self)
 
         menuBar = self._buildMenuBar(accelGroup)
@@ -870 +872 @@
         checklistMenuItem.connect("activate", self._editChecklist)
         toolsMenu.append(checklistMenuItem)
+
+        approachCalloutsMenuItem = gtk.ImageMenuItem(gtk.STOCK_EDIT)
+        approachCalloutsMenuItem.set_use_stock(True)
+        approachCalloutsMenuItem.set_label(xstr("menu_tools_callouts"))
+        approachCalloutsMenuItem.add_accelerator("activate", accelGroup,
+                                                 ord(xstr("menu_tools_callouts_key")),
+                                                 CONTROL_MASK, ACCEL_VISIBLE)
+        approachCalloutsMenuItem.connect("activate", self._editApproachCallouts)
+        toolsMenu.append(approachCalloutsMenuItem)
 
         prefsMenuItem = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES)
@@ -1007 +1018 @@
         """Callback for editing the checklists."""
         self._checklistEditor.run()
+        
+    def _editApproachCallouts(self, menuItem):
+        """Callback for editing the approach callouts."""
+        self._approachCalloutsEditor.run()
         
     def _editPreferences(self, menuItem):

src/mlx/i18n.py

@@ -181 +181 @@
         self.add("menu_tools_chklst", "_Checklist Editor")
         self.add("menu_tools_chklst_key", "c")
+        self.add("menu_tools_callouts", "_Approach Callouts Editor")
+        self.add("menu_tools_callouts_key", "e")
         self.add("menu_tools_prefs", "_Preferences")
         self.add("menu_tools_prefs_key", "p")
@@ -975 +977 @@
         self.add("about_role_negotiation", "negotiation")
         self.add("about_role_test", "testing")
+
+        self.add("callouts_title", "Approach Callouts Editor")
+        self.add("callouts_aircraftType", "Aircraft _type:")
+        self.add("callouts_aircraftType_tooltip",
+                 "The type of the aircraft for which the approach "
+                 "callouts are being edited.")
+        self.add("callouts_header_altitude", "Altitude")
+        self.add("callouts_header_path", "Callout file")
+        self.add("callouts_add", "_Add new callout")
+        self.add("callouts_add_tooltip",
+                 "Add a new callout with some default altitude.")
+        self.add("callouts_remove", "_Remove")
+        self.add("callouts_remove_tooltip",
+                 "Remove the selected items from the list of callouts.")
+        self.add("callouts_altitude_clash",
+                 "There is already a callout for this altitude")
+        self.add("callouts_altitude_clash_sec",
+                 "Shall I set the altitude nevertheless? If so, "
+                 "both callouts will be played when reaching the altitude "
+                 "simultaneously.")
+        # self.add("chklst_moveUp", "Move _up")
+        # self.add("chklst_moveUp_tooltip",
+        #          "Move up the selected file(s) in the checklist.")
+        # self.add("chklst_moveDown", "Move _down")
+        # self.add("chklst_moveDown_tooltip",
+        #          "Move down the selected file(s) in the checklist.")
+        # self.add("chklst_filter_audio", "Audio files")
 
 #------------------------------------------------------------------------------