Changeset 592:1d9795bde55c

Timestamp:

12/23/14 09:29:51 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added help about the minimum and recommended (if known) amounts of landing fuel to the fuel page (re #236)

Files:

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

locale/en/mlx.po

@@ -582 +582 @@
 msgstr "Fuel"
 
-msgid "fuel_help"
+msgid "fuel_help_pre"
 msgstr ""
 "Enter the amount of fuel in kilograms that need to be present "
-"in each tank below.\n"
-"\n"
+"in each tank below."
+
+msgid "fuel_help_min"
+msgstr ""
+" \n\n"
+"The minimal amount of landing fuel of your aircraft is <b>%u kgs</b>."
+
+msgid "fuel_help_min_rec"
+msgstr ""
+" \n\n"
+"The minimal amount of landing fuel of your aircraft is <b>%u kgs</b>,\n"
+"and it is recommended to land with %u kgs."
+
+msgid "fuel_help_post"
+msgstr ""
+" \n\n"
 "When you press <b>Next</b>, the necessary amount of fuel\n"
 "will be pumped into or out of the tanks."

locale/hu/mlx.po

@@ -585 +585 @@
 msgstr "Üzemanyag"
 
-msgid "fuel_help"
-msgstr ""
-"Írd be az egyes tartályokba szükséges üzemanyag mennyiségét kilogrammban.\n"
-"\n"
+msgid "fuel_help_pre"
+msgstr ""
+"Írd be az egyes tartályokba szükséges üzemanyag mennyiségét kilogrammban"
+
+msgid "fuel_help_min"
+msgstr ""
+" \n\n"
+"A repülőgép leszállási üzemanyagának minimális mennyisége: <b>%u kg</b>."
+
+msgid "fuel_help_min_rec"
+msgstr ""
+" \n\n"
+"A repülőgép leszállási üzemanyagának minimális mennyisége: <b>%u kg</b>,\n"
+"és ajánlott %u kg üzemanyaggal földet érni."
+
+msgid "fuel_help_post"
+msgstr ""
+" \n\n"
 "Ha megnyomod az <b>Előre</b> gombot, a megadott mennyiségű\n"
 "üzemanyag bekerül a tartályokba."

src/mlx/acft.py

@@ -91 +91 @@
         return _classes[flight.aircraftType](flight)
 
-    def __init__(self, flight, minLandingFuel = None):
+    def __init__(self, flight, minLandingFuel = None,
+                 recommendedLandingFuel = None):
         """Construct the aircraft for the given type."""
         self._flight = flight
         self._minLandingFuel = minLandingFuel
+        self._recommendedLandingFuel = recommendedLandingFuel
 
         self._name = None
@@ -211 +213 @@
         """Get the flight the aircraft belongs to."""
         return self._flight
+
+    @property
+    def minLandingFuel(self):
+        """Get the minimum acceptable amount of the landing fuel."""
+        return self._minLandingFuel
+
+    @property
+    def recommendedLandingFuel(self):
+        """Get the recommended amount of the landing fuel."""
+        return self._recommendedLandingFuel
 
     @property
@@ -639 +651 @@
     - n1: left, right
     - reverser: left, right"""
-    def __init__(self, flight, minLandingFuel = 2500):
-        super(Boeing737, self).__init__(flight, minLandingFuel = minLandingFuel)
+    def __init__(self, flight, minLandingFuel = 2500,
+                 recommendedLandingFuel = 3500):
+        super(Boeing737, self).__init__(flight,
+                                        minLandingFuel = minLandingFuel,
+                                        recommendedLandingFuel =
+                                        recommendedLandingFuel)
 
         self.gearSpeedLimit = 270
@@ -703 +719 @@
     """Base class for the various aircraft in the Boeing 737 Classic family."""
     def __init__(self, flight):
-        super(Boeing737CL, self).__init__(flight, minLandingFuel = 3500)
+        super(Boeing737CL, self).__init__(flight, minLandingFuel = 3500,
+                                          recommendedLandingFuel = None)
 
 #---------------------------------------------------------------------------------------

src/mlx/gui/flight.py

@@ -1603 +1603 @@
         """Construct the page."""
         super(FuelPage, self).__init__(wizard, xstr("fuel_title"),
-                                       xstr("fuel_help"),
+                                       xstr("fuel_help_pre") +
+                                       xstr("fuel_help_post"),
                                        completedHelp = xstr("fuel_chelp"))
 
@@ -1625 +1626 @@
         """Activate the page."""
         self._setupTanks(self._wizard._fuelData)
+
+        aircraft = self._wizard.gui.flight.aircraft
+        minLandingFuel = aircraft.minLandingFuel
+        recommendedLandingFuel = aircraft.recommendedLandingFuel
+
+        middleHelp = "" if minLandingFuel is None else \
+            (xstr("fuel_help_min") % (minLandingFuel,)) \
+            if recommendedLandingFuel is None else \
+            (xstr("fuel_help_min_rec") % (minLandingFuel,
+                                          recommendedLandingFuel))
+        self.setHelp(xstr("fuel_help_pre") + middleHelp + xstr("fuel_help_post"))
 
     def finalize(self):