Changeset 333:392d12995bca for src

Timestamp:

11/13/12 16:36:44 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

#140: implemented the more concise logging

Location:

src/mlx

Files:

• acft.py (modified) (2 diffs)
• checks.py (modified) (3 diffs)

src/mlx/acft.py

@@ -251 +251 @@
                                     (aircraftState.grossWeight, self.mtow))
                 self.logger.message(aircraftState.timestamp,
-                                    "Wind %03.0f degrees at %.0f knots" % \
+                                    "Wind %03.0f/%.0f" % \
                                     (aircraftState.windDirection,
                                      aircraftState.windSpeed))
@@ -304 +304 @@
         self.logger.message(self._aircraftState.timestamp, "The flare has begun")
         self.logger.message(self._aircraftState.timestamp,
-                            "Wind %03.0f degrees at %.0f knots" % \
+                            "Wind %03.0f/%.0f" % \
                             (windDirection, windSpeed))
         self.logger.message(self._aircraftState.timestamp,

src/mlx/checks.py

@@ -473 +473 @@
     def getMessage(logName, frequency, obs):
         """Get the message for the given NAV radio setting."""
-        message = u"%s frequency: %s MHz" % (logName, frequency)
+        message = u"%s: %s" % (logName, frequency)
         if obs is not None: message += u" (%d\u00b0)" % (obs,)
         return message
@@ -546 +546 @@
         """Construct the ADF logger."""
         GenericStateChangeLogger.__init__(self, attr,
-                                          "%s frequency: %%s kHz" % (logName,),
+                                          "%s: %%s" % (logName,),
                                           minDelay = 3.0, maxDelay = 10.0)
         ForceableLoggerMixin.__init__(self)
@@ -644 +644 @@
         """Get the message to log on a change."""
         speed = state.groundSpeed if state.groundSpeed<80.0 else state.ias
-        return "Flaps set to %.0f at %.0f %s" % \
+        return "Flaps %.0f - %.0f %s" % \
                (state.flapsSet, flight.speedFromKnots(speed),
                 flight.getEnglishSpeedUnit())