Changeset 356:a9dd7d794212 for src

Timestamp:

12/13/12 15:49:06 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The radio frequencies are not logged before TAKEOFF and after LANDING (#148)

File:

• src/mlx/checks.py (modified) (7 diffs)

src/mlx/checks.py

@@ -261 +261 @@
     """Base class for classes the instances of which check if a specific change has
     occured in the aircraft's state, and log such change."""
-    def __init__(self, logInitial = True):
+    def __init__(self, logInitial = True, excludedStages = None):
         """Construct the logger.
 
         If logInitial is True, the initial value will be logged, not just the
         changes later.
+
+        If excludedStages is given, it should be a list containing those stages
+        during which the changes should not be logged.
 
         Child classes should define the following functions:
@@ -274 +277 @@
         """
         self._logInitial = logInitial
+        self._excludedStages = [] if excludedStages is None else excludedStages
 
     def _getLogTimestamp(self, state, forced):
@@ -281 +285 @@
     def check(self, flight, aircraft, logger, oldState, state):
         """Check if the state has changed, and if so, log the new state."""
+        if flight.stage in self._excludedStages:
+            return
+
         shouldLog = False
         if oldState is None:
@@ -415 +422 @@
     state possibly with a delay and the logged message comes from a template"""
     def __init__(self, attrName, template, logInitial = True,
-                 minDelay = 0.0, maxDelay = 0.0):
+                 excludedStages = None, minDelay = 0.0, maxDelay = 0.0):
         """Construct the object."""
         StateChangeLogger.__init__(self, logInitial = logInitial)
@@ -461 +468 @@
 
     It also logs the OBS radial set."""
+    excludedStages = [const.STAGE_BOARDING, const.STAGE_PUSHANDTAXI,
+                      const.STAGE_RTO, const.STAGE_TAXIAFTERLAND,
+                      const.STAGE_PARKING]
+
     @staticmethod
     def getMessage(logName, frequency, obs):
@@ -470 +481 @@
     def __init__(self, attrName, logName):
         """Construct the NAV logger."""
-        StateChangeLogger.__init__(self, logInitial = True)
+        StateChangeLogger.__init__(self, logInitial = False,
+                                   excludedStages = self.excludedStages)
         DelayedChangeMixin.__init__(self)
 
@@ -527 +539 @@
         GenericStateChangeLogger.__init__(self, attr,
                                           "%s: %%s" % (logName,),
+                                          logInitial = False,
+                                          excludedStages =
+                                          NAVLogger.excludedStages,
                                           minDelay = 3.0, maxDelay = 10.0)