Changeset 274:b866c39279e8 for src/mlx/flight.py

Timestamp:

07/05/12 17:51:58 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Reworked fuel handling so that the model can tell what tanks there are

File:

• src/mlx/flight.py (modified) (2 diffs)

src/mlx/flight.py

@@ -208 +208 @@
         self._updateFlownDistance(currentState)
         
-        self.endFuel = sum(currentState.fuel)
+        self.endFuel = currentState.totalFuel
         if self.startFuel is None:
             self.startFuel = self.endFuel
@@ -312 +312 @@
         return "_knots" if self.speedInKnots else "_kmph"
 
+    def logFuel(self, aircraftState):
+        """Log the amount of fuel"""
+        fuelStr = ""
+        for (tank, amount) in aircraftState.fuel:
+            if fuelStr: fuelStr += " - "
+            fuelStr += "%s=%.0f kg" % (const.fuelTank2logString(tank), amount)
+            
+        self.logger.message(aircraftState.timestamp, "Fuel: " + fuelStr)
+        self.logger.message(aircraftState.timestamp,
+                            "Total fuel: %.0f kg" % (aircraftState.totalFuel,))                            
+
     def _updateFlownDistance(self, currentState):
         """Update the flown distance."""