Changeset 331:79755718ab7d

Timestamp:

11/13/12 16:26:50 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

#136 implemented fix

File:

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

src/mlx/acft.py

@@ -51 +51 @@
         """Get the average."""
         return self._sum / len(self._deque)
-        
+
 #---------------------------------------------------------------------------------------
 
@@ -65 +65 @@
         self._flight = flight
         self._aircraftState = None
-       
+
         self._maxVS = -10000.0
         self._minVS = 10000.0
@@ -93 +93 @@
         self._adf2Logger = checks.ADF2Logger()
         self._checkers.append(self._adf2Logger)
-        
+
         self._checkers.append(checks.SquawkLogger())
 
@@ -139 +139 @@
         timeout = 5.0 + config.realIASSmoothingLength - 1
         self._checkers.append(checks.OverspeedChecker(timeout = timeout))
-                              
+
         self._checkers.append(checks.StallChecker())
 
         self._checkers.append(checks.PitotChecker())
-        
+
         self._checkers.append(checks.ReverserChecker())
 
@@ -186 +186 @@
         return None if self._aircraftState is None \
                else self._aircraftState.timestamp
-        
+
     def getFlapsSpeedLimit(self, flaps):
         """Get the speed limit for the given flaps setting."""
@@ -229 +229 @@
         finally:
             self._aircraftState = aircraftState
-    
+
     def setStage(self, aircraftState, newStage):
         """Set the given stage as the new one and do whatever should be
@@ -237 +237 @@
                 self.logger.message(aircraftState.timestamp, "Block time start")
                 self._flight.logFuel(aircraftState)
-                self.logger.message(aircraftState.timestamp, 
+                self.logger.message(aircraftState.timestamp,
                                     "ZFW: %.2f kg" % (aircraftState.zfw))
                 flight = self._flight
@@ -247 +247 @@
                 self.logger.message(aircraftState.timestamp,
                                     "Flight time start")
-                self.logger.message(aircraftState.timestamp, 
+                self.logger.message(aircraftState.timestamp,
                                     "Takeoff weight: %.0f kg, MTOW: %.0f kg" % \
                                     (aircraftState.grossWeight, self.mtow))
                 self.logger.message(aircraftState.timestamp,
                                     "Wind %03.0f degrees at %.0f knots" % \
-                                    (aircraftState.windDirection, 
+                                    (aircraftState.windDirection,
                                      aircraftState.windSpeed))
                 self._logRadios(aircraftState)
@@ -286 +286 @@
                 self.logger.message(aircraftState.timestamp,
                                     "Flown distance: %.2f NM" % \
-                                    (self._flight.flownDistance,))                
+                                    (self._flight.flownDistance,))
                 blockLength = self._flight.blockTimeEnd - self._flight.blockTimeStart
                 self.logger.message(aircraftState.timestamp,
@@ -299 +299 @@
         self.flight.simulator.startFlare()
 
-    def flareStarted(self, windSpeed, windDirection, visibility, 
+    def flareStarted(self, windSpeed, windDirection, visibility,
                      flareStart, flareStartFS):
         """Called when the flare has started."""
@@ -314 +314 @@
         self.flight.flareStarted(flareStart, flareStartFS)
         fs.sendMessage(const.MESSAGETYPE_INFORMATION, "Flare-time", 3)
-         
+
     def flareFinished(self, flareEnd, flareEndFS, tdRate, tdRateCalculatedByFS,
                       ias, pitch, bank, heading):
@@ -323 +323 @@
         self.logger.message(self._aircraftState.timestamp,
                             "Flaretime: %.3f (from %s)" % \
-                            (flareTime, 
+                            (flareTime,
                              "the simulator" if flareTimeFromFS else "real time",))
         self.logger.message(self._aircraftState.timestamp,
@@ -341 +341 @@
         self.logger.message(self._aircraftState.timestamp,
                             "Touchdown heading: %03.0f degrees" % (heading,))
-        self.logger.message(self._aircraftState.timestamp, 
+        self.logger.message(self._aircraftState.timestamp,
                            "Centre of gravity:  %.1f%%" % \
                             (self._aircraftState.cog*100.0,))
@@ -434 +434 @@
             fs.sendMessage(const.MESSAGETYPE_GATE_SYSTEM,
                            "Free gates: " + gateList, 20)
-        
+
 
     def _logRadios(self, aircraftState):
@@ -455 +455 @@
     - fuel: left, centre, right
     - n1: left, right
-    - reverser: left, right"""    
+    - reverser: left, right"""
     def __init__(self, flight):
         super(Boeing737, self).__init__(flight)
@@ -605 +605 @@
     """Boeing 767-300 aircraft."""
     def __init__(self, flight):
-        super(B763, self).__init__(cflight)
+        super(B763, self).__init__(flight)
         self.dow = 91311
         self.mtow = 181436
@@ -714 +714 @@
         """Indicate if the speed is in knots."""
         return False
-    
+
     def _appendLightsLoggers(self):
         """Append the loggers needed for the lights."""
@@ -752 +752 @@
         """Indicate if the speed is in knots."""
         return False
-    
+
     def _appendLightsLoggers(self):
         """Append the loggers needed for the lights."""
@@ -791 +791 @@
         """Indicate if the speed is in knots."""
         return False
-    
+
     def _appendLightsLoggers(self):
         """Append the loggers needed for the lights."""