From 9c58b97de2e1c8a2e13b7bcb0d1575c71de81b8d Mon Sep 17 00:00:00 2001 From: Indiction Date: Fri, 30 Dec 2016 16:31:53 +0100 Subject: [PATCH 1/3] Tooltip "TotalDPSTank" --- gui/builtinStatsViews/rechargeViewFull.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index c73aaf0b45..1067a91e6a 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -105,6 +105,9 @@ def refreshPanel(self, fit): lbl = getattr(self, "labelTank%s%sActive" % (stability.capitalize(), name.capitalize())) if tank is not None: lbl.SetLabel("%.1f" % tank["%sRepair" % name]) + if (tank["%sRepair" % name] > 0) & (not fit.capStable): #show tooltip only if fit is not capstable + totalDPSTank = tank["%sRepair" % name] * fit.capState + lbl.SetToolTip(wx.ToolTip("Total DPS Tank: %.0f HP" % totalDPSTank)) else: lbl.SetLabel("0.0") @@ -118,7 +121,7 @@ def refreshPanel(self, fit): label = getattr(self, "labelTankSustainedShieldPassive") label.SetLabel("0") - label.SetToolTip(wx.ToolTip("%.3f" % value)) + label.SetToolTip(wx.ToolTip("Passive Tank %.3f" % value)) self.panel.Layout() self.headerPanel.Layout() From dcf0491f7f00503db3cefa1782165dff94b67145 Mon Sep 17 00:00:00 2001 From: Indiction Date: Fri, 30 Dec 2016 16:37:43 +0100 Subject: [PATCH 2/3] Tooltip "TotalDPSTank" - show tooltip only for "reinforced" labels --- gui/builtinStatsViews/rechargeViewFull.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index 1067a91e6a..fdfb16bbfe 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -105,7 +105,9 @@ def refreshPanel(self, fit): lbl = getattr(self, "labelTank%s%sActive" % (stability.capitalize(), name.capitalize())) if tank is not None: lbl.SetLabel("%.1f" % tank["%sRepair" % name]) - if (tank["%sRepair" % name] > 0) & (not fit.capStable): #show tooltip only if fit is not capstable + if (stability == "reinforced") & \ + (tank["%sRepair" % name] > 0) & \ + (not fit.capStable): #show tooltip only if fit is not capstable totalDPSTank = tank["%sRepair" % name] * fit.capState lbl.SetToolTip(wx.ToolTip("Total DPS Tank: %.0f HP" % totalDPSTank)) else: From 96b89f967242c070a3fdd606fa4b57c11d75013a Mon Sep 17 00:00:00 2001 From: Indiction Date: Fri, 30 Dec 2016 16:52:08 +0100 Subject: [PATCH 3/3] passiveTankTooltip --- gui/builtinStatsViews/rechargeViewFull.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index fdfb16bbfe..ef35850950 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -123,7 +123,7 @@ def refreshPanel(self, fit): label = getattr(self, "labelTankSustainedShieldPassive") label.SetLabel("0") - label.SetToolTip(wx.ToolTip("Passive Tank %.3f" % value)) + label.SetToolTip(wx.ToolTip("Passive Tank: %.3f HP/s" % value)) self.panel.Layout() self.headerPanel.Layout()