Changeset 369:dcc9f8bd75dd

Timestamp:

12/16/12 16:33:38 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The aircraft's name and model are logged first when we enter the boarding stage

File:

• src/mlx/acft.py (modified) (4 diffs)

src/mlx/acft.py

@@ -64 +64 @@
         """Construct the aircraft for the given type."""
         self._flight = flight
+
+        self._name = None
+        self._modelName = None
+
         self._aircraftState = None
 
@@ -201 +205 @@
     def modelChanged(self, timestamp, aircraftName, modelName):
         """Called when the simulator's aircraft changes."""
-        self._flight.logger.message(timestamp,
-                                    "Aircraft: name='%s', model='%s'" % \
-                                    (aircraftName, modelName))
+        self._name = aircraftName
+        self._modelName = modelName
+        if self._flight.stage is not None:
+            self._logNameAndModel(timestamp)
 
     def handleState(self, aircraftState):
@@ -240 +245 @@
         """Set the given stage as the new one and do whatever should be
         done."""
+        if newStage==const.STAGE_BOARDING:
+            self._logNameAndModel(aircraftState.timestamp)
+
         if self._flight.setStage(aircraftState.timestamp, newStage):
             if newStage==const.STAGE_PUSHANDTAXI:
@@ -463 +471 @@
         self._adf2Logger.forceLog(flight, logger, aircraftState)
 
+    def _logNameAndModel(self, timestamp):
+        """Log the aircraft's name and model with taking the timestamp from the
+        given state."""
+        self._flight.logger.message(timestamp,
+                                    "Aircraft: name='%s', model='%s'" % \
+                                    (self._name, self._modelName))
+
 #---------------------------------------------------------------------------------------