Changeset 1142:d9373f5599db

Timestamp:

04/21/24 14:03:59 (7 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

The new adult passenger weight query functions are used (re #386).

Location:

src/mlx/gui

Files:

• flight.py (modified) (1 diff)
• weighthelp.py (modified) (1 diff)

src/mlx/gui/flight.py

@@ -2678 +2678 @@
         zfw += (self._numCabinCrew.get_int() - bookedFlight.dowNumCabinCrew) *  \
             const.WEIGHT_CABIN_CREW
-        zfw += self._numPassengers.get_int() * \
-            (const.WEIGHT_PASSENGER_CHARTER
-             if bookedFlight.flightType==const.FLIGHTTYPE_CHARTER
-             else const.WEIGHT_PASSENGER)
+        zfw += self._numPassengers.get_int() * bookedFlight.passengerWeight
         zfw += self._numChildren.get_int() * const.WEIGHT_CHILD
         zfw += self._numInfants.get_int() * const.WEIGHT_INFANT

src/mlx/gui/weighthelp.py

@@ -438 +438 @@
         if self._flightType>=0 and self._pax>=0 and self._children>=0 and \
            self._infants>=0:
-            return self._pax * \
-                (const.WEIGHT_PASSENGER_CHARTER
-                 if self._flightType==const.FLIGHTTYPE_CHARTER
-                 else const.WEIGHT_PASSENGER) + \
+            return self._pax * const.getPassengerWeight(self._flightType) + \
                 self._children * const.WEIGHT_CHILD + \
                 self._infants * const.WEIGHT_INFANT