From 7bc82e229f1bd2e5a21d826bed48ccfd15a9c4eb Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Thu, 13 Dec 2018 09:36:33 +0300
Subject: [PATCH] Make spoolup tooltip format consistent

---
 gui/builtinStatsViews/firepowerViewFull.py   | 17 ++++++++---------
 gui/builtinStatsViews/outgoingViewFull.py    |  2 +-
 gui/builtinStatsViews/outgoingViewMinimal.py |  2 +-
 gui/builtinViewColumns/misc.py               |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py
index 1962abec0..72c92be4a 100644
--- a/gui/builtinStatsViews/firepowerViewFull.py
+++ b/gui/builtinStatsViews/firepowerViewFull.py
@@ -149,12 +149,11 @@ class FirepowerViewFull(StatsView):
         else:
             self.stEff.Hide()
 
-        def dpsToolTip(preSpool, fullSpool, statName, prec, lowest, highest):
+        def dpsToolTip(preSpool, fullSpool, prec, lowest, highest):
             if roundToPrec(preSpool, prec) == roundToPrec(fullSpool, prec):
                 return ""
             else:
-                return "Spool up {}: {}-{}".format(
-                    statName,
+                return "Spool up: {}-{}".format(
                     formatAmount(preSpool, prec, lowest, highest),
                     formatAmount(fullSpool, prec, lowest, highest))
 
@@ -164,28 +163,28 @@ class FirepowerViewFull(StatsView):
                 lambda: fit.getWeaponDps().total,
                 lambda: fit.getWeaponDps(spoolType=SpoolType.SCALE, spoolAmount=0).total,
                 lambda: fit.getWeaponDps(spoolType=SpoolType.SCALE, spoolAmount=1).total,
-                3, 0, 0, "%s DPS", "DPS"),
+                3, 0, 0, "%s DPS"),
             (
                 "labelFullDpsDrone",
                 lambda: fit.getDroneDps().total,
                 lambda: fit.getDroneDps().total,
                 lambda: fit.getDroneDps().total,
-                3, 0, 0, "%s DPS", "DPS"),
+                3, 0, 0, "%s DPS"),
             (
                 "labelFullVolleyTotal",
                 lambda: fit.getTotalVolley().total,
                 lambda: fit.getTotalVolley(spoolType=SpoolType.SCALE, spoolAmount=0).total,
                 lambda: fit.getTotalVolley(spoolType=SpoolType.SCALE, spoolAmount=1).total,
-                3, 0, 0, "%s", "volley"),
+                3, 0, 0, "%s"),
             (
                 "labelFullDpsTotal",
                 lambda: fit.getTotalDps().total,
                 lambda: fit.getTotalDps(spoolType=SpoolType.SCALE, spoolAmount=0).total,
                 lambda: fit.getTotalDps(spoolType=SpoolType.SCALE, spoolAmount=1).total,
-                3, 0, 0, "%s", "DPS"))
+                3, 0, 0, "%s"))
 
         counter = 0
-        for labelName, val, preSpoolVal, fullSpoolVal, prec, lowest, highest, valueFormat, statName in stats:
+        for labelName, val, preSpoolVal, fullSpoolVal, prec, lowest, highest, valueFormat in stats:
             label = getattr(self, labelName)
             val = val() if fit is not None else 0
             preSpoolVal = preSpoolVal() if fit is not None else 0
@@ -195,7 +194,7 @@ class FirepowerViewFull(StatsView):
             if self._cachedValues[counter] != val:
                 valueStr = formatAmount(val, prec, lowest, highest)
                 label.SetLabel(valueFormat % valueStr)
-                tooltipText = dpsToolTip(preSpoolVal, fullSpoolVal, statName, prec, lowest, highest)
+                tooltipText = dpsToolTip(preSpoolVal, fullSpoolVal, prec, lowest, highest)
                 label.SetToolTip(wx.ToolTip(tooltipText))
                 self._cachedValues[counter] = val
             counter += 1
diff --git a/gui/builtinStatsViews/outgoingViewFull.py b/gui/builtinStatsViews/outgoingViewFull.py
index 88ef34b1d..ee07004e4 100644
--- a/gui/builtinStatsViews/outgoingViewFull.py
+++ b/gui/builtinStatsViews/outgoingViewFull.py
@@ -96,7 +96,7 @@ class OutgoingViewFull(StatsView):
             if roundToPrec(preSpool, prec) == roundToPrec(fullSpool, prec):
                 return text
             else:
-                return "{}, spool up {}-{}".format(
+                return "{}\nSpool up: {}-{}".format(
                     text,
                     formatAmount(preSpool, prec, lowest, highest),
                     formatAmount(fullSpool, prec, lowest, highest))
diff --git a/gui/builtinStatsViews/outgoingViewMinimal.py b/gui/builtinStatsViews/outgoingViewMinimal.py
index bdf454c13..2a8dc35c7 100644
--- a/gui/builtinStatsViews/outgoingViewMinimal.py
+++ b/gui/builtinStatsViews/outgoingViewMinimal.py
@@ -95,7 +95,7 @@ class OutgoingViewMinimal(StatsView):
             if roundToPrec(preSpool, prec) == roundToPrec(fullSpool, prec):
                 return text
             else:
-                return "{}, spool up {}-{}".format(
+                return "{}\nSpool up: {}-{}".format(
                     text,
                     formatAmount(preSpool, prec, lowest, highest),
                     formatAmount(fullSpool, prec, lowest, highest))
diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py
index 41ab9f2c3..70ea24c3d 100644
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -352,7 +352,7 @@ class Miscellanea(ViewColumn):
                 tooltip.append("spool up time")
             text = " | ".join(text)
             tooltip = " and ".join(tooltip)
-            tooltip = "{}\nSpool up amount {}-{} over {}s".format(
+            tooltip = "{}\nSpool up: {}-{} over {}s".format(
                 tooltip,
                 formatAmount(rpsPre, 3, 0, 3),
                 formatAmount(rpsFull, 3, 0, 3),