dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Do not crash when creating tooltip with fit as None

Browse Source
This commit is contained in:
DarkPhoenix
2018-12-11 08:24:03 +03:00
parent aa3043b0ca
commit a1c3d26b73
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/builtinStatsViews/firepowerViewFull.py
View File

@@ -147,7 +147,7 @@ class FirepowerViewFull(StatsView):
self.stEff.Show()
else:
self.stEff.Hide()
def dpsToolTip(preSpool, postSpool, fmt_options):
if preSpool == postSpool:
return "{}".format(formatAmount(preSpool, *fmt_options))
@@ -168,12 +168,14 @@ class FirepowerViewFull(StatsView):
counter = 0
for labelName, preSpoolVal, postSpoolVal, prec, lowest, highest, valueFormat, altFormat in stats:
label = getattr(self, labelName)
val = (postSpoolVal() if showPostSpool else preSpoolVal()) if fit is not None else 0
preSpoolVal = preSpoolVal() if fit is not None else 0
postSpoolVal = postSpoolVal() if fit is not None else 0
val = (postSpoolVal if showPostSpool else preSpoolVal) if fit is not None else 0
val = val if val is not None else 0
if self._cachedValues[counter] != val:
valueStr = formatAmount(val, prec, lowest, highest)
label.SetLabel(valueFormat % valueStr)
valueStrTooltip = dpsToolTip(preSpoolVal(), postSpoolVal(), (prec, lowest, highest))
valueStrTooltip = dpsToolTip(preSpoolVal, postSpoolVal, (prec, lowest, highest))
tipStr = valueFormat % valueStrTooltip # if altFormat is None else altFormat % val
label.SetToolTip(wx.ToolTip(tipStr))
self._cachedValues[counter] = val