Changeset 1184:c2100c410a84

Timestamp:

04/30/25 15:05:04 (37 hours ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

The "real" and "extended" ICAO codes of airplanes are distinguished.

Location:

src/mlx

Files:

• config.py (modified) (6 diffs)
• const.py (modified) (2 diffs)
• gui/flightlist.py (modified) (1 diff)
• gui/pirep.py (modified) (2 diffs)

src/mlx/config.py

@@ -77 +77 @@
         """Create a checklist for the given aircraft type from the given
         config."""
-        baseName = "checklist." + const.icaoCodes[aircraftType] + "."
+        baseName = "checklist." + const.extendedICAOCodes[aircraftType] + "."
         fileList = []
         while True:
@@ -98 +98 @@
     def toConfig(self, config, aircraftType):
         """Add this checklist to the given config."""
-        baseName = "checklist." + const.icaoCodes[aircraftType] + "."
+        baseName = "checklist." + const.extendedICAOCodes[aircraftType] + "."
         for index in range(0, len(self._fileList)):
             option = baseName + str(index)
@@ -135 +135 @@
         """Create a checklist for the given aircraft type from the given
         config."""
-        baseName = "callouts." + const.icaoCodes[aircraftType] + "."
+        baseName = "callouts." + const.extendedICAOCodes[aircraftType] + "."
         mapping = {}
         while True:
@@ -161 +161 @@
     def toConfig(self, config, aircraftType):
         """Add this checklist to the given config."""
-        baseName = "callouts." + const.icaoCodes[aircraftType] + "."
+        baseName = "callouts." + const.extendedICAOCodes[aircraftType] + "."
         index = 0
         for (altitude, path) in self._mapping.items():
@@ -1147 +1147 @@
         print("  checklists:")
         for (type, checklist) in self._checklists.items():
-            print("    %s:" % (const.icaoCodes[type],))
+            print("    %s:" % (const.extendedICAOCodes[type],))
             for path in checklist:
                 print("      " + path)
@@ -1153 +1153 @@
         print("  approachCallouts:")
         for (type, approachCallouts) in self._approachCallouts.items():
-            print("    %s:" % (const.icaoCodes[type],))
+            print("    %s:" % (const.extendedICAOCodes[type],))
             for (altitude, path) in approachCallouts:
                 print("      %d: %s" % (altitude, path))

src/mlx/const.py

@@ -214 +214 @@
               AIRCRAFT_B737  : "B737",
               AIRCRAFT_B738  : "B738",
-              AIRCRAFT_B738C : "B738C",
+              AIRCRAFT_B738C : "B738",
               AIRCRAFT_B732  : "B732",
               AIRCRAFT_B733  : "B733",
@@ -230 +230 @@
               AIRCRAFT_B462  : "B462" }
 
+## A mapping of aircraft types to their 'extended' ICAO codes, which
+# are usually the same as the 'internal' ones above, but in certain
+# cases 'sub-types' are distinguished
+extendedICAOCodes = icaoCodes.copy()
+extendedICAOCodes[AIRCRAFT_B738C] = "B738C"
+
 #-------------------------------------------------------------------------------
 

src/mlx/gui/flightlist.py

@@ -246 +246 @@
         type."""
         return tailNumber + \
-            " (" + const.icaoCodes[bookedFlight.aircraftType] + ")"
+            " (" + const.extendedICAOCodes[bookedFlight.aircraftType] + ")"
 
     def _getAcft(tailNumber, bookedFlight):

src/mlx/gui/pirep.py

@@ -323 +323 @@
         self._callsign.set_text(bookedFlight.callsign)
         self._tailNumber.set_text(bookedFlight.tailNumber)
-        aircraftType = xstr("aircraft_" + icaoCodes[bookedFlight.aircraftType].lower())
+        aircraftType = xstr("aircraft_" + extendedICAOCodes[bookedFlight.aircraftType].lower())
         self._aircraftType.set_text(aircraftType)
 
@@ -888 +888 @@
         self._callsign.set_text(bookedFlight.callsign)
         self._tailNumber.set_text(bookedFlight.tailNumber)
-        aircraftType = xstr("aircraft_" + icaoCodes[bookedFlight.aircraftType].lower())
+        aircraftType = xstr("aircraft_" + extendedICAOCodes[bookedFlight.aircraftType].lower())
         self._aircraftType.set_text(aircraftType)