Add dps/volley columns to fit list

gui/builtinViewColumns/__init__.py

@@ -1,2 +1,15 @@
-__all__ = ["ammo", "ammoIcon", "attributeDisplay", "baseIcon", "baseName",
-           "capacitorUse", "maxRange", "price", "propertyDisplay", "state", "misc", "abilities", "sideEffects"]
+__all__ = [
+    "ammo",
+    "ammoIcon",
+    "attributeDisplay",
+    "baseIcon",
+    "baseName",
+    "capacitorUse",
+    "dps",
+    "maxRange",
+    "price",
+    "propertyDisplay",
+    "state",
+    "misc",
+    "abilities",
+    "sideEffects"]

gui/builtinViewColumns/baseName.py

@@ -45,7 +45,6 @@ class BaseName(ViewColumn):
 
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
         self.columnText = "Name"
-        self.shipImage = fittingView.imageList.GetImageIndex("ship_small", "gui")
         self.mask = wx.LIST_MASK_TEXT
         self.projectedView = isinstance(fittingView, gui.builtinAdditionPanes.projectedView.ProjectedView)
 

gui/builtinViewColumns/dps.py

@@ -0,0 +1,52 @@
+# =============================================================================
+# 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
+
+import eos.config
+import gui.mainFrame
+from eos.saveddata.fit import Fit
+from eos.utils.spoolSupport import SpoolOptions, SpoolType
+from gui.viewColumn import ViewColumn
+from gui.utils.numberFormatter import formatAmount
+
+
+class DpsColumn(ViewColumn):
+
+    name = 'Dps'
+
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        self.columnText = 'DPS'
+        self.mask = wx.LIST_MASK_TEXT
+
+    def getText(self, stuff):
+        if isinstance(stuff, Fit):
+            defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage']
+            dps = stuff.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total
+            if dps is None:
+                return ''
+            return formatAmount(dps, 3, 0, 0)
+        return ''
+
+
+DpsColumn.register()

gui/builtinViewColumns/volley.py

@@ -0,0 +1,52 @@
+# =============================================================================
+# 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
+
+import eos.config
+import gui.mainFrame
+from eos.saveddata.fit import Fit
+from eos.utils.spoolSupport import SpoolOptions, SpoolType
+from gui.viewColumn import ViewColumn
+from gui.utils.numberFormatter import formatAmount
+
+
+class VolleyColumn(ViewColumn):
+
+    name = 'Volley'
+
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        self.columnText = 'Volley'
+        self.mask = wx.LIST_MASK_TEXT
+
+    def getText(self, stuff):
+        if isinstance(stuff, Fit):
+            defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage']
+            dps = stuff.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total
+            if dps is None:
+                return ''
+            return formatAmount(dps, 3, 0, 0)
+        return ''
+
+
+VolleyColumn.register()