Changeset 1144:a73548e0c689 for src/mlx/gui/flight.py

Timestamp:

04/21/24 14:20:42 (13 days ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

hg-Phase:

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

Message:

More info is provided for the weight calculations (re #386)

File:

• src/mlx/gui/flight.py (modified) (5 diffs)

src/mlx/gui/flight.py

@@ -2427 +2427 @@
                                   xscale = 0.0, yscale = 0.0)
 
-        table = Gtk.Table(7, 3)
+        table = Gtk.Table(8, 3)
         table.set_row_spacings(4)
         table.set_col_spacings(16)
@@ -2436 +2436 @@
         row  = 0
 
+        label = Gtk.Label(xstr("payload_flight_type"))
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, row, row+1)
+
+        self._flightType = label = Gtk.Label(xstr("flighttype_scheduled"))
+        label.set_alignment(1.0, 0.5)
+        table.attach(label, 1, 2, row, row + 1)
+
+        row += 1
+
         self._crewLabel = label = Gtk.Label(xstr("payload_crew"))
         label.set_use_underline(True)
@@ -2457 +2467 @@
         label.set_mnemonic_widget(self._numCabinCrew)
 
-        label = Gtk.Label(xstr("payload_crew_info"))
+        label = Gtk.Label(xstr("payload_crew_info") % (const.WEIGHT_CABIN_CREW))
         label.set_halign(Gtk.Align.START)
         table.attach(label, 2, 3, row, row+1)
@@ -2493 +2503 @@
         label.set_mnemonic_widget(self._numPassengers)
 
-        label = Gtk.Label(xstr("payload_pax_info"))
+        self._paxInfo = label = Gtk.Label(xstr("payload_pax_info") % (
+            const.WEIGHT_PASSENGER, const.WEIGHT_CHILD, const.WEIGHT_INFANT))
         label.set_halign(Gtk.Align.START)
         table.attach(label, 2, 3, row, row+1)
@@ -2638 +2649 @@
         """Setup the information."""
         bookedFlight = self._wizard._bookedFlight
+
+        self._flightType.set_text(xstr("flighttype_" +
+                                       const.flightType2string(bookedFlight.flightType)))
+
+        self._paxInfo.set_text(xstr("payload_pax_info") % (
+            bookedFlight.passengerWeight, const.WEIGHT_CHILD, const.WEIGHT_INFANT))
 
         self._numCockpitCrew.set_markup("<b>" +