From 697ae6d473f6239b8119ce9c04a9ecc3fe5ad26b Mon Sep 17 00:00:00 2001
From: cncfanatics <diego.duclos@gmail.com>
Date: Tue, 26 Oct 2010 21:39:45 +0200
Subject: [PATCH] Change some stuff for latest eos and grab latest fixes

---
 eos                                    | 2 +-
 gui/builtinViewColumns/capacitorUse.py | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eos b/eos
index a5737d4e1..1dea1ba30 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit a5737d4e17570c8c4b6f5b99679007912bbd9664
+Subproject commit 1dea1ba300af85ffeca766a9f7516cf07768226c
diff --git a/gui/builtinViewColumns/capacitorUse.py b/gui/builtinViewColumns/capacitorUse.py
index 6db5ce5ef..732e96c0c 100644
--- a/gui/builtinViewColumns/capacitorUse.py
+++ b/gui/builtinViewColumns/capacitorUse.py
@@ -36,10 +36,9 @@ class CapacitorUse(ViewColumn):
 
 
     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)))
+        capUse = mod.capUse
+        if capUse is not None:
+            return "%s%s" % ("+" if capUse < 0 else "", (formatAmount(-capUse, 3, 0, 3)))
         else:
             return ""