Changeset 480:36a3391da8bf

Timestamp:

03/23/13 09:09:18 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Refined the strobe light and takeoff handling

Location:

src/mlx

Files:

• checks.py (modified) (3 diffs)
• gui/monitor.py (modified) (1 diff)

src/mlx/checks.py

@@ -1378 +1378 @@
             if state.groundSpeed>50:
                 SpeedChecker.logSpeedFault(flight, state)
+        else:
+            self._takeoffState = None
 
     def _checkPushAndTaxi(self, flight, aircraft, state):
@@ -1422 +1424 @@
     def isCondition(self, flight, aircraft, oldState, state):
         """Check if the fault condition holds."""
-        return (flight.stage==const.STAGE_BOARDING and \
+        return state.strobeLightsOn is not None and \
+              ((flight.stage==const.STAGE_BOARDING and \
                 state.strobeLightsOn and state.onTheGround) or \
                 (flight.stage==const.STAGE_TAKEOFF and \
@@ -1430 +1433 @@
                   not state.strobeLightsOn and not state.onTheGround) or \
                   (flight.stage==const.STAGE_PARKING and \
-                   state.strobeLightsOn and state.onTheGround)
+                   state.strobeLightsOn and state.onTheGround))
 
     def logFault(self, flight, aircraft, logger, oldState, state):

src/mlx/gui/monitor.py

@@ -371 +371 @@
             self._navLightsOn.set_sensitive(aircraftState.navLightsOn is True)
             self._antiCollisionLightsOn.set_sensitive(aircraftState.antiCollisionLightsOn)
-            self._strobeLightsOn.set_sensitive(aircraftState.strobeLightsOn)
+            self._strobeLightsOn.set_sensitive(aircraftState.strobeLightsOn is True)
 
             if self._previousState is None or \