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

Added possibility to not display SAM ranges in display options.

Browse Source
This commit is contained in:
Khopa 2019-10-11 00:27:10 +02:00
parent fdd8f102e6
commit 6b77e1cce5
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qt_ui/widgets/map/QLiberationMap.py
View File

@ -27,8 +27,7 @@ class QLiberationMap(QGraphicsView):
"go": True, "go": True,
"lines": True, "lines": True,
"events": True, "events": True,
"ennemy_sam_ranges": True, "sam": True,
"ally_sam_ranges": True
} }
def __init__(self, game: Game): def __init__(self, game: Game):
@ -69,7 +68,6 @@ class QLiberationMap(QGraphicsView):
scene.clear() scene.clear()
self.addBackground() self.addBackground()
self.add_game_events() self.add_game_events()
for cp in self.game.theater.controlpoints: for cp in self.game.theater.controlpoints:
@ -86,11 +84,12 @@ class QLiberationMap(QGraphicsView):
text.setDefaultTextColor(Qt.white) text.setDefaultTextColor(Qt.white)
text.setPos(pos[0] + CONST.CP_SIZE + 1, pos[1] - CONST.CP_SIZE / 2 + 1) text.setPos(pos[0] + CONST.CP_SIZE + 1, pos[1] - CONST.CP_SIZE / 2 + 1)
for ground_object in cp.ground_objects: for ground_object in cp.ground_objects:
go_pos = self._transform_point(ground_object.position) go_pos = self._transform_point(ground_object.position)
scene.addItem(QMapGroundObject(self, go_pos[0], go_pos[1], 16, 16, cp, ground_object)) scene.addItem(QMapGroundObject(self, go_pos[0], go_pos[1], 16, 16, cp, ground_object))
if(ground_object.category == "aa"): if ground_object.category == "aa" and self.get_display_rule("sam"):
max_range = 0 max_range = 0
if ground_object.groups: if ground_object.groups:
for g in ground_object.groups: for g in ground_object.groups:
@ -106,7 +105,6 @@ class QLiberationMap(QGraphicsView):
brush = CONST.COLORS["red_transparent"] brush = CONST.COLORS["red_transparent"]
scene.addEllipse(go_pos[0] - max_range/300.0 + 8, go_pos[1] - max_range/300.0 + 8, max_range/150.0, max_range/150.0, pen, brush) scene.addEllipse(go_pos[0] - max_range/300.0 + 8, go_pos[1] - max_range/300.0 + 8, max_range/150.0, max_range/150.0, pen, brush)
if self.get_display_rule("lines"): if self.get_display_rule("lines"):
self.scene_create_lines_for_cp(cp) self.scene_create_lines_for_cp(cp)

9
qt_ui/windows/QLiberationWindow.py
View File

@ -111,13 +111,18 @@ class QLiberationWindow(QMainWindow):
tg_event_visibility = QAction('Events', displayMenu) tg_event_visibility = QAction('Events', displayMenu)
tg_event_visibility.setCheckable(True) tg_event_visibility.setCheckable(True)
tg_event_visibility.setChecked(True) tg_event_visibility.setChecked(True)
tg_event_visibility.toggled.connect( tg_event_visibility.toggled.connect(lambda: QLiberationMap.set_display_rule("events", tg_event_visibility.isChecked()))
lambda: QLiberationMap.set_display_rule("events", tg_event_visibility.isChecked()))
tg_sam_visibility = QAction('SAM Range', displayMenu)
tg_sam_visibility.setCheckable(True)
tg_sam_visibility.setChecked(True)
tg_sam_visibility.toggled.connect(lambda: QLiberationMap.set_display_rule("sam", tg_sam_visibility.isChecked()))
displayMenu.addAction(tg_go_visibility) displayMenu.addAction(tg_go_visibility)
displayMenu.addAction(tg_cp_visibility) displayMenu.addAction(tg_cp_visibility)
displayMenu.addAction(tg_line_visibility) displayMenu.addAction(tg_line_visibility)
displayMenu.addAction(tg_event_visibility) displayMenu.addAction(tg_event_visibility)
displayMenu.addAction(tg_sam_visibility)
def newGame(self): def newGame(self):
wizard = NewGameWizard(self) wizard = NewGameWizard(self)