From 16be84420b015676f561d6037658357b1b8b88b0 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 5 Aug 2019 02:23:39 +0300 Subject: [PATCH] Add display of resist mode to column --- gui/builtinViewColumns/targetResists.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gui/builtinViewColumns/targetResists.py b/gui/builtinViewColumns/targetResists.py index 0e25262d7..84c7cb5ed 100644 --- a/gui/builtinViewColumns/targetResists.py +++ b/gui/builtinViewColumns/targetResists.py @@ -24,6 +24,7 @@ from graphs.wrapper import TargetWrapper from gui.bitmap_loader import BitmapLoader from gui.utils.numberFormatter import formatAmount from gui.viewColumn import ViewColumn +from service.const import TargetResistMode class TargetResists(ViewColumn): @@ -38,12 +39,26 @@ class TargetResists(ViewColumn): def getText(self, stuff): if isinstance(stuff, TargetWrapper): - em, therm, kin, explo = stuff.getResists() - return '{}/{}/{}/{}'.format( + em, therm, kin, explo, layer = stuff.getResists(includeLayer=True) + if stuff.isFit: + modeSuffixMap = { + TargetResistMode.auto: 'auto', + TargetResistMode.shield: 'shield', + TargetResistMode.armor: 'armor', + TargetResistMode.hull: 'hull', + TargetResistMode.weighedAverage: 'weighed'} + modeSuffix = modeSuffixMap[stuff.resistMode] + if stuff.resistMode == TargetResistMode.auto and layer is not None: + modeSuffix = '{} {}'.format(modeSuffix, layer) + modeSuffix = ' ({})'.format(modeSuffix) + else: + modeSuffix = '' + return '{}/{}/{}/{}{}'.format( formatAmount(val=em * 100, prec=3, lowest=0, highest=0), formatAmount(val=therm * 100, prec=3, lowest=0, highest=0), formatAmount(val=kin * 100, prec=3, lowest=0, highest=0), - formatAmount(val=explo * 100, prec=3, lowest=0, highest=0)) + formatAmount(val=explo * 100, prec=3, lowest=0, highest=0), + modeSuffix) return '' def getToolTip(self, mod):