diff --git a/graphs/data/fitDamageStats/graph.py b/graphs/data/fitDamageStats/graph.py index 3e3b6e254..df5d83648 100644 --- a/graphs/data/fitDamageStats/graph.py +++ b/graphs/data/fitDamageStats/graph.py @@ -71,7 +71,7 @@ class FitDamageStatsGraph(FitGraph): tgtVectorDef = VectorDef(lengthHandle='tgtSpeed', lengthUnit='%', angleHandle='tgtAngle', angleUnit='degrees', label='Target') hasTargets = True srcExtraCols = ('Dps', 'Volley', 'Speed', 'Radius') - tgtExtraCols = ('Speed', 'SigRadius', 'Radius') + tgtExtraCols = ('Target Resists', 'Speed', 'SigRadius', 'Radius') # Calculation stuff _normalizers = { diff --git a/gui/builtinViewColumns/__init__.py b/gui/builtinViewColumns/__init__.py index 64c03c49f..9675f178b 100644 --- a/gui/builtinViewColumns/__init__.py +++ b/gui/builtinViewColumns/__init__.py @@ -12,4 +12,5 @@ __all__ = [ "state", "misc", "abilities", - "sideEffects"] + "sideEffects", + "targetResists"] diff --git a/gui/builtinViewColumns/attributeDisplayGraph.py b/gui/builtinViewColumns/attributeDisplayGraph.py index b1f2bedf8..7fd4d0df5 100644 --- a/gui/builtinViewColumns/attributeDisplayGraph.py +++ b/gui/builtinViewColumns/attributeDisplayGraph.py @@ -23,7 +23,6 @@ from abc import ABCMeta, abstractmethod import wx import eos.config -import gui.mainFrame from eos.saveddata.fit import Fit from eos.saveddata.targetProfile import TargetProfile from eos.utils.spoolSupport import SpoolOptions, SpoolType @@ -37,7 +36,6 @@ class GraphColumn(ViewColumn, metaclass=ABCMeta): def __init__(self, fittingView, iconID, formatSpec=(3, 0, 3)): ViewColumn.__init__(self, fittingView) - self.mainFrame = gui.mainFrame.MainFrame.getInstance() self.imageId = fittingView.imageList.GetImageIndex(iconID, 'icons') self.bitmap = BitmapLoader.getBitmap(iconID, 'icons') self.mask = wx.LIST_MASK_TEXT diff --git a/gui/builtinViewColumns/targetResists.py b/gui/builtinViewColumns/targetResists.py new file mode 100644 index 000000000..0e25262d7 --- /dev/null +++ b/gui/builtinViewColumns/targetResists.py @@ -0,0 +1,53 @@ +# ============================================================================= +# Copyright (C) 2010 Diego Duclos +# +# This file is part of pyfa. +# +# pyfa is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# pyfa is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with pyfa. If not, see . +# ============================================================================= + +# noinspection PyPackageRequirements +import wx + +from graphs.wrapper import TargetWrapper +from gui.bitmap_loader import BitmapLoader +from gui.utils.numberFormatter import formatAmount +from gui.viewColumn import ViewColumn + + +class TargetResists(ViewColumn): + + name = 'Target Resists' + + def __init__(self, fittingView, params): + super().__init__(fittingView) + self.imageId = fittingView.imageList.GetImageIndex(1393, 'icons') + self.bitmap = BitmapLoader.getBitmap(1393, 'icons') + self.mask = wx.LIST_MASK_TEXT + + def getText(self, stuff): + if isinstance(stuff, TargetWrapper): + em, therm, kin, explo = stuff.getResists() + 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)) + return '' + + def getToolTip(self, mod): + return 'Target resistances\nEM / Thermal / Kinetic / Explosive' + + +TargetResists.register() diff --git a/gui/viewColumn.py b/gui/viewColumn.py index f2b72cdc1..65703b2d4 100644 --- a/gui/viewColumn.py +++ b/gui/viewColumn.py @@ -81,5 +81,5 @@ from gui.builtinViewColumns import ( # noqa: E402, F401 price, propertyDisplay, state, - sideEffects -) + sideEffects, + targetResists)