weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move MapZones out of MapModel.

Browse Source
This commit is contained in:
Dan Albert
2022-02-22 19:16:55 -08:00
parent 0e6a303c17
commit 2ae820fb20
7 changed files with 61 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
qt_ui/widgets/map/model/mapmodel.py
View File

@@ -20,7 +20,6 @@ from .controlpointjs import ControlPointJs
from .flightjs import FlightJs
from .frontlinejs import FrontLineJs
from .groundobjectjs import GroundObjectJs
from .mapzonesjs import MapZonesJs
from .supplyroutejs import SupplyRouteJs
from .threatzonecontainerjs import ThreatZoneContainerJs
from .threatzonesjs import ThreatZonesJs
@@ -54,7 +53,6 @@ class MapModel(QObject):
flightsChanged = Signal()
frontLinesChanged = Signal()
threatZonesChanged = Signal()
mapZonesChanged = Signal()
unculledZonesChanged = Signal()
selectedFlightChanged = Signal(str)
@@ -70,7 +68,6 @@ class MapModel(QObject):
self._threat_zones = ThreatZoneContainerJs(
ThreatZonesJs.empty(), ThreatZonesJs.empty()
)
self._map_zones = MapZonesJs([], [], [])
self._unculled_zones = []
self._selected_flight_index: Optional[Tuple[int, int]] = None
@@ -99,7 +96,6 @@ class MapModel(QObject):
self._threat_zones = ThreatZoneContainerJs(
ThreatZonesJs.empty(), ThreatZonesJs.empty()
)
self._map_zones = MapZonesJs([], [], [])
self._unculled_zones = []
self.cleared.emit()
@@ -164,7 +160,6 @@ class MapModel(QObject):
self.reset_atos()
self.reset_front_lines()
self.reset_threat_zones()
self.reset_map_zones()
self.reset_unculled_zones()
def on_game_load(self, game: Optional[Game]) -> None:
@@ -297,14 +292,6 @@ class MapModel(QObject):
def threatZones(self) -> ThreatZoneContainerJs:
return self._threat_zones
def reset_map_zones(self) -> None:
self._map_zones = MapZonesJs.from_game(self.game)
self.mapZonesChanged.emit()
@Property(MapZonesJs, notify=mapZonesChanged)
def mapZones(self) -> MapZonesJs:
return self._map_zones
def on_package_change(self) -> None:
self.reset_unculled_zones()