Changeset 634:b695e9445e24

Timestamp:

05/10/15 06:44:20 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

A go-around is logged as a fault with no score and an explanation is required (re #266)

Files:

• locale/en/mlx.po (modified) (2 diffs)
• locale/hu/mlx.po (modified) (2 diffs)
• src/mlx/acft.py (modified) (1 diff)
• src/mlx/logger.py (modified) (2 diffs)

locale/en/mlx.po

@@ -968 +968 @@
 msgid "finish_help_faults"
 msgstr ""
-"<span foreground=\"red\">\n\nYou had one or more faults during your flight. Please, provide some\n"
+"<span foreground=\"red\">\n\nWe observed some faults or unusual activities during your flight. Please, provide some\n"
 "explanation on the Flight info tab before sending the PIREP.</span>"
 
@@ -1078 +1078 @@
 
 msgid "info_faults"
-msgstr "F_aults"
+msgstr "F_aults, observations"
 
 msgid "info_delay"

locale/hu/mlx.po

@@ -969 +969 @@
 msgid "finish_help_faults"
 msgstr ""
-"<span foreground=\"red\">\n\nA repülés során vétettél egy vagy több hibát. Kérlek, a Járat info oldalon\n"
-"írj ezekre magyarázatot a Járat info oldalon a PIREP elküldése előtt.</span>"
+"<span foreground=\"red\">\n\nA repülés során hibát vagy szokatlan jelenséget figyeltünk meg. Kérlek, a Járat info oldalon\n"
+"írj ezekre magyarázatot a PIREP elküldése előtt.</span>"
 
 msgid "finish_help_wrongtime"
@@ -1081 +1081 @@
 
 msgid "info_faults"
-msgstr "_Hibák"
+msgstr "_Hibák, megfigyelések"
 
 msgid "info_delay"

src/mlx/acft.py

@@ -374 +374 @@
                 if newStage==const.STAGE_LANDING:
                     self._logQNH(aircraftState)
+            elif newStage==const.STAGE_GOAROUND:
+                from logger import Logger
+                self._flight.handleFault("goaround",
+                                         aircraftState.timestamp,
+                                         "Go-around detected, please, explain!",
+                                         Logger.NO_SCORE)
             elif newStage==const.STAGE_TAXIAFTERLAND:
                 flight = self._flight

src/mlx/logger.py

@@ -186 +186 @@
     NO_GO_SCORE = 10000
 
+    NO_SCORE = 9999
+
     def __init__(self, output):
         """Construct the logger."""
@@ -271 +273 @@
         fault = self._faults[faultID] if faultID in self._faults else None
 
+        text = "%s (NO GO)" % (what) if score==Logger.NO_GO_SCORE \
+               else "%s" % (what,) if score==Logger.NO_SCORE \
+               else "%s (%.1f)" % (what, score)
+
+        if score==Logger.NO_SCORE:
+            score = 0
+
         if fault is not None and score<=fault.score:
             return fault.getLatestEntry().id if updatePrevious else -1
-
-        text = "%s (NO GO)" % (what) if score==Logger.NO_GO_SCORE \
-               else "%s (%.1f)" % (what, score)
 
         if updatePrevious and fault is not None: