Changeset 858:1f655516b7ae for src/mlx

Timestamp:

06/08/17 18:36:07 (7 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The timetable can be queried, displayed and filtered (re #304)

Location:

src/mlx

Files:

• const.py (modified) (1 diff)
• gui/common.py (modified) (2 diffs)
• gui/flightlist.py (modified) (1 diff)
• gui/gui.py (modified) (5 diffs)
• gui/timetable.py (added)
• rpc.py (modified) (4 diffs)
• web.py (modified) (4 diffs)

src/mlx/const.py

@@ -119 +119 @@
                  AIRCRAFT_YK40, AIRCRAFT_DC3,
                  AIRCRAFT_B462]
+
+#-------------------------------------------------------------------------------
+
+## Aircraft type family: Boeing 737 NG
+AIRCRAFT_FAMILY_B737NG = 1
+
+## Aircraft type family: Boeing 737 Classic
+AIRCRAFT_FAMILY_B737CL = 2
+
+## Aircraft type family: Bombardier Dash-8 Q400
+AIRCRAFT_FAMILY_DH8D = 3
+
+## Aircraft type family: Boeing 767
+AIRCRAFT_FAMILY_B767 = 4
+
+## Aircraft type family: Canadair CRJ-200
+AIRCRAFT_FAMILY_CRJ2 = 5
+
+## Aircraft type family: Fokker F-70
+AIRCRAFT_FAMILY_F70 = 6
+
+## Aircraft type family: Lisunov Li-2
+AIRCRAFT_FAMILY_DC3 = 7
+
+## Aircraft type family: Tupolev Tu-134
+AIRCRAFT_FAMILY_T134 = 8
+
+## Aircraft type family: Tupolev Tu-154
+AIRCRAFT_FAMILY_T154 = 9
+
+## Aircraft type family: Yakovlev Yak-40
+AIRCRAFT_FAMILY_YK40 = 10
+
+## Aircraft type family: British Aerospace BAe-146
+AIRCRAFT_FAMILY_B462 = 11
+
+#-------------------------------------------------------------------------------
+
+## Map aircraft families to the list of the types they comprise of
+aircraftFamily2Types = {
+    AIRCRAFT_FAMILY_B737NG: [AIRCRAFT_B736, AIRCRAFT_B737, AIRCRAFT_B738,
+                             AIRCRAFT_B738C],
+
+    AIRCRAFT_FAMILY_B737CL: [AIRCRAFT_B732, AIRCRAFT_B733, AIRCRAFT_B734,
+                             AIRCRAFT_B735],
+
+    AIRCRAFT_FAMILY_DH8D: [AIRCRAFT_DH8D],
+
+    AIRCRAFT_FAMILY_B767: [AIRCRAFT_B762, AIRCRAFT_B763],
+
+    AIRCRAFT_FAMILY_CRJ2: [AIRCRAFT_CRJ2],
+
+    AIRCRAFT_FAMILY_F70: [AIRCRAFT_F70],
+
+    AIRCRAFT_FAMILY_DC3: [AIRCRAFT_DC3],
+
+    AIRCRAFT_FAMILY_T134: [AIRCRAFT_T134],
+
+    AIRCRAFT_FAMILY_T154: [AIRCRAFT_T154],
+
+    AIRCRAFT_FAMILY_YK40: [AIRCRAFT_YK40],
+
+    AIRCRAFT_FAMILY_B462: [AIRCRAFT_B462]
+
+    }
+
+#-------------------------------------------------------------------------------
+
+def aircraftType2Family(aircraftType):
+    """Get the family for the given aircraft type."""
+    for (family, types) in aircraftFamily2Types.iteritems():
+        if aircraftType in types:
+            return family
+    assert False
 
 #-------------------------------------------------------------------------------

src/mlx/gui/common.py

@@ -106 +106 @@
 
     SELECTION_MULTIPLE = gtk.SELECTION_MULTIPLE
+
+    WINDOW_POPUP = gtk.WINDOW_POPUP
 
     pixbuf_new_from_file = gdk.pixbuf_new_from_file
@@ -549 +551 @@
 #------------------------------------------------------------------------------
 
+aircraftFamilyNames = {
+    _const.AIRCRAFT_FAMILY_B737NG: xstr("aircraft_family_b737ng"),
+
+    _const.AIRCRAFT_FAMILY_B737CL: xstr("aircraft_family_b737cl"),
+
+    _const.AIRCRAFT_FAMILY_DH8D: xstr("aircraft_family_dh8d"),
+
+    _const.AIRCRAFT_FAMILY_B767: xstr("aircraft_family_b767"),
+
+    _const.AIRCRAFT_FAMILY_CRJ2: xstr("aircraft_family_crj2"),
+
+    _const.AIRCRAFT_FAMILY_F70: xstr("aircraft_family_f70"),
+
+    _const.AIRCRAFT_FAMILY_DC3: xstr("aircraft_family_dc3"),
+
+    _const.AIRCRAFT_FAMILY_T134: xstr("aircraft_family_t134"),
+
+    _const.AIRCRAFT_FAMILY_T154: xstr("aircraft_family_t154"),
+
+    _const.AIRCRAFT_FAMILY_YK40: xstr("aircraft_family_yk40"),
+
+    _const.AIRCRAFT_FAMILY_B462: xstr("aircraft_family_b462")
+}
+
+#------------------------------------------------------------------------------
+
 def formatFlightLogLine(timeStr, line):
     """Format the given flight log line."""

src/mlx/gui/flightlist.py

@@ -42 +42 @@
 
         @param index is the 0-based index of the column."""
-        column = gtk.TreeViewColumn(self._heading, self._renderer,
-                                    text = index)
+        if isinstance(self._renderer, gtk.CellRendererText):
+            column = gtk.TreeViewColumn(self._heading, self._renderer,
+                                        text = index)
+        elif isinstance(self._renderer, gtk.CellRendererToggle):
+            column = gtk.TreeViewColumn(self._heading, self._renderer,
+                                        active = index)
+        else:
+            column = gtk.TreeViewColumn(self._heading, self._renderer)
         column.set_expand(True)
         if self._sortable:

src/mlx/gui/gui.py

@@ -17 +17 @@
 from mlx.gui.bugreport import BugReportDialog
 from mlx.gui.acars import ACARS
+from mlx.gui.timetable import TimetableWindow
 import cef
 
@@ -120 +121 @@
 
         self._preferences = Preferences(self)
+        self._timetableWindow = TimetableWindow(self)
+        self._timetableWindow.connect("delete-event", self._hideTimetableWindow)
         self._flightsWindow = AcceptedFlightsWindow(self)
         self._flightsWindow.connect("delete-event", self._hideFlightsWindow)
@@ -1063 +1066 @@
         toolsMenuItem.set_submenu(toolsMenu)
         menuBar.append(toolsMenuItem)
+
+        self._timetableMenuItem = timetableMenuItem = \
+          gtk.ImageMenuItem(gtk.STOCK_INDENT)
+        timetableMenuItem.set_use_stock(True)
+        timetableMenuItem.set_label(xstr("menu_tools_timetable"))
+        timetableMenuItem.add_accelerator("activate", accelGroup,
+                                          ord(xstr("menu_tools_timetable_key")),
+                                          CONTROL_MASK, ACCEL_VISIBLE)
+        timetableMenuItem.connect("activate", self.showTimetable)
+        self._timetableMenuItem.set_sensitive(False)
+        toolsMenu.append(timetableMenuItem)
 
         self._flightsMenuItem = flightsMenuItem = \
@@ -1240 +1254 @@
         """Called when the login is successful."""
         self._flightsMenuItem.set_sensitive(True)
+        self._timetableMenuItem.set_sensitive(True)
 
     def isWizardActive(self):
         """Determine if the flight wizard is active."""
         return self._notebook.get_current_page()==0
+
+    def showTimetable(self, menuItem):
+        """Callback for showing the timetable."""
+        if self._timetableWindow.hasFlightPairs:
+            self._timetableWindow.show_all()
+        else:
+            date = datetime.date.today()
+            self._timetableWindow.setTypes(self.loginResult.types)
+            self._timetableWindow.setDate(date)
+            self.updateTimeTable(date)
+            self.beginBusy(xstr("timetable_query_busy"))
+
+    def updateTimeTable(self, date):
+        """Update the time table for the given date."""
+        self.beginBusy(xstr("timetable_query_busy"))
+        self._timetableWindow.set_sensitive(False)
+        window = self._timetableWindow.get_window()
+        if window is not None:
+            window.set_cursor(self._busyCursor)
+        self.webHandler.getTimetable(self._timetableCallback, date,
+                                     self.loginResult.types)
+
+    def _timetableCallback(self, returned, result):
+        """Called when the timetable has been received."""
+        gobject.idle_add(self._handleTimetable, returned, result)
+
+    def _handleTimetable(self, returned, result):
+        """Handle the result of the query for the timetable."""
+        self.endBusy()
+        window = self._timetableWindow.get_window()
+        if window is not None:
+            window.set_cursor(None)
+        self._timetableWindow.set_sensitive(True)
+        if returned:
+            self._timetableWindow.setFlightPairs(result.flightPairs)
+            self._timetableWindow.show_all()
+        else:
+            dialog = gtk.MessageDialog(parent = self.mainWindow,
+                                       type = MESSAGETYPE_ERROR,
+                                       message_format = xstr("timetable_failed"))
+            dialog.add_button(xstr("button_ok"), RESPONSETYPE_OK)
+            dialog.set_title(WINDOW_TITLE_BASE)
+            dialog.run()
+            dialog.hide()
+            self._timetableWindow.clear()
 
     def showFlights(self, menuItem):
@@ -1273 +1333 @@
             dialog.run()
             dialog.hide()
+
+    def _hideTimetableWindow(self, window, event):
+        """Hide the window of the timetable."""
+        self._timetableWindow.hide()
+        return True
 
     def _hideFlightsWindow(self, window, event):

src/mlx/rpc.py

@@ -47 +47 @@
 class Reply(RPCObject):
     """The generic reply structure."""
+
+#---------------------------------------------------------------------------------------
+
+class ScheduledFlight(RPCObject):
+    """A scheduled flight in the time table."""
+    # The instructions for the construction
+    # Type: normal flight
+    TYPE_NORMAL = 0
+
+    # Type: VIP flight
+    TYPE_VIP = 1
+
+    _instructions = {
+        "id" : int,
+        "pairID": int,
+        "typeCode": lambda value: BookedFlight._decodeAircraftType(value),
+        "departureTime": lambda value: ScheduledFlight._decodeTime(value),
+        "arrivalTime": lambda value: ScheduledFlight._decodeTime(value),
+        "duration": lambda value: ScheduledFlight._decodeDuration(value),
+        "type": int,
+        "spec": int
+        }
+
+    @staticmethod
+    def _decodeTime(value):
+        """Decode the given value as a time value."""
+        return datetime.datetime.strptime(value, "%H:%M:%S").time()
+
+    @staticmethod
+    def _decodeDuration(value):
+        """Decode the given value as a duration.
+
+        A number of seconds will be returned."""
+        t = datetime.datetime.strptime(value, "%H:%M:%S")
+        return (t.hour*60 + t.minute) * 60 + t.second
+
+    def __init__(self, value):
+        """Construct the scheduled flight object from the given JSON value."""
+        super(ScheduledFlight, self).__init__(value,
+                                              ScheduledFlight._instructions)
+        self.aircraftType = self.typeCode
+        del self.typeCode
+
+    def __repr__(self):
+        return "ScheduledFlight<%d, %d, %s, %s (%s) - %s (%s) -> %d, %d>" % \
+          (self.id, self.pairID, BookedFlight.TYPE2TYPECODE[self.aircraftType],
+           self.departureICAO, str(self.departureTime),
+           self.arrivalICAO, str(self.arrivalTime),
+           self.duration, self.spec)
+
+#---------------------------------------------------------------------------------------
+
+class ScheduledFlightPair(object):
+    """A pair of scheduled flights.
+
+    Occasionally, one of the flights may be missing."""
+    @staticmethod
+    def scheduledFlights2Pairs(scheduledFlights):
+        """Convert the given list of scheduled flights into a list of flight
+        pairs."""
+        flights = {}
+        for flight in scheduledFlights:
+            flights[flight.id] = flight
+
+        flightPairs = []
+
+        while flights:
+            (id, flight) = flights.popitem()
+            pairID = flight.pairID
+            if pairID in flights:
+                pairFlight = flights[pairID]
+                if flight.departureICAO=="LHBP" or \
+                  (pairFlight.departureICAO!="LHBP" and id<pairID):
+                    flightPairs.append(ScheduledFlightPair(flight, pairFlight))
+                else:
+                    flightPairs.append(ScheduledFlightPair(pairFlight, flight))
+                del flights[pairID]
+            else:
+                flightPairs.append(ScheduledFlightPair(flight))
+
+        return flightPairs
+
+    def __init__(self, flight0, flight1 = None):
+        """Construct the pair with the given flights."""
+        self.flight0 = flight0
+        self.flight1 = flight1
 
 #---------------------------------------------------------------------------------------
@@ -73 +159 @@
 
     # FIXME: copied from web.BookedFlight
+    TYPE2TYPECODE = { const.AIRCRAFT_B736  : "736",
+                      const.AIRCRAFT_B737  : "73G",
+                      const.AIRCRAFT_B738  : "738",
+                      const.AIRCRAFT_B738C : "73H",
+                      const.AIRCRAFT_B732  : "732",
+                      const.AIRCRAFT_B733  : "733",
+                      const.AIRCRAFT_B734  : "734",
+                      const.AIRCRAFT_B735  : "735",
+                      const.AIRCRAFT_DH8D  : "DH4",
+                      const.AIRCRAFT_B762  : "762",
+                      const.AIRCRAFT_B763  : "763",
+                      const.AIRCRAFT_CRJ2  : "CR2",
+                      const.AIRCRAFT_F70   : "F70",
+                      const.AIRCRAFT_DC3   : "LI2",
+                      const.AIRCRAFT_T134  : "TU3",
+                      const.AIRCRAFT_T154  : "TU5",
+                      const.AIRCRAFT_YK40  : "YK4",
+                      const.AIRCRAFT_B462  : "146" }
+
+    # FIXME: copied from web.BookedFlight
     @staticmethod
     def _decodeAircraftType(typeCode):
@@ -311 +417 @@
             self._loginCount += 1
             self._sessionID = reply.value["sessionID"]
-            return (reply.value["name"], reply.value["rank"])
+
+            types = [BookedFlight.TYPECODE2TYPE[typeCode]
+                     for typeCode in reply.value["typeCodes"]]
+
+            return (reply.value["name"], reply.value["rank"], types)
         else:
             return None
@@ -404 +514 @@
         self._performCall(lambda sessionID:
                           self._server.deleteFlights(sessionID, flightIDs))
+
+    def getTimetable(self, date, types = None):
+        """Get the time table for the given date restricted to the given list
+        of type codes, if any."""
+        typeCodes = None if types is None else \
+            [BookedFlight.TYPE2TYPECODE[type] for type in types]
+
+        values = self._performCall(lambda sessionID:
+                                   self._server.getTimetable(sessionID,
+                                                             date.strftime("%Y-%m-%d"),
+                                                             date.weekday() + 1,
+                                                             typeCodes))
+        return ScheduledFlightPair.scheduledFlights2Pairs([ScheduledFlight(value)
+                                                          for value in values])
 
     def _performCall(self, callFn, acceptResults = []):

src/mlx/web.py

@@ -813 +813 @@
             result.pilotName = loginResult[0]
             result.rank = loginResult[1]
+            result.types = loginResult[2]
             result.password = password
             flights = client.getFlights()
@@ -825 +826 @@
                 if reply[3]:
                     result.rank = "FO"
+
 
     def __init__(self, client, callback, pilotID, password):
@@ -1342 +1344 @@
 #------------------------------------------------------------------------------
 
+class GetTimetable(RPCRequest):
+    """Request to get the timetable."""
+    def __init__(self, client, callback, date, types):
+        """Construct the request with the given client and callback function."""
+        super(GetTimetable, self).__init__(client, callback)
+        self._date = date
+        self._types = types
+
+    def run(self):
+        """Perform the login request."""
+        result = Result()
+
+        result.flightPairs = self._client.getTimetable(self._date, self._types)
+
+        return result
+
+#------------------------------------------------------------------------------
+
 class Handler(threading.Thread):
     """The handler for the web services.
@@ -1439 +1459 @@
         self._addRequest(GetAcceptedFlights(self._rpcClient, callback))
 
+    def getTimetable(self, callback, date, types):
+        """Enqueue a request to get the timetable."""
+        self._addRequest(GetTimetable(self._rpcClient, callback, date, types))
+
     def run(self):
         """Process the requests."""