Changeset 798:d2fd22159c9f for src

Timestamp:

07/26/16 17:27:46 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The booked flight is passed to the aircraft created.

Location:

src/mlx

Files:

• acft.py (modified) (2 diffs)
• gui/flight.py (modified) (1 diff)
• gui/gui.py (modified) (2 diffs)

src/mlx/acft.py

@@ -98 +98 @@
     """Base class for aircraft."""
     @staticmethod
-    def create(flight):
+    def create(flight, bookedFlight):
         """Create an aircraft instance for the type in the given flight."""
-        return _classes[flight.aircraftType](flight)
+        acft = _classes[flight.aircraftType](flight)
+        acft.setBookedFlight(bookedFlight)
+        return acft
 
     def __init__(self, flight, minLandingFuel = None,
@@ -279 +281 @@
         This default implementation returns DERATE_NONE."""
         return DERATE_NONE
+
+    def setBookedFlight(self, bookedFlight):
+        """Update the aircraft based on the booked flight data (e.g. tail number).
+
+        This default implementation does nothing."""
 
     def getDerateLine(self, value):

src/mlx/gui/flight.py

@@ -5646 +5646 @@
     def _connectSimulator(self, simulatorType):
         """Connect to the simulator."""
-        self.gui.connectSimulator(self._bookedFlight.aircraftType,
-                                  simulatorType)
+        self.gui.connectSimulator(self._bookedFlight, simulatorType)
 
     def _arrivalMETARCallback(self, returned, result):

src/mlx/gui/gui.py

@@ -982 +982 @@
             self._stdioStartingLine = False
 
-    def connectSimulator(self, aircraftType, simulatorType):
+    def connectSimulator(self, bookedFlight, simulatorType):
         """Connect to the simulator for the first time."""
         self._logger.reset()
@@ -988 +988 @@
         self._flight = flight.Flight(self._logger, self)
         self._flight.flareTimeFromFS = self.config.flareTimeFromFS
-        self._flight.aircraftType = aircraftType
-        self._flight.aircraft = acft.Aircraft.create(self._flight)
+        self._flight.aircraftType = bookedFlight.aircraftType
+        self._flight.aircraft = acft.Aircraft.create(self._flight, bookedFlight)
         self._flight.aircraft._checkers.append(self)