Changeset 898:55da787ce6e1 for src

Timestamp:

03/16/18 08:58:18 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Aircraft type information (currently DOW, and crew-specific DOW values) are queried via RPC when logging in.

Location:

src/mlx

Files:

• acft.py (modified) (3 diffs)
• const.py (modified) (1 diff)
• rpc.py (modified) (2 diffs)
• web.py (modified) (1 diff)

src/mlx/acft.py

@@ -97 +97 @@
 class Aircraft(object):
     """Base class for aircraft."""
+    dowCockpit = 2
+    dowCabin = 3
+
     @staticmethod
     def create(flight, bookedFlight):
@@ -829 +832 @@
 class B734(Boeing737CL):
     """Boeing 737-400 aircraft."""
+    dow = 35100
+
     def __init__(self, flight):
         super(B734, self).__init__(flight)
-        self.dow = 35100
         self.mtow = 62822
         self.mlw = 54885
@@ -1301 +1305 @@
 #---------------------------------------------------------------------------------------
 
+def setupTypes(aircraftTypes):
+    """Setup the values in the given types using the info retrieved
+    from the server."""
+    for aircraftTypeInfo in aircraftTypes:
+        clazz = getClass(aircraftTypeInfo.aircraftType)
+
+        clazz.dow = aircraftTypeInfo.dow
+        clazz.dowCockpit = aircraftTypeInfo.dowCockpit
+        clazz.dowCabin = aircraftTypeInfo.dowCabin
+
+#---------------------------------------------------------------------------------------
+
 if __name__ == "__main__":
     value = SmoothedValue()

src/mlx/const.py

@@ -224 +224 @@
               AIRCRAFT_T154  : "T154",
               AIRCRAFT_YK40  : "YK40",
-              AIRCRAFT_B462  : "B462" }
+              AIRCRAFT_B462  : "B462",
+              AIRCRAFT_IL62  : "IL62" }
+
+#-------------------------------------------------------------------------------
+
+## A mapping from ICAO codes to the corresponding aircraft types
+icao2Type = { "B736" : AIRCRAFT_B736,
+              "B737" : AIRCRAFT_B737,
+              "B738" : AIRCRAFT_B738,
+              "B732" : AIRCRAFT_B732,
+              "B733" : AIRCRAFT_B733,
+              "B734" : AIRCRAFT_B734,
+              "B735" : AIRCRAFT_B735,
+              "DH8D" : AIRCRAFT_DH8D,
+              "B762" : AIRCRAFT_B762,
+              "B763" : AIRCRAFT_B763,
+              "CRJ2" : AIRCRAFT_CRJ2,
+              "F70"  : AIRCRAFT_F70,
+              "DC3"  : AIRCRAFT_DC3,
+              "T134" : AIRCRAFT_T134,
+              "T154" : AIRCRAFT_T154,
+              "YK40" : AIRCRAFT_YK40,
+              "B462" : AIRCRAFT_B462,
+              "IL62" : AIRCRAFT_IL62 }
 
 #-------------------------------------------------------------------------------

src/mlx/rpc.py

@@ -381 +381 @@
 #---------------------------------------------------------------------------------------
 
+class AircraftTypeInfo(RPCObject):
+    """Information about an aircraft type."""
+    # The instructions for the construction
+    _instructions = {
+        "dow" : int,
+        "dowCockpit" : int,
+        "dowCabin" : int,
+        }
+
+    def __init__(self, value):
+        """Construct the booked flight object from the given RPC result
+        value."""
+        super(AircraftTypeInfo, self).__init__(value,
+                                               AircraftTypeInfo._instructions)
+        self.aircraftType = const.icao2Type[value["typeCode"]]
+
+#---------------------------------------------------------------------------------------
+
 class Registration(object):
     """Data for registration."""
@@ -507 +525 @@
             return None
 
+    def getTypes(self):
+        """Get the data of the aircraft types supported by us."""
+        value = self._performCall(lambda sessionID:
+                                  self._server.getTypes(sessionID))
+
+        return [AircraftTypeInfo(t) for t in value]
+
     def getFlights(self):
         """Get the flights available for performing."""

src/mlx/web.py

@@ -817 +817 @@
             result.types = loginResult[2]
             result.password = password
+
+            result.aircraftTypes = client.getTypes()
+
             flights = client.getFlights()
             result.flights = flights[0]
             result.reportedFlights = flights[1]
             result.rejectedFlights = flights[2]
+
             if result.rank=="STU":
                 reply = client.getEntryExamStatus()