Reorganize flight planning.

Previously we were trying to make every potential flight plan look
just like a strike mission's flight plan. This led to a lot of special
case behavior in several places that was causing us to misplan TOTs.

I've reorganized this such that there's now an explicit `FlightPlan`
class, and any specialized behavior is handled by the subclasses.

I've also taken the opportunity to alter the behavior of CAS and
front-line CAP missions. These no longer involve the usual formation
waypoints. Instead the CAP will aim to be on station at the time that
the CAS mission reaches its ingress point, and leave at its egress
time. Both flights fly directly to the point with a start time
configured for a rendezvous.

It might be worth adding hold points back to every flight plan just to
ensure that non-formation flights don't end up with a very low speed
enroute to the target if they perform ground ops quicker than
expected.

qt_ui/windows/mission/QPackageDialog.py

@@ -1,5 +1,6 @@
 """Dialogs for creating and editing ATO packages."""
 import logging
+from datetime import timedelta
 from typing import Optional
 
 from PySide2.QtCore import QItemSelection, QTime, Signal
@@ -118,7 +119,7 @@ class QPackageDialog(QDialog):
         return self.game_model.game
 
     def tot_qtime(self) -> QTime:
-        delay = self.package_model.package.time_over_target
+        delay = int(self.package_model.package.time_over_target.total_seconds())
         hours = delay // 3600
         minutes = delay // 60 % 60
         seconds = delay % 60
@@ -137,11 +138,11 @@ class QPackageDialog(QDialog):
     def save_tot(self) -> None:
         time = self.tot_spinner.time()
         seconds = time.hour() * 3600 + time.minute() * 60 + time.second()
-        self.package_model.update_tot(seconds)
+        self.package_model.update_tot(timedelta(seconds=seconds))
 
     def reset_tot(self) -> None:
         if not list(self.package_model.flights):
-            self.package_model.update_tot(0)
+            self.package_model.update_tot(timedelta())
         else:
             self.package_model.update_tot(
                 TotEstimator(self.package_model.package).earliest_tot())

qt_ui/windows/mission/flight/settings/QFlightDepartureDisplay.py

@@ -19,7 +19,8 @@ class QFlightDepartureDisplay(QGroupBox):
         layout.addLayout(departure_row)
 
         estimator = TotEstimator(package)
-        delay = datetime.timedelta(seconds=estimator.mission_start_time(flight))
+        delay = datetime.timedelta(
+            seconds=int(estimator.mission_start_time(flight).total_seconds()))
 
         departure_row.addWidget(QLabel(
             f"Departing from <b>{flight.from_cp.name}</b>"

qt_ui/windows/mission/flight/waypoints/QFlightWaypointList.py

@@ -1,4 +1,3 @@
-import datetime
 import itertools
 
 from PySide2.QtCore import QItemSelectionModel, QPoint
@@ -6,7 +5,6 @@ from PySide2.QtGui import QStandardItem, QStandardItemModel
 from PySide2.QtWidgets import QHeaderView, QTableView
 
 from game.utils import meter_to_feet
-from gen.aircraft import PackageWaypointTiming
 from gen.ato import Package
 from gen.flights.flight import Flight, FlightWaypoint
 from qt_ui.windows.mission.flight.waypoints.QFlightWaypointItem import \
@@ -43,8 +41,6 @@ class QFlightWaypointList(QTableView):
 
         self.model.setHorizontalHeaderLabels(["Name", "Alt", "TOT/DEPART"])
 
-        timing = PackageWaypointTiming.for_package(self.package)
-
         # The first waypoint is set up by pydcs at mission generation time, so
         # we need to add that waypoint manually.
         takeoff = FlightWaypoint(self.flight.from_cp.position.x,
@@ -55,13 +51,12 @@ class QFlightWaypointList(QTableView):
 
         waypoints = itertools.chain([takeoff], self.flight.points)
         for row, waypoint in enumerate(waypoints):
-            self.add_waypoint_row(row, self.flight, waypoint, timing)
+            self.add_waypoint_row(row, self.flight, waypoint)
         self.selectionModel().setCurrentIndex(self.indexAt(QPoint(1, 1)),
                                               QItemSelectionModel.Select)
 
     def add_waypoint_row(self, row: int, flight: Flight,
-                         waypoint: FlightWaypoint,
-                         timing: PackageWaypointTiming) -> None:
+                         waypoint: FlightWaypoint) -> None:
         self.model.insertRow(self.model.rowCount())
 
         self.model.setItem(row, 0, QWaypointItem(waypoint, row))
@@ -72,18 +67,18 @@ class QFlightWaypointList(QTableView):
         altitude_item.setEditable(False)
         self.model.setItem(row, 1, altitude_item)
 
-        tot = self.tot_text(flight, waypoint, timing)
+        tot = self.tot_text(flight, waypoint)
         tot_item = QStandardItem(tot)
         tot_item.setEditable(False)
         self.model.setItem(row, 2, tot_item)
 
-    def tot_text(self, flight: Flight, waypoint: FlightWaypoint,
-                 timing: PackageWaypointTiming) -> str:
+    @staticmethod
+    def tot_text(flight: Flight, waypoint: FlightWaypoint) -> str:
         prefix = ""
-        time = timing.tot_for_waypoint(flight, waypoint)
+        time = flight.flight_plan.tot_for_waypoint(waypoint)
         if time is None:
             prefix = "Depart "
-            time = timing.depart_time_for_waypoint(waypoint, self.flight)
+            time = flight.flight_plan.depart_time_for_waypoint(waypoint)
         if time is None:
             return ""
-        return f"{prefix}T+{datetime.timedelta(seconds=time)}"
+        return f"{prefix}T+{time}"