From 25e298ff69f4d4121004c68547ec0e947f3d0fb8 Mon Sep 17 00:00:00 2001
From: Ebag333 <ebagola@gmail.com>
Date: Sun, 12 Jun 2016 16:46:18 -0700
Subject: [PATCH] Updated ECM to be more descriptive

Gave it the RAH treatment. Now shows min/max values if it's a racial,
and only one for multispectral.  Tooltip shows all four broken out.
---
 gui/builtinViewColumns/misc.py | 35 ++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py
index c50f23e47..2bd5ee4a6 100644
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -210,23 +210,26 @@ class Miscellanea(ViewColumn):
             ladar = stuff.getModifiedItemAttr("scanLadarStrengthBonus")
             radar = stuff.getModifiedItemAttr("scanRadarStrengthBonus")
             magnet = stuff.getModifiedItemAttr("scanMagnetometricStrengthBonus")
-            if grav is None or ladar is None or radar is None or magnet is None:
+            displayMax = max(grav, ladar, radar, magnet)
+            displayMin = min(grav, ladar, radar, magnet)
+            if grav is None or ladar is None or radar is None or magnet is None or displayMax is None:
                 return "", None
-            display = max(grav, ladar, radar, magnet)
-            if not display:
-                return "", None
-            text = "{0}".format(formatAmount(display, 3, 0, 3))
-            ttEntries = []
-            if display == grav:
-                ttEntries.append("gravimetric")
-            if display == ladar:
-                ttEntries.append("ladar")
-            if display == magnet:
-                ttEntries.append("magnetometric")
-            if display == radar:
-                ttEntries.append("radar")
-            plu = "" if len(ttEntries) == 1 else "s"
-            tooltip = "{0} strength{1}".format(formatList(ttEntries), plu).capitalize()
+
+            if displayMax == displayMin or displayMin is None:
+                text = "{0}".format(
+                    formatAmount(displayMax, 3, 0, 3),
+                )
+            else:
+                text = "{0} | {1}".format(
+                    formatAmount(displayMax, 3, 0, 3),
+                    formatAmount(displayMin, 3, 0, 3),
+                )
+            tooltip = "ECM Jammer Strength:\n{0} gravimetric | {1} ladar | {2} magnetometric | {3} radar".format(
+                formatAmount(grav, 3, 0, 3),
+                formatAmount(ladar, 3, 0, 3),
+                formatAmount(radar, 3, 0, 3),
+                formatAmount(magnet, 3, 0, 3),
+            )
             return text, tooltip
         elif itemGroup in ("Remote Sensor Booster", "Sensor Booster", "Signal Amplifier"):
             scanResBonus = stuff.getModifiedItemAttr("scanResolutionBonus")