Changeset 409:c580507072c1

Timestamp:

12/28/12 12:23:53 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Implemented the logging of the value of QNH along with the altimeter setting (re #175)

Files:

• src/mlx/acft.py (modified) (4 diffs)
• src/mlx/checks.py (modified) (1 diff)
• test/test1.txt (modified) (4 diffs)

src/mlx/acft.py

@@ -289 +289 @@
                                     "Takeoff weight: %.0f kg, MTOW: %.0f kg" % \
                                     (aircraftState.grossWeight, self.mtow))
+                self._logQNH(aircraftState)
                 self.logger.message(aircraftState.timestamp,
                                     "Wind %03.0f/%.0f" % \
@@ -299 +300 @@
             elif newStage==const.STAGE_DESCENT or newStage==const.STAGE_LANDING:
                 self._logRadios(aircraftState)
+                if newStage==const.STAGE_LANDING:
+                    self._logQNH(aircraftState)
             elif newStage==const.STAGE_TAXIAFTERLAND:
                 flight = self._flight
@@ -350 +353 @@
         self.logger.message(self._aircraftState.timestamp,
                             "Visibility: %.0f metres" % (visibility,))
-        self.logger.message(self._aircraftState.timestamp,
-                            "Altimeter setting: %.0f hPa" % \
-                            (self._aircraftState.altimeter,))
+        self._logQNH(self._aircraftState)
         self._logVRef()
         self._logLandingAntiIce(self._aircraftState)
@@ -569 +570 @@
         self._adf2Logger.forceLog(flight, logger, aircraftState)
 
+    def _logQNH(self, aircraftState):
+        """Log the current QNH along with the altimeter setting."""
+        self.logger.message(aircraftState.timestamp,
+                            "QNH: %.2f hPa, altimeter: %.2f hPa" % \
+                            (aircraftState.qnh, aircraftState.altimeter))
+
     def _logNameAndModel(self, timestamp):
         """Log the aircraft's name and model with taking the timestamp from the

src/mlx/checks.py

@@ -465 +465 @@
         logState = self._lastChangeState if \
                    self._lastChangeState is not None else state
-        message = "Altimeter: %.0f hPa at %.0f feet" % \
+        message = "Altimeter: %.2f hPa at %.0f feet" % \
                   (logState.altimeter, logState.altitude)
         if not logState.altimeterReliable:

test/test1.txt

@@ +1 @@
+set qnh=1004
+set altimeter=1013
 set n1_1=0
 set n1_2=0
@@ -24 +26 @@
 set adf1=540
 set xpdrC=0
+set altimeter=1004
 set lights=23
 set gs=60 ias=60
@@ -40 +43 @@
 set nav1=111.5
 set flapsControl=0
+set altimeter=1013.25
 set altitude=10000
 set lights=19
@@ -46 +50 @@
 set vs=-200
 set altitude=15000
+set qnh=1007
 set nav1=116.3
 set altitude=10000
+set altimeter=1007
 set adf2=540
 set ias=160 gs=170