Changeset 1034:4836f52b49cd for src/mlx/gui

Timestamp:

03/14/22 09:58:58 (3 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Updated the flight type handling (re #357)

Location:

src/mlx/gui

Files:

• flight.py (modified) (8 diffs)
• pirep.py (modified) (4 diffs)
• weighthelp.py (modified) (2 diffs)

src/mlx/gui/flight.py

@@ -2329 +2329 @@
         self._bagWeight.set_sensitive(True)
 
-        if bookedFlight.flightType==BookedFlight.FLIGHT_TYPE_CHARTER:
+        if bookedFlight.flightType==const.FLIGHTTYPE_CHARTER:
             self._cargoWeight.set_int(0)
             self._cargoWeight.set_sensitive(False)
@@ -2365 +2365 @@
         zfw += self._numPassengers.get_int() * \
             (const.WEIGHT_PASSENGER_CHARTER
-             if bookedFlight.flightType==BookedFlight.FLIGHT_TYPE_CHARTER
+             if bookedFlight.flightType==const.FLIGHTTYPE_CHARTER
              else const.WEIGHT_PASSENGER)
         zfw += self._numChildren.get_int() * const.WEIGHT_CHILD
@@ -5107 +5107 @@
         table.attach(labelAlignment, 0, 1, row, row+1)
 
-        self._flightType = createFlightTypeComboBox()
-        self._flightType.set_tooltip_text(xstr("finish_type_tooltip"))
-        self._flightType.set_active(0)
-        self._flightType.connect("changed", self._flightTypeChanged)
-        flightTypeAlignment = Gtk.Alignment(xalign=0.0, xscale=0.0)
-        flightTypeAlignment.add(self._flightType)
-        table.attach(flightTypeAlignment, 1, 2, row, row+1)
-        label.set_mnemonic_widget(self._flightType)
-
-        row += 1
-
         self._onlineFlight = Gtk.CheckButton(xstr("finish_online"))
         self._onlineFlight.set_use_underline(True)
@@ -5178 +5167 @@
 
     @property
-    def flightType(self):
-        """Get the flight type."""
-        index = self._flightType.get_active()
-        return None if index<0 else self._flightType.get_model()[index][1]
-
-    @property
     def online(self):
         """Get whether the flight was an online flight or not."""
@@ -5215 +5198 @@
                                   (flight.startFuel - flight.endFuel,))
 
-        self._flightType.set_active(-1)
         self._onlineFlight.set_active(self._wizard.loggedIn)
 
@@ -5240 +5222 @@
         gui = self._wizard.gui
         faultsExplained = gui.faultsFullyExplained
-        timesCorrect = self.flightType is None or \
-                       not self._tooBigTimeDifference or \
+        timesCorrect = not self._tooBigTimeDifference or \
                        gui.hasComments or gui.hasDelayCode
         sensitive = gui.flight is not None and \
                     gui.flight.stage==const.STAGE_END and \
-                    self._flightType.get_active()>=0 and \
                     (self._gatesModel.get_iter_first() is None or
                      self._gate.get_active()>=0) and \
@@ -5281 +5261 @@
         """Called when the Back button is pressed."""
         self.goBack()
-
-    def _flightTypeChanged(self, comboBox):
-        """Called when the flight type has changed."""
-        self._updateTimes()
 
     def _gateChanged(self, comboBox):
@@ -5374 +5350 @@
         (arrivalWarning, arrivalError) = flight.blockTimeEndWrong
 
-        if self.flightType==const.FLIGHTTYPE_VIP:
+        if bookedFlight.flightType==const.FLIGHTTYPE_VIP:
             departureError = arrivalError = False
 
-        self._tooBigTimeDifference = departureError or arrivalError
+        self._tooBigTimeDifference = departureError and arrivalError
 
         self._depTime.set_markup(self._formatTime(bookedFlight.departureTime,

src/mlx/gui/pirep.py

@@ -387 +387 @@
         self._flownMailWeight.set_text("%.0f" % (pirep.mailWeight,))
         self._flightType.set_text(xstr("flighttype_" +
-                                       flightType2string(pirep.flightType)))
+                                       flightType2string(pirep.bookedFlight.flightType)))
         self._online.set_text(xstr("pirepView_" +
                                    ("yes" if pirep.online else "no")))
@@ -956 +956 @@
         self._flownCargoWeight.set_value(pirep.cargoWeight)
         self._flownMailWeight.set_value(pirep.mailWeight)
-        self._flightType.set_active(flightType2index(pirep.flightType))
+        self._flightType.set_text(xstr("flighttype_" +
+                                       flightType2string(pirep.bookedFlight.flightType)))
         self._online.set_active(pirep.online)
 
@@ -1444 +1445 @@
         self._flownMailWeight.set_tooltip_text(xstr("payload_mail_tooltip"))
 
-        self._flightType = createFlightTypeComboBox()
+        self._flightType = PIREPViewer.getDataLabel(width = 3)
         PIREPEditor.tableAttachWidget(table, 0, 2,
                                       xstr("pirepView_flightType"),
                                       self._flightType)
-        self._flightType.connect("changed", self._updateButtons)
-        self._flightType.set_tooltip_text(xstr("pirepEdit_flight_type_tooltip"))
 
         self._online = Gtk.CheckButton(xstr("pirepEdit_online"))
@@ -1608 +1607 @@
         pirep.mailWeight = self._flownMailWeight.get_value()
 
-        pirep.flightType = flightTypes[self._flightType.get_active()]
         pirep.online = self._online.get_active()
 

src/mlx/gui/weighthelp.py

@@ -4 +4 @@
 from mlx.i18n import xstr
 from mlx.checks import PayloadChecker
-from mlx.rpc import BookedFlight
 
 import mlx.const as const
@@ -441 +440 @@
             return self._pax * \
                 (const.WEIGHT_PASSENGER_CHARTER
-                 if self._flightType==BookedFlight.FLIGHT_TYPE_CHARTER
+                 if self._flightType==const.FLIGHTTYPE_CHARTER
                  else const.WEIGHT_PASSENGER) + \
                 self._children * const.WEIGHT_CHILD + \