Add column which shows target resists

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 = {

gui/builtinViewColumns/__init__.py

@@ -12,4 +12,5 @@ __all__ = [
     "state",
     "misc",
     "abilities",
-    "sideEffects"]
+    "sideEffects",
+    "targetResists"]

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

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 <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+# 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()

gui/viewColumn.py

@@ -81,5 +81,5 @@ from gui.builtinViewColumns import (  # noqa: E402, F401
     price,
     propertyDisplay,
     state,
-    sideEffects
-)
+    sideEffects,
+    targetResists)