Changeset 594:6e7e3e49f5dc

Timestamp:

12/23/14 10:17:55 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Made the checking of the Descent stage a bit more clever (re #233)

Files:

• locale/en/mlx.po (modified) (1 diff)
• locale/hu/mlx.po (modified) (1 diff)
• src/mlx/checks.py (modified) (1 diff)
• src/mlx/flight.py (modified) (3 diffs)

locale/en/mlx.po

@@ -869 +869 @@
 msgid "cruise_help"
 msgstr ""
-"If your cruise altitude changes, you can enter the new value below.\n"
-"To actually log the value, press the <b>Update</b> button,\n"
-"when you reach the specified level."
+"If your cruise altitude changes, enter the new value below,\n"
+"and then press the <b>Update</b> button."
 
 msgid "cruise_route_level_tooltip"

locale/hu/mlx.po

@@ -870 +870 @@
 msgid "cruise_help"
 msgstr ""
-"Ha az utazószint változik, az új értéket itt írhatod be.\n"
-"Az érték tényleges naplózásához nyomd meg a <b>Frissít</b> gombot,\n"
-"amikor eléred a megadott szintet."
+"Ha az utazószint változik, írd be az új értéket, majd\n"
+"nyomd meg a <b>Frissít</b> gombot."
 
 msgid "cruise_route_level_tooltip"

src/mlx/checks.py

@@ -76 +76 @@
                 aircraft.setStage(state, const.STAGE_LANDING)
         elif stage==const.STAGE_CRUISE:
-            if (state.altitude+2000) < flight.cruiseAltitude:
+            if (state.altitude+2000) < flight.cruiseAltitudeForDescent:
                 aircraft.setStage(state, const.STAGE_DESCENT)
         elif stage==const.STAGE_DESCENT or stage==const.STAGE_GOAROUND:

src/mlx/flight.py

@@ -111 +111 @@
         self._checklistScheduler = ChecklistScheduler(self)
 
+        self._maxAltitude = 0
+
     @property
     def config(self):
@@ -180 +182 @@
         """Get the cruise altitude of the flight."""
         return self._gui.cruiseAltitude
+
+    @property
+    def maxAltitude(self):
+        """Get the maximal altitude ever reached during the flight."""
+        return self._maxAltitude
+
+    @property
+    def cruiseAltitudeForDescent(self):
+        """Get the cruise altitude to check for descending.
+
+        This is the minimum of current maximal altitude and the cruise
+        altitude."""
+        return min(self._maxAltitude, self.cruiseAltitude)
 
     @property
@@ -353 +368 @@
                                       self._pilotHotkeyPressed)
         self._pilotHotkeyPressed = False
+
+        self._maxAltitude = max(currentState.altitude, self._maxAltitude)
 
         if self._checklistHotkeyPressed: