Changeset 191:b23bf6aa7672 for src/mlx/gui

Timestamp:

05/18/12 15:19:28 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added support for the charter configuration version of the Boeing 737-800

Location:

src/mlx/gui

Files:

• common.py (modified) (1 diff)
• flight.py (modified) (3 diffs)

src/mlx/gui/common.py

@@ -201 +201 @@
 
 # A mapping of aircraft types to their screen names
-aircraftNames = { _const.AIRCRAFT_B736 : xstr("aircraft_b736"),
-                  _const.AIRCRAFT_B737 : xstr("aircraft_b737"),
-                  _const.AIRCRAFT_B738 : xstr("aircraft_b738"),
-                  _const.AIRCRAFT_B733 : xstr("aircraft_b733"),
-                  _const.AIRCRAFT_B734 : xstr("aircraft_b734"),
-                  _const.AIRCRAFT_B735 : xstr("aircraft_b735"),
-                  _const.AIRCRAFT_DH8D : xstr("aircraft_dh8d"),
-                  _const.AIRCRAFT_B762 : xstr("aircraft_b762"),
-                  _const.AIRCRAFT_B763 : xstr("aircraft_b763"),
-                  _const.AIRCRAFT_CRJ2 : xstr("aircraft_crj2"),
-                  _const.AIRCRAFT_F70  : xstr("aircraft_f70"),
-                  _const.AIRCRAFT_DC3  : xstr("aircraft_dc3"),
-                  _const.AIRCRAFT_T134 : xstr("aircraft_t134"),
-                  _const.AIRCRAFT_T154 : xstr("aircraft_t154"),
-                  _const.AIRCRAFT_YK40 : xstr("aircraft_yk40") }
-
-#------------------------------------------------------------------------------
+aircraftNames = { _const.AIRCRAFT_B736  : xstr("aircraft_b736"),
+                  _const.AIRCRAFT_B737  : xstr("aircraft_b737"),
+                  _const.AIRCRAFT_B738  : xstr("aircraft_b738"),
+                  _const.AIRCRAFT_B738C : xstr("aircraft_b738c"),
+                  _const.AIRCRAFT_B733  : xstr("aircraft_b733"),
+                  _const.AIRCRAFT_B734  : xstr("aircraft_b734"),
+                  _const.AIRCRAFT_B735  : xstr("aircraft_b735"),
+                  _const.AIRCRAFT_DH8D  : xstr("aircraft_dh8d"),
+                  _const.AIRCRAFT_B762  : xstr("aircraft_b762"),
+                  _const.AIRCRAFT_B763  : xstr("aircraft_b763"),
+                  _const.AIRCRAFT_CRJ2  : xstr("aircraft_crj2"),
+                  _const.AIRCRAFT_F70   : xstr("aircraft_f70"),
+                  _const.AIRCRAFT_DC3   : xstr("aircraft_dc3"),
+                  _const.AIRCRAFT_T134  : xstr("aircraft_t134"),
+                  _const.AIRCRAFT_T154  : xstr("aircraft_t154"),
+                  _const.AIRCRAFT_YK40  : xstr("aircraft_yk40") }
+
+#------------------------------------------------------------------------------

src/mlx/gui/flight.py

@@ -15 +15 @@
 import datetime
 import time
-
-#------------------------------------------------------------------------------
-
-acftTypeNames = { const.AIRCRAFT_B736: "Boeing 737-600",
-                  const.AIRCRAFT_B737: "Boeing 737-700",
-                  const.AIRCRAFT_B738: "Boeing 737-800",
-                  const.AIRCRAFT_DH8D: "Bombardier Dash 8-Q400",
-                  const.AIRCRAFT_B733: "Boeing 737-300",
-                  const.AIRCRAFT_B734: "Boeing 737-400",
-                  const.AIRCRAFT_B735: "Boeing 737-500",
-                  const.AIRCRAFT_B762: "Boeing 767-200",
-                  const.AIRCRAFT_B763: "Boeing 767-300",
-                  const.AIRCRAFT_CRJ2: "Bombardier CRJ200",
-                  const.AIRCRAFT_F70:  "Fokker 70",
-                  const.AIRCRAFT_DC3:  "Lisunov Li-2",
-                  const.AIRCRAFT_T134: "Tupolev Tu-134",
-                  const.AIRCRAFT_T154: "Tupolev Tu-154",
-                  const.AIRCRAFT_YK40: "Yakovlev Yak-40" }
 
 #-----------------------------------------------------------------------------
@@ -688 +670 @@
         labelAlignment = gtk.Alignment(xalign=0.0, xscale=0.0)
         self._flightNumber = gtk.Label()
-        self._flightNumber.set_width_chars(7)
+        self._flightNumber.set_width_chars(9)
         self._flightNumber.set_alignment(0.0, 0.5)
         labelAlignment.add(self._flightNumber)
@@ -759 +741 @@
         self._flightNumber.set_markup("<b>" + bookedFlight.callsign + "</b>")
 
-        aircraftType = acftTypeNames[bookedFlight.aircraftType]
+        aircraftType = aircraftNames[bookedFlight.aircraftType]
         self._aircraft.set_markup("<b>" + aircraftType + "</b>")