Changeset 1144:a73548e0c689 for src/mlx

Timestamp:

04/21/24 14:20:42 (7 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

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

Location:

src/mlx/gui

Files:

• flight.py (modified) (5 diffs)
• weighthelp.py (modified) (7 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>" +

src/mlx/gui/weighthelp.py

@@ -58 +58 @@
 
         
-        self._weightsTable = table = Gtk.Table(16, 5)
+        self._weightsTable = table = Gtk.Table(17, 5)
         table.set_homogeneous(False)
         table.set_row_spacings(4)
@@ -95 +95 @@
 
         
+        label = Gtk.Label(xstr("weighthelp_flight_type"))
+        label.set_alignment(0.0, 0.5)
+        table.attach(label, 0, 1, row, row+1)
+
+        self._flightTypeLabel = 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 = Gtk.Label(xstr("weighthelp_crew") % ("99",))
@@ -109 +118 @@
         
         table.attach(Gtk.Label("kg"), 2, 3, row, row+1)
+
+        self._crewInfo = Gtk.Label(xstr("weighthelp_crew_info") % ("-",))
+        alignment = Gtk.Alignment(xalign = 0.0, yalign = 0.5,
+                                  xscale = 0.0, yscale = 0.0)
+        alignment.add(self._crewInfo)
+        table.attach(alignment, 3, 5, row, row+1)
         
         row += 1
@@ -129 +144 @@
         table.attach(Gtk.Label("kg"), 2, 3, row, row+1)
         
+        self._paxInfo = Gtk.Label(xstr("weighthelp_pax_info") %
+                                  ("-", "-", "-"))
+        alignment = Gtk.Alignment(xalign = 0.0, yalign = 0.5,
+                                  xscale = 0.0, yscale = 0.0)
+        alignment.add(self._paxInfo)
+        table.attach(alignment, 3, 5, row, row+1)
+
         row += 1
 
@@ -382 +404 @@
         crewWeight = self._getCrewWeight()
         if crewWeight is None:
+            self._flightTypeLabel.set_text("-")
             self._crewLabel.set_text(xstr("weighthelp_crew") % ("-",))
             self._crewWeight.set_text("-")
-        else:
+            self._crewInfo.set_text(xstr("weighthelp_crew_info") % ("-",))
+        else:
+            self._flightTypeLabel.set_text(xstr("flighttype_" +
+                                                const.flightType2string(self._flightType)))
             self._crewLabel.set_text(xstr("weighthelp_crew") %
                                     (str(self._cockpitCrew) + "+" +
                                      str(self._cabinCrew),))
             self._crewWeight.set_text("%.0f" % (crewWeight,))
+            self._crewInfo.set_text(xstr("weighthelp_crew_info") %
+                                    (self._dowCabinCrew,))
+
 
         paxWeight = self._getPaxWeight()
@@ -394 +423 @@
             self._paxLabel.set_text(xstr("weighthelp_pax") % ("-",))
             self._paxWeight.set_text("-")
+            self._paxInfo.set_text(xstr("weighthelp_pax_info") % ("-", "-", "-"))
         else:
             self._paxLabel.set_text(xstr("weighthelp_pax") %
@@ -400 +430 @@
                                      str(self._infants),))
             self._paxWeight.set_text("%.0f" % (paxWeight,))
+            self._paxInfo.set_text(xstr("weighthelp_pax_info") %
+                                   (const.getPassengerWeight(self._flightType),
+                                    const.WEIGHT_CHILD, const.WEIGHT_INFANT))
 
         self._setWeightLabel(self._bagWeight, self._bag)