unifomise tiebreak icons + refacto presenter
This commit is contained in:
parent
0081e52e9a
commit
3d0d7874e3
10 changed files with 185 additions and 165 deletions
|
|
@ -22,8 +22,8 @@ from warchron.model.sector import Sector
|
|||
from warchron.model.tie_manager import TieContext, TieResolver
|
||||
from warchron.model.score_service import ScoreService
|
||||
from warchron.controller.closure_workflow import CampaignClosureWorkflow
|
||||
from warchron.controller.ranking_icon import RankingIcon
|
||||
from warchron.controller.presenter import TiePresenter
|
||||
|
||||
from warchron.controller.presenter import Presenter
|
||||
from warchron.view.campaign_dialog import CampaignDialog
|
||||
from warchron.view.campaign_participant_dialog import CampaignParticipantDialog
|
||||
from warchron.view.sector_dialog import SectorDialog
|
||||
|
|
@ -58,11 +58,11 @@ class CampaignController:
|
|||
vp_icon_map: Dict[str, QIcon] = {}
|
||||
objective_icon_maps: Dict[str, Dict[str, QIcon]] = {}
|
||||
if camp.is_over:
|
||||
vp_icon_map = RankingIcon.compute_icons(
|
||||
vp_icon_map = Presenter.compute_ranking_icons(
|
||||
war, ContextType.CAMPAIGN, campaign_id, scores
|
||||
)
|
||||
for obj in war.get_objectives_used_as_maj_or_min():
|
||||
objective_icon_maps[obj.id] = RankingIcon.compute_icons(
|
||||
objective_icon_maps[obj.id] = Presenter.compute_ranking_icons(
|
||||
war,
|
||||
ContextType.CAMPAIGN,
|
||||
camp.id,
|
||||
|
|
@ -177,7 +177,7 @@ class CampaignController:
|
|||
for pid in active
|
||||
]
|
||||
counters = [war.get_influence_tokens(pid) for pid in active]
|
||||
data = TiePresenter.build_dialog_data(
|
||||
data = Presenter.build_dialog_data(
|
||||
war, ctx, campaign=war.get_campaign(ctx.context_id)
|
||||
)
|
||||
dialog = TieDialog(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue