Changeset 241:dea155dd3ac0 for src/mlx/checks.py
- Timestamp:
- 06/10/12 12:32:09 (12 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/mlx/checks.py
r211 r241 135 135 self._onTheGround and not state.onTheGround: 136 136 logger.message(state.timestamp, 137 "Takeoff speed: %.0f knots" % (state.ias,)) 137 "Takeoff speed: %.0f %s" % \ 138 (flight.speedFromKnots(state.ias), 139 flight.getEnglishSpeedUnit())) 138 140 logger.message(state.timestamp, 139 141 "Takeoff heading: %03.0f degrees" % (state.heading,)) … … 160 162 else: 161 163 logger.message(state.timestamp, 162 "Cruise speed: %.0f knots" % (state.ias,)) 164 "Cruise speed: %.0f %s" % 165 (flight.speedFromKnots(state.ias), 166 flight.getEnglishSpeedUnit())) 163 167 self._lastTime = state.timestamp 164 168 … … 225 229 - _changed(self, oldState, state): returns a boolean indicating if the 226 230 value has changed or not 227 - _getMessage(self, state): return a strings containing the message to log228 with the new value231 - _getMessage(self, flight, state): return a strings containing the 232 message to log with the new value 229 233 """ 230 234 self._logInitial = logInitial … … 243 247 244 248 if shouldLog: 245 logger.message(self._getLogTimestamp(state), self._getMessage(state)) 249 logger.message(self._getLogTimestamp(state), 250 self._getMessage(flight, state)) 246 251 247 #------------------------------------------------------------------------------- --------252 #------------------------------------------------------------------------------- 248 253 249 254 class SimpleChangeMixin(object): … … 322 327 self._template = template 323 328 324 def _getMessage(self, state):329 def _getMessage(self, flight, state): 325 330 """Get the message.""" 326 331 return self._template % (self._getValue(state),) … … 355 360 DelayedChangeMixin._getLogTimestamp(self, state) 356 361 357 def _getMessage(self, state):362 def _getMessage(self, flight, state): 358 363 """Get the message to log on a change.""" 359 364 logState = self._lastChangeState if \ … … 398 403 self._template = template 399 404 400 def _getMessage(self, state):405 def _getMessage(self, flight, state): 401 406 """Get the message from the given state.""" 402 407 return self._template % ("ON" if self._getValue(state) else "OFF") … … 443 448 SingleValueMixin.__init__(self, "flapsSet") 444 449 445 def _getMessage(self, state):450 def _getMessage(self, flight, state): 446 451 """Get the message to log on a change.""" 447 452 speed = state.groundSpeed if state.groundSpeed<80.0 else state.ias 448 return "Flaps set to %.0f at %.0f knots" % (state.flapsSet, speed) 453 return "Flaps set to %.0f at %.0f %s" % \ 454 (state.flapsSet, flight.speedFromKnots(speed), 455 flight.getEnglishSpeedUnit()) 449 456 450 457 #--------------------------------------------------------------------------------------- … … 457 464 SingleValueMixin.__init__(self, "gearControlDown") 458 465 459 def _getMessage(self, state):466 def _getMessage(self, flight, state): 460 467 """Get the message to log on a change.""" 461 return "Gears SET to %s at %.0f knots, %.0f feet" % \468 return "Gears SET to %s at %.0f %s, %.0f feet" % \ 462 469 ("DOWN" if state.gearControlDown else "UP", 463 state.ias, state.altitude) 470 flight.speedFromKnots(state.ias), 471 flight.getEnglishSpeedUnit(), state.altitude) 464 472 465 473 #--------------------------------------------------------------------------------------- … … 889 897 def logFault(self, flight, aircraft, logger, oldState, state): 890 898 """Log the fault.""" 899 message = "Reverser used below %.0f %s" % \ 900 (flight.speedFromKnots(60), flight.getEnglishSpeedUnit()) 891 901 flight.handleFault(ReverserChecker, state.timestamp, 892 FaultChecker._appendDuring(flight, 893 "Reverser used below 60 knots"), 894 15) 902 FaultChecker._appendDuring(flight, message), 903 15) 895 904 896 905 #--------------------------------------------------------------------------------------- … … 906 915 def logFault(self, flight, aircraft, logger, oldState, state): 907 916 """Log the fault.""" 917 message = "Taxi speed over %.0f %s" % \ 918 (flight.speedFromKnots(50), flight.getEnglishSpeedUnit()) 908 919 flight.handleFault(SpeedChecker, state.timestamp, 909 FaultChecker._appendDuring(flight, 910 "Taxi speed over 50 knots"), 920 FaultChecker._appendDuring(flight, message), 911 921 FaultChecker._getLinearScore(50, 80, 10, 15, 912 922 state.groundSpeed))
Note:
See TracChangeset
for help on using the changeset viewer.