Changeset 241:dea155dd3ac0 for src/mlx/acft.py
- Timestamp:
- 06/10/12 12:32:09 (12 years ago)
- Branch:
- default
- hg-Phase:
- (<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mlx/acft.py
r215 r241 145 145 """Get the current aircraft state.""" 146 146 return self._aircraftState 147 148 @property 149 def speedInKnots(self): 150 """Indicate if the speed is in knots. 151 152 This default implementation returns True.""" 153 return True 147 154 148 155 def getFlapsSpeedLimit(self, flaps): … … 200 207 5) 201 208 elif newStage==const.STAGE_TAKEOFF: 202 self.logger.message(aircraftState.timestamp, "Flight time start") 209 self.logger.message(aircraftState.timestamp, 210 "Flight time start") 203 211 self.logger.message(aircraftState.timestamp, 204 212 "Takeoff weight: %.0f kg, MTOW: %.0f kg" % \ … … 281 289 "Touchdown rate was calculated by the %s" % \ 282 290 ("simulator" if tdRateCalculatedByFS else "logger",)) 291 flight = self._flight 283 292 self.logger.message(self._aircraftState.timestamp, 284 "Touchdown speed: %.0f knots" % (ias,)) 293 "Touchdown speed: %.0f %s" % \ 294 (flight.speedFromKnots(ias), 295 flight.getEnglishSpeedUnit())) 285 296 self.logger.message(self._aircraftState.timestamp, 286 297 "Touchdown pitch: %.1f degrees" % (pitch,)) … … 329 340 self._checkers.append(checks.StrobeLightsChecker()) 330 341 342 def _speedToLog(self, speed): 343 """Convert the given speed (being either None or expressed in the 344 flight's speed unit into a string.""" 345 if speed is None: 346 return "-" 347 else: 348 return str(speed) + " " + self._flight.getEnglishSpeedUnit() 349 331 350 def _logV1R2(self): 332 351 """Log the V1, Vr and V2 value either newly, or by updating the 333 352 corresponding line.""" 334 353 message = "Speeds calculated by the pilot: V1: %s, VR: %s, V2: %s" % \ 335 ("-" if self._flight.v1 is None 336 else str(self._flight.v1), 337 "-" if self._flight.vr is None 338 else str(self._flight.vr), 339 "-" if self._flight.v2 is None 340 else str(self._flight.v2)) 354 (self._speedToLog(self._flight.v1), 355 self._speedToLog(self._flight.vr), 356 self._speedToLog(self._flight.v2)) 341 357 342 358 if self._v1r2LineIndex is None: … … 356 372 line.""" 357 373 message = "VRef speed calculated by the pilot: %s" % \ 358 ( "-" if self._flight.vref is None else str(self._flight.vref))374 (self._speedToLog(self._flight.vref),) 359 375 if self._vrefLineIndex is None: 360 376 self._vrefLineIndex = \ … … 710 726 30 : 300 } 711 727 728 @property 729 def speedInKnots(self): 730 """Indicate if the speed is in knots.""" 731 return False 732 712 733 def logFuel(self, aircraftState): 713 734 """Log the amount of fuel""" … … 758 779 45 : 162 } 759 780 781 @property 782 def speedInKnots(self): 783 """Indicate if the speed is in knots.""" 784 return False 785 760 786 def logFuel(self, aircraftState): 761 787 """Log the amount of fuel""" … … 804 830 35 : 135 } 805 831 832 @property 833 def speedInKnots(self): 834 """Indicate if the speed is in knots.""" 835 return False 836 806 837 def logFuel(self, aircraftState): 807 838 """Log the amount of fuel"""
Note:
See TracChangeset
for help on using the changeset viewer.