Changes in / [495:9c830f5791a5:496:0dadad5a93b8]

Location:

src/mlx

Files:

• checks.py (modified) (2 diffs)
• flight.py (modified) (1 diff)
• fs.py (modified) (2 diffs)
• gui/gui.py (modified) (3 diffs)
• gui/monitor.py (modified) (4 diffs)
• sound.py (modified) (2 diffs)
• xplane.py (added)

src/mlx/checks.py

@@ -957 +957 @@
         """Check if the fault condition holds."""
         if flight.stage==const.STAGE_CRUISE:
-            bankLimit = 30
+            isDH8DXplane = flight.aircraftType==const.AIRCRAFT_DH8D and \
+                           (flight.fsType==const.SIM_XPLANE10 or
+                            flight.fsType==const.SIM_XPLANE9)
+            bankLimit = 35 if isDH8DXplane else 30
         elif flight.stage in [const.STAGE_TAKEOFF, const.STAGE_CLIMB,
                               const.STAGE_DESCENT, const.STAGE_LANDING]:
@@ -968 +971 @@
     def logFault(self, flight, aircraft, logger, oldState, state):
         """Log the fault."""
+        message = "Bank too steep (%.1f)" % (state.bank,)
         flight.handleFault(BankChecker, state.timestamp,
-                           FaultChecker._appendDuring(flight, "Bank too steep"),
+                           FaultChecker._appendDuring(flight, message),
                            2)
 

src/mlx/flight.py

@@ -86 +86 @@
         """Get the flight stage."""
         return self._stage
+
+    @property
+    def fsType(self):
+        """Get the flight simulator type."""
+        return self._gui.fsType
 
     @property

src/mlx/fs.py

@@ -3 +3 @@
 from sound import startSound
 
-import fsuipc
+import os
+
+if os.name=="nt" or "FORCE_PYUIPC_SIM" in os.environ:
+    import fsuipc as sim
+else:
+    import xplane as sim
+
 import threading
 import time
@@ -58 +64 @@
     assert type in [const.SIM_MSFS9, const.SIM_MSFSX], \
            "Only MS Flight Simulator 2004 and X are supported"
-    return fsuipc.Simulator(connectionListener, connectAttempts = 3)
+    return sim.Simulator(connectionListener, connectAttempts = 3)
 
 #-------------------------------------------------------------------------------

src/mlx/gui/gui.py

@@ -69 +69 @@
         self._flight = None
         self._simulator = None
+        self._fsType = None
         self._monitoring = False
 
@@ -208 +209 @@
 
     @property
+    def fsType(self):
+        """Get the flight simulator type."""
+        return self._fsType
+
+    @property
     def entranceExam(self):
         """Get whether an entrance exam is about to be taken."""
@@ -428 +434 @@
             self._wizard.connected(fsType, descriptor)
         self._reconnecting = False
+        self._fsType = fsType
         self._listenHotkeys()
 

src/mlx/gui/monitor.py

@@ -226 +226 @@
         table.attach(label, 0, 1, 8, 9)
         table.attach(self._qnh, 1, 2, 8, 9)
+
+        (label, self._cog) = self._createLabeledEntry("CoG:", 7)
+        table.attach(label, 2, 3, 8, 9)
+        table.attach(self._cog, 3, 4, 8, 9)
 
         alignment.add(table)
@@ -312 +316 @@
             self._adf2.set_text("-")
             self._qnh.set_text("-")
+            self._cog.set_text("-")
         else:
             self._timestamp.set_text(time.strftime("%H:%M:%S",
@@ -386 +391 @@
             self._gearControlDown.set_sensitive(aircraftState.gearControlDown)
             self._gearsDown.set_sensitive(aircraftState.gearsDown)
-            self._spoilersArmed.set_sensitive(aircraftState.spoilersArmed)
+            self._spoilersArmed.set_sensitive(aircraftState.spoilersArmed is True)
             self._spoilersExtension.set_text("%.0f" % (aircraftState.spoilersExtension,))
             self._windSpeed.set_text("%.0f" % (aircraftState.windSpeed,))
@@ -404 +409 @@
             self._adf1.set_text("-" if aircraftState.adf1 is None else aircraftState.adf1)
             self._adf2.set_text("-" if aircraftState.adf2 is None else aircraftState.adf2)
+            self._cog.set_text("%.2f%%" % (aircraftState.cog*100.0,))
 
 #------------------------------------------------------------------------------

src/mlx/sound.py

@@ -166 +166 @@
     def startSound(name, finishCallback = None, extra = None):
         """Start playing back the given sound.
-        
+
         name should be the name of a sound file relative to the sound directory
         given in initializeSound."""
         _thread.requestSound(name, finishCallback = finishCallback,
                              extra = extra)
-        
+
 #------------------------------------------------------------------------------
 
 else: # os.name!="nt"
-    def initializeSound(soundsDirectory):
-        """Initialize the sound handling with the given directory containing
-        the sound files."""
-        pass
-
-    def startSound(name, finishCallback = None, extra = None):
-        """Start playing back the given sound.
-
-        FIXME: it does not do anything currently, but it should."""
-        print "sound.startSound:", name
+    import threading
+    try:
+        import pyglet
+
+        class SoundThread(threading.Thread):
+            """A thread executing the pyglet event loop that directs the
+            playback of the sound files."""
+            class Player(pyglet.media.ManagedSoundPlayer):
+                """Player which handles the end-of-stream condition
+                properly."""
+
+                def __init__(self, finishCallback, extra):
+                    """Construct the player with the given data."""
+                    super(SoundThread.Player, self).__init__()
+
+                    self._finishCallback = finishCallback
+                    self._extra = extra
+
+                def _on_eos(self):
+                    if self._finishCallback is not None:
+                        self._finishCallback(True, self._extra)
+                    return super(SoundThread.Player, self)._on_eos()
+
+            class EventLoop(pyglet.app.EventLoop):
+                """Own implementation of the event loop that collects the
+                requested sound files and plays them."""
+
+                def __init__(self, soundsDirectory):
+                    """Construct the event loop."""
+                    super(SoundThread.EventLoop, self).__init__()
+
+                    self._soundsDirectory = soundsDirectory
+
+                    self._lock = threading.Lock()
+                    self._requestedSounds = []
+
+                def startSound(self, name, finishCallback, extra):
+                    """Add the sound with the given name"""
+                    with self._lock:
+                        path = os.path.join(self._soundsDirectory, name)
+                        self._requestedSounds.append( (path,
+                                                       finishCallback, extra) )
+
+                def idle(self):
+                    """The idle callback."""
+                    with self._lock:
+                        requestedSounds = self._requestedSounds
+                        self._requestedSounds = []
+
+                    for (path, finishCallback, extra) in requestedSounds:
+                        try:
+                            media = pyglet.media.load(path)
+                            player = SoundThread.Player(finishCallback, extra)
+                            player.queue(media)
+                            player.play()
+                        except Exception, e:
+                            print "mlx.SoundThread.EventLoop.idle: " + str(e)
+                            if finishCallback is not None:
+                                finishCallback(False, extra)
+
+                    timeout = super(SoundThread.EventLoop, self).idle()
+                    return 0.1 if timeout is None else min(timeout, 0.1)
+
+            def __init__(self, soundsDirectory):
+                """Construct the sound playing thread with the given
+                directory."""
+                super(SoundThread, self).__init__()
+
+                self.daemon = True
+                self.eventLoop = SoundThread.EventLoop(soundsDirectory)
+
+            def run(self):
+                """Run the event loop."""
+                self.eventLoop.run()
+
+            def startSound(self, name, finishCallback = None, extra = None):
+                """Start the playback of the given sound."""
+                self.eventLoop.startSound(name, finishCallback, extra)
+
+        _thread = None
+
+        def initializeSound(soundsDirectory):
+            """Initialize the sound handling with the given directory containing
+            the sound files."""
+            global _thread
+            _thread = SoundThread(soundsDirectory)
+            _thread.start()
+
+
+        def startSound(name, finishCallback = None, extra = None):
+            """Start playing back the given sound."""
+            _thread.startSound(name, finishCallback = finishCallback,
+                               extra = extra)
+
+    except:
+        print "The pyglet library is missing from your system. It is needed for sound playback on Linux"
+        def initializeSound(soundsDirectory):
+            """Initialize the sound handling with the given directory containing
+            the sound files."""
+            pass
+
+        def startSound(name, finishCallback = None, extra = None):
+            """Start playing back the given sound.
+
+            FIXME: it does not do anything currently, but it should."""
+            print "sound.startSound:", name
 
 #------------------------------------------------------------------------------
@@ -192 +288 @@
     def callback(result, extra):
         print "callback", result, extra
-    
+
     initializeSound("e:\\home\\vi\\tmp")
     startSound("malev.mp3", finishCallback = callback, extra="malev.mp3")