From 93a1c31292ab3294fa750cac3c78526bdd092d20 Mon Sep 17 00:00:00 2001
From: cncfanatics <diego.duclos@gmail.com>
Date: Mon, 11 Oct 2010 09:18:20 +0200
Subject: [PATCH] FIx an oopsie

---
 gui/builtinStatsViews/resistancesViewFull.py |  1 +
 gui/builtinViewColumns/capacitorUse.py       | 49 ++++++++++++++++++++
 gui/contextMenu.py                           |  9 ++--
 3 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100755 gui/builtinViewColumns/capacitorUse.py

diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py
index 2453c0704..aa7dddc32 100644
--- a/gui/builtinStatsViews/resistancesViewFull.py
+++ b/gui/builtinStatsViews/resistancesViewFull.py
@@ -166,6 +166,7 @@ class ResistancesViewFull(StatsView):
         self.labelEhp.SetToolTip(wx.ToolTip("Effective: %d" % total))
 
         damagePattern = fit.damagePattern if fit is not None else None
+        print damagePattern
         for damageType in ("em", "thermal", "kinetic", "explosive"):
             lbl = getattr(self, "gaugeResistanceDamagepattern%s" % damageType.capitalize())
             if damagePattern is not None:
diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py
new file mode 100755
index 000000000..6db5ce5ef
--- /dev/null
+++ b/gui/builtinViewColumns/capacitorUse.py
@@ -0,0 +1,49 @@
+#===============================================================================
+# 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/>.
+#===============================================================================
+
+from gui.viewColumn import ViewColumn
+from gui import bitmapLoader
+import service
+from util import formatAmount
+
+class CapacitorUse(ViewColumn):
+    name = "Capacitor Usage"
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        cAttribute = service.Attribute.getInstance()
+        info = cAttribute.getAttributeInfo("capacitorNeed")
+        bitmap = bitmapLoader.getBitmap(info.icon.iconFile, "pack")
+        if bitmap:
+            self.imageId = fittingView.imageList.Add(bitmap)
+        else:
+            self.imageId = -1
+
+
+    def getText(self, mod):
+        attr = mod.getModifiedItemAttr("capacitorNeed")
+        cycleTime = mod.getCycleTime()
+        if attr is not None and cycleTime is not None:
+            return "%s%s" % ("+" if attr < 0 else "", (formatAmount(-attr / mod.getCycleTime(), 3, 0, 3)))
+        else:
+            return ""
+
+    def getImageId(self, mod):
+        return -1
+
+CapacitorUse.register()
diff --git a/gui/contextMenu.py b/gui/contextMenu.py
index 230604218..7da59af58 100755
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -47,11 +47,12 @@ class ContextMenu(object):
                         item = wx.MenuItem(menu, id, text)
                         menu.info[id] = (m, context, it)
 
-                    bitmap = m.getBitmap(context, selection)
-                    if bitmap:
-                        item.SetBitmap(bitmap)
+                        bitmap = m.getBitmap(context, selection)
+                        if bitmap:
+                            item.SetBitmap(bitmap)
+
+                        menu.AppendItem(item)
 
-                    menu.AppendItem(item)
                     empty = False
 
             if amount > 0 and i != len(contexts) - 1: