Merge branch 'theater-refactor' into develop

qt_ui/widgets/combos/QFlightTypeComboBox.py

@@ -95,7 +95,7 @@ class QFlightTypeComboBox(QComboBox):
                     yield from self.ENEMY_AIRBASE_MISSIONS
         elif isinstance(self.target, TheaterGroundObject):
             # TODO: Filter more based on the category.
-            friendly = self.target.parent_control_point(self.theater).captured
+            friendly = self.target.control_point.captured
             if friendly:
                 yield from self.FRIENDLY_GROUND_OBJECT_MISSIONS
             else:

qt_ui/widgets/combos/QPredefinedWaypointSelectionComboBox.py

@@ -1,7 +1,7 @@
 from PySide2.QtGui import QStandardItem, QStandardItemModel
 
 from game import Game
-from gen import Conflict, FlightWaypointType
+from gen import BuildingGroundObject, Conflict, FlightWaypointType
 from gen.flights.flight import FlightWaypoint
 from qt_ui.widgets.combos.QFilteredComboBox import QFilteredComboBox
 from theater import ControlPointType
@@ -71,7 +71,7 @@ class QPredefinedWaypointSelectionComboBox(QFilteredComboBox):
             for cp in self.game.theater.controlpoints:
                 if (self.include_enemy and not cp.captured) or (self.include_friendly and cp.captured):
                     for ground_object in cp.ground_objects:
-                        if not ground_object.is_dead and not ground_object.dcs_identifier == "AA":
+                        if not ground_object.is_dead and not isinstance(ground_object, BuildingGroundObject):
                             wpt = FlightWaypoint(
                                 FlightWaypointType.CUSTOM,
                                 ground_object.position.x,

qt_ui/widgets/map/QLiberationMap.py

@@ -121,8 +121,8 @@ class QLiberationMap(QGraphicsView):
 
     def setGame(self, game: Optional[Game]):
         self.game = game
-        logging.debug("Reloading Map Canvas")
         if self.game is not None:
+            logging.debug("Reloading Map Canvas")
             self.reload_scene()
 
     """

qt_ui/windows/QLiberationWindow.py

@@ -1,4 +1,5 @@
 import logging
+import traceback
 import webbrowser
 from typing import Optional
 
@@ -16,7 +17,7 @@ from PySide2.QtWidgets import (
 )
 
 import qt_ui.uiconstants as CONST
-from game import Game, persistency, VERSION
+from game import Game, VERSION, persistency
 from qt_ui.dialogs import Dialog
 from qt_ui.displayoptions import DisplayGroup, DisplayOptions, DisplayRule
 from qt_ui.models import GameModel
@@ -40,10 +41,9 @@ class QLiberationWindow(QMainWindow):
         self.game: Optional[Game] = None
         self.game_model = GameModel()
         Dialog.set_game(self.game_model)
-        self.ato_panel = None
-        self.info_panel = None
-        self.liberation_map = None
-        self.setGame(persistency.restore_game())
+        self.ato_panel = QAirTaskingOrderPanel(self.game_model)
+        self.info_panel = QInfoPanel(self.game)
+        self.liberation_map = QLiberationMap(self.game_model)
 
         self.setGeometry(300, 100, 270, 100)
         self.setWindowTitle(f"DCS Liberation - v{VERSION}")
@@ -55,17 +55,14 @@ class QLiberationWindow(QMainWindow):
         self.initMenuBar()
         self.initToolbar()
         self.connectSignals()
-        self.onGameGenerated(self.game)
 
         screen = QDesktopWidget().screenGeometry()
         self.setGeometry(0, 0, screen.width(), screen.height())
         self.setWindowState(Qt.WindowMaximized)
 
-    def initUi(self):
-        self.ato_panel = QAirTaskingOrderPanel(self.game_model)
-        self.liberation_map = QLiberationMap(self.game_model)
-        self.info_panel = QInfoPanel(self.game)
+        self.onGameGenerated(persistency.restore_game())
 
+    def initUi(self):
         hbox = QSplitter(Qt.Horizontal)
         vbox = QSplitter(Qt.Vertical)
         hbox.addWidget(self.ato_panel)
@@ -193,8 +190,7 @@ class QLiberationWindow(QMainWindow):
                                                filter="*.liberation")
         if file is not None:
             game = persistency.load_game(file[0])
-            self.setGame(game)
-            GameUpdateSignal.get_instance().updateGame(self.game)
+            GameUpdateSignal.get_instance().updateGame(game)
 
     def saveGame(self):
         logging.info("Saving game")
@@ -217,14 +213,27 @@ class QLiberationWindow(QMainWindow):
         GameUpdateSignal.get_instance().updateGame(self.game)
 
     def setGame(self, game: Optional[Game]):
-        if game is not None:
-            game.on_load()
-        self.game = game
-        if self.info_panel is not None:
-            self.info_panel.setGame(game)
-        self.game_model.set(self.game)
-        if self.liberation_map is not None:
-            self.liberation_map.setGame(game)
+        try:
+            if game is not None:
+                game.on_load()
+            self.game = game
+            if self.info_panel is not None:
+                self.info_panel.setGame(game)
+            self.game_model.set(self.game)
+            if self.liberation_map is not None:
+                self.liberation_map.setGame(game)
+        except AttributeError:
+            logging.exception("Incompatible save game")
+            QMessageBox.critical(
+                self,
+                "Could not load save game",
+                "The save game you have loaded is incompatible with this "
+                "version of DCS Liberation.\n"
+                "\n"
+                f"{traceback.format_exc()}",
+                QMessageBox.Ok
+            )
+            GameUpdateSignal.get_instance().updateGame(None)
 
     def showAboutDialog(self):
         text = "<h3>DCS Liberation " + VERSION + "</h3>" + \