weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Air/ground intel prettification. (#1285)

Browse Source 
* Sort rows.
* Add totals to group headers.
* Indent content.
* Add space between sections.
This commit is contained in:
Chris Seagraves 2021-06-20 15:43:54 -05:00 committed by GitHub
parent 7808da118a
commit 7e17533cc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,6 +12,7 @@ resources/tools/a.miz
# User-specific stuff
.idea/
.env
env/
/kneeboards
/liberation_preferences.json

24
qt_ui/windows/intel.py
View File

@ -1,4 +1,5 @@
import itertools
from typing import Optional
from PySide2.QtWidgets import (
QCheckBox,
@ -63,9 +64,10 @@ class IntelTableLayout(QGridLayout):
0,
)
def add_row(self, text: str, count: int) -> None:
def add_row(self, text: str, count: Optional[int] = None) -> None:
row = next(self.row)
self.addWidget(QLabel(text), row, 0)
if count is not None: # optional count for blank rows
self.addWidget(QLabel(str(count)), row, 1)
@ -80,14 +82,16 @@ class AircraftIntelLayout(IntelTableLayout):
if not base.total_aircraft:
continue
self.add_header(control_point.name)
for airframe, count in base.aircraft.items():
self.add_header(f"{control_point.name} ({base.total_aircraft})")
for airframe in sorted(base.aircraft, key=lambda k: k.name):
count = base.aircraft[airframe]
if not count:
continue
self.add_row(airframe.name, count)
self.add_row(f" {airframe.name}", count)
self.add_row("")
self.add_spacer()
self.add_row("<b>Total</b>", total)
self.add_spacer()
class AircraftIntelTab(ScrollingFrame):
@ -107,14 +111,16 @@ class ArmyIntelLayout(IntelTableLayout):
if not base.total_armor:
continue
self.add_header(control_point.name)
for vehicle, count in base.armor.items():
self.add_header(f"{control_point.name} ({base.total_armor})")
for vehicle in sorted(base.armor, key=lambda k: k.name):
count = base.armor[vehicle]
if not count:
continue
self.add_row(vehicle.name, count)
self.add_row(f" {vehicle.name}", count)
self.add_row("")
self.add_spacer()
self.add_row("<b>Total</b>", total)
self.add_spacer()
class ArmyIntelTab(ScrollingFrame):