Move TGOs out of MapModel.

qt_ui/widgets/map/model/groundobjectjs.py

@@ -1,90 +0,0 @@
-from __future__ import annotations
-
-from typing import List, Optional
-
-from PySide2.QtCore import Property, QObject, Signal, Slot
-
-from game import Game
-from game.server.leaflet import LeafletLatLon
-from game.theater import TheaterGroundObject
-from qt_ui.dialogs import Dialog
-from qt_ui.windows.groundobject.QGroundObjectMenu import QGroundObjectMenu
-
-
-class GroundObjectJs(QObject):
-    nameChanged = Signal()
-    controlPointNameChanged = Signal()
-    sidcChanged = Signal()
-    unitsChanged = Signal()
-    blueChanged = Signal()
-    positionChanged = Signal()
-    samThreatRangesChanged = Signal()
-    samDetectionRangesChanged = Signal()
-    categoryChanged = Signal()
-    deadChanged = Signal()
-
-    def __init__(self, tgo: TheaterGroundObject, game: Game) -> None:
-        super().__init__()
-        self.tgo = tgo
-        self.game = game
-        self.theater = game.theater
-        self.dialog: Optional[QGroundObjectMenu] = None
-
-    @Slot()
-    def showInfoDialog(self) -> None:
-        if self.dialog is None:
-            self.dialog = QGroundObjectMenu(
-                None,
-                self.tgo,
-                self.tgo.control_point,
-                self.game,
-            )
-        self.dialog.show()
-
-    @Slot()
-    def showPackageDialog(self) -> None:
-        Dialog.open_new_package_dialog(self.tgo)
-
-    @Property(str, notify=nameChanged)
-    def name(self) -> str:
-        return self.tgo.name
-
-    @Property(str, notify=controlPointNameChanged)
-    def controlPointName(self) -> str:
-        return self.tgo.control_point.name
-
-    @Property(str, notify=sidcChanged)
-    def sidc(self) -> str:
-        return str(self.tgo.sidc())
-
-    @Property(str, notify=categoryChanged)
-    def category(self) -> str:
-        return self.tgo.category
-
-    @Property(list, notify=unitsChanged)
-    def units(self) -> List[str]:
-        return [unit.display_name for unit in self.tgo.units]
-
-    @Property(bool, notify=blueChanged)
-    def blue(self) -> bool:
-        return self.tgo.control_point.captured
-
-    @Property(list, notify=positionChanged)
-    def position(self) -> LeafletLatLon:
-        return self.tgo.position.latlng().as_list()
-
-    @Property(bool, notify=deadChanged)
-    def dead(self) -> bool:
-        return not any(g.alive_units > 0 for g in self.tgo.groups)
-
-    @Property(list, notify=samThreatRangesChanged)
-    def samThreatRanges(self) -> List[float]:
-        if not self.tgo.might_have_aa:
-            return []
-        return [self.tgo.threat_range(group).meters for group in self.tgo.groups]
-
-    @Property(list, notify=samDetectionRangesChanged)
-    def samDetectionRanges(self) -> List[float]:
-        if not self.tgo.might_have_aa:
-            return []
-        return [self.tgo.detection_range(group).meters for group in self.tgo.groups]

qt_ui/widgets/map/model/mapmodel.py

@@ -15,7 +15,6 @@ from game.theater import (
 from qt_ui.models import GameModel
 from qt_ui.windows.GameUpdateSignal import GameUpdateSignal
 from .controlpointjs import ControlPointJs
-from .groundobjectjs import GroundObjectJs
 from .supplyroutejs import SupplyRouteJs
 
 
@@ -41,7 +40,6 @@ class MapModel(QObject):
     apiKeyChanged = Signal(str)
     mapCenterChanged = Signal(list)
     controlPointsChanged = Signal()
-    groundObjectsChanged = Signal()
     supplyRoutesChanged = Signal()
     mapReset = Signal()
 
@@ -50,7 +48,6 @@ class MapModel(QObject):
         self.game_model = game_model
         self._map_center = LatLng(0, 0)
         self._control_points = []
-        self._ground_objects = []
         self._supply_routes = []
 
         GameUpdateSignal.get_instance().game_loaded.connect(self.on_game_load)
@@ -59,7 +56,6 @@ class MapModel(QObject):
     def clear(self) -> None:
         self._control_points = []
         self._supply_routes = []
-        self._ground_objects = []
         self.cleared.emit()
 
     def reset(self) -> None:
@@ -68,7 +64,6 @@ class MapModel(QObject):
             return
         with logged_duration("Map reset"):
             self.reset_control_points()
-            self.reset_ground_objects()
             self.reset_routes()
             self.mapReset.emit()
 
@@ -99,27 +94,6 @@ class MapModel(QObject):
     def controlPoints(self) -> List[ControlPointJs]:
         return self._control_points
 
-    def reset_ground_objects(self) -> None:
-        seen = set()
-        self._ground_objects = []
-        for cp in self.game.theater.controlpoints:
-            for tgo in cp.ground_objects:
-                if tgo.name in seen:
-                    continue
-                seen.add(tgo.name)
-
-                if tgo.is_control_point:
-                    # TGOs that are the CP (CV groups) are an implementation quirk that
-                    # we don't need to expose to the UI.
-                    continue
-
-                self._ground_objects.append(GroundObjectJs(tgo, self.game))
-        self.groundObjectsChanged.emit()
-
-    @Property(list, notify=groundObjectsChanged)
-    def groundObjects(self) -> List[GroundObjectJs]:
-        return self._ground_objects
-
     def reset_routes(self) -> None:
         seen = set()
         self._supply_routes = []