maximator/warchron_app
maximator/warchron_app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

factorise ranking icon mapper

Browse source
This commit is contained in:
Maxime Réaux 2026-02-26 11:28:29 +01:00
parent 5a64a294c5
commit 3fe3bb331c
3 changed files with 60 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/warchron/controller/war_controller.py
View file

@ -1,15 +1,11 @@
from typing import List, Tuple, TYPE_CHECKING, Dict
from PyQt6.QtWidgets import QMessageBox, QDialog
from PyQt6.QtGui import QIcon
from warchron.constants import (
RefreshScope,
ItemType,
ContextType,
Icons,
IconName,
RANK_TO_ICON,
)
from warchron.model.exception import (
DomainError,
@ -29,8 +25,8 @@ from warchron.model.war_participant import WarParticipant
from warchron.model.objective import Objective
from warchron.model.tie_manager import TieContext, TieResolver
from warchron.model.score_service import ScoreService
from warchron.model.result_checker import ResultChecker
from warchron.controller.closure_workflow import WarClosureWorkflow
from warchron.controller.ranking_icon import RankingIcon
from warchron.view.war_dialog import WarDialog
from warchron.view.objective_dialog import ObjectiveDialog
from warchron.view.war_participant_dialog import WarParticipantDialog
@ -41,39 +37,6 @@ class WarController:
def __init__(self, app: "AppController"):
self.app = app
def _compute_war_ranking_icons(self, war: War) -> Dict[str, QIcon]:
scores = ScoreService.compute_scores(
war,
ContextType.WAR,
war.id,
)
ranking = ResultChecker.get_effective_ranking(
war, ContextType.WAR, war.id, scores
)
icon_map = {}
for rank, group, token_map in ranking:
base_icon = RANK_TO_ICON.get(rank, IconName.VPNTH)
vp = scores[group[0]].victory_points
original_group_size = sum(
1 for s in scores.values() if s.victory_points == vp
)
for pid in group:
spent = token_map.get(pid, 0)
if original_group_size == 1:
icon_name = base_icon
elif len(group) == 1:
if spent > 0:
icon_name = getattr(IconName, f"{base_icon.name}BREAK")
else:
icon_name = base_icon
else:
if spent > 0:
icon_name = getattr(IconName, f"{base_icon.name}TIEDRAW")
else:
icon_name = getattr(IconName, f"{base_icon.name}DRAW")
icon_map[pid] = QIcon(Icons.get_pixmap(icon_name))
return icon_map
def _fill_war_details(self, war_id: str) -> None:
war = self.app.model.get_war(war_id)
self.app.view.show_war_details(name=war.name, year=war.year)
@ -92,7 +55,7 @@ class WarController:
rows: List[WarParticipantScoreDTO] = []
icon_map = {}
if war.is_over:
icon_map = self._compute_war_ranking_icons(war)
icon_map = RankingIcon.compute_icons(war, ContextType.WAR, war_id, scores)
for war_part in war.get_all_war_participants():
player_name = self.app.model.get_player_name(war_part.player_id)
score = scores[war_part.id]