Changeset 241:dea155dd3ac0 for src/mlx/acft.py

Timestamp:

06/10/12 12:32:09 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for calculating speeds in km/h for Soviet aircraft

File:

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

src/mlx/acft.py

@@ -145 +145 @@
         """Get the current aircraft state."""
         return self._aircraftState
+
+    @property
+    def speedInKnots(self):
+        """Indicate if the speed is in knots.
+
+        This default implementation returns True."""
+        return True
     
     def getFlapsSpeedLimit(self, flaps):
@@ -200 +207 @@
                                    5)
             elif newStage==const.STAGE_TAKEOFF:
-                self.logger.message(aircraftState.timestamp, "Flight time start")
+                self.logger.message(aircraftState.timestamp,
+                                    "Flight time start")
                 self.logger.message(aircraftState.timestamp, 
                                     "Takeoff weight: %.0f kg, MTOW: %.0f kg" % \
@@ -281 +289 @@
                             "Touchdown rate was calculated by the %s" % \
                             ("simulator" if tdRateCalculatedByFS else "logger",))
+        flight = self._flight
         self.logger.message(self._aircraftState.timestamp,
-                            "Touchdown speed: %.0f knots" % (ias,))
+                            "Touchdown speed: %.0f %s" % \
+                            (flight.speedFromKnots(ias),
+                             flight.getEnglishSpeedUnit()))
         self.logger.message(self._aircraftState.timestamp,
                             "Touchdown pitch: %.1f degrees" % (pitch,))
@@ -329 +340 @@
         self._checkers.append(checks.StrobeLightsChecker())
 
+    def _speedToLog(self, speed):
+        """Convert the given speed (being either None or expressed in the
+        flight's speed unit into a string."""
+        if speed is None:
+            return "-"
+        else:
+            return str(speed) + " " + self._flight.getEnglishSpeedUnit()
+
     def _logV1R2(self):
         """Log the V1, Vr and V2 value either newly, or by updating the
         corresponding line."""
         message = "Speeds calculated by the pilot: V1: %s, VR: %s, V2: %s" % \
-                  ("-" if self._flight.v1 is None
-                   else str(self._flight.v1),
-                   "-" if self._flight.vr is None
-                   else str(self._flight.vr),
-                   "-" if self._flight.v2 is None
-                   else str(self._flight.v2))
+                  (self._speedToLog(self._flight.v1),
+                   self._speedToLog(self._flight.vr),
+                   self._speedToLog(self._flight.v2))
 
         if self._v1r2LineIndex is None:
@@ -356 +372 @@
         line."""
         message = "VRef speed calculated by the pilot: %s" % \
-                  ("-" if self._flight.vref is None else str(self._flight.vref))
+                  (self._speedToLog(self._flight.vref),)
         if self._vrefLineIndex is None:
             self._vrefLineIndex = \
@@ -710 +726 @@
                                  30 : 300 }
 
+    @property
+    def speedInKnots(self):
+        """Indicate if the speed is in knots."""
+        return False
+    
     def logFuel(self, aircraftState):
         """Log the amount of fuel"""
@@ -758 +779 @@
                                  45 : 162 }
 
+    @property
+    def speedInKnots(self):
+        """Indicate if the speed is in knots."""
+        return False
+    
     def logFuel(self, aircraftState):
         """Log the amount of fuel"""
@@ -804 +830 @@
                                  35 : 135 }
 
+    @property
+    def speedInKnots(self):
+        """Indicate if the speed is in knots."""
+        return False
+    
     def logFuel(self, aircraftState):
         """Log the amount of fuel"""