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

Expose spooled up value to stats panels

Browse Source
This commit is contained in:
DarkPhoenix
2018-12-11 23:15:46 +03:00
parent 2dfdead656
commit 5a0670838d
7 changed files with 203 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gui/builtinStatsViews/firepowerViewFull.py
View File

@@ -153,7 +153,7 @@ class FirepowerViewFull(StatsView):
if preSpool == postSpool:
return None
else:
return "Spoolup {} spread: {}-{}".format(
return "Spoolup {}: {}-{}".format(
statName,
formatAmount(preSpool, *fmt_options),
formatAmount(postSpool, *fmt_options))
@@ -161,7 +161,7 @@ class FirepowerViewFull(StatsView):
stats = (
(
"labelFullDpsWeapon",
lambda: fit.getWeaponDps(spoolType=SpoolType.SCALE, spoolAmount=1).total,
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"),
@@ -173,27 +173,29 @@ class FirepowerViewFull(StatsView):
3, 0, 0, "%s DPS", "DPS"),
(
"labelFullVolleyTotal",
lambda: fit.getTotalVolley(spoolType=SpoolType.SCALE, spoolAmount=1).total,
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"),
(
"labelFullDpsTotal",
lambda: fit.getTotalDps(spoolType=SpoolType.SCALE, spoolAmount=1).total,
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"))
counter = 0
for labelName, val, preSpoolVal, postSpoolVal, prec, lowest, highest, valueFormat, statName in stats:
for labelName, val, preSpoolVal, fullSpoolVal, prec, lowest, highest, valueFormat, statName in stats:
label = getattr(self, labelName)
preSpoolVal = preSpoolVal() if fit is not None else 0
postSpoolVal = postSpoolVal() if fit is not None else 0
val = val() if fit is not None else 0
preSpoolVal = preSpoolVal() if fit is not None else 0
fullSpoolVal = fullSpoolVal() if fit is not None else 0
# TODO: temporary override, should be removed when spoolup settings are implemented
val = fullSpoolVal
if self._cachedValues[counter] != val:
valueStr = formatAmount(val, prec, lowest, highest)
label.SetLabel(valueFormat % valueStr)
valueStrTooltip = dpsToolTip(preSpoolVal, postSpoolVal, statName, (prec, lowest, highest))
valueStrTooltip = dpsToolTip(preSpoolVal, fullSpoolVal, statName, (prec, lowest, highest))
if valueStrTooltip:
label.SetToolTip(wx.ToolTip(valueStrTooltip))
self._cachedValues[counter] = val

55
gui/builtinStatsViews/outgoingViewFull.py
View File

@@ -22,6 +22,7 @@ import wx
from gui.statsView import StatsView
from gui.bitmap_loader import BitmapLoader
from gui.utils.numberFormatter import formatAmount
from eos.utils.spoolSupport import SpoolType
class OutgoingViewFull(StatsView):
@@ -51,10 +52,10 @@ class OutgoingViewFull(StatsView):
counter = 0
rr_list = [
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor GJ/s per second transferred remotely."),
("RemoteShield", "Shield:", "shieldActive", "Shield hitpoints per second repaired remotely."),
("RemoteArmor", "Armor:", "armorActive", "Armor hitpoints per second repaired remotely."),
("RemoteHull", "Hull:", "hullActive", "Hull hitpoints per second repaired remotely."),
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor GJ per second restored remotely"),
("RemoteShield", "Shield:", "shieldActive", "Shield HP per second repaired remotely"),
("RemoteArmor", "Armor:", "armorActive", "Armor HP per second repaired remotely"),
("RemoteHull", "Hull:", "hullActive", "Hull HP per second repaired remotely"),
]
for outgoingType, label, image, tooltip in rr_list:
@@ -81,23 +82,43 @@ class OutgoingViewFull(StatsView):
# If we did anything intresting, we'd update our labels to reflect the new fit's stats here
stats = [
("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, "%s HP/s", None),
("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, "%s HP/s", None),
("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, "%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, "%s GJ/s", None),
]
(
"labelRemoteArmor",
lambda: fit.getRemoteReps().get("Armor"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Armor", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Armor", 0),
3, 0, 0, "%s HP/s", None),
(
"labelRemoteShield",
lambda: fit.getRemoteReps().get("Shield"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Shield", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Shield", 0),
3, 0, 0, "%s HP/s", None),
(
"labelRemoteHull",
lambda: fit.getRemoteReps().get("Hull"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Hull", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Hull", 0),
3, 0, 0, "%s HP/s", None),
(
"labelRemoteCapacitor",
lambda: fit.getRemoteReps().get("Capacitor"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Capacitor", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Capacitor", 0),
3, 0, 0, "%s GJ/s", None)]
counter = 0
for labelName, value, prec, lowest, highest, valueFormat, altFormat in stats:
for labelName, val, preSpoolVal, fullSpoolVal, prec, lowest, highest, valueFormat, altFormat in stats:
label = getattr(self, labelName)
value = value() if fit is not None else 0
value = value if value is not None else 0
if self._cachedValues[counter] != value:
valueStr = formatAmount(value, prec, lowest, highest)
val = val() if fit is not None else 0
preSpoolVal = preSpoolVal() if fit is not None else 0
fullSpoolVal = fullSpoolVal() if fit is not None else 0
# TODO: temporary override, should be removed when spoolup settings are implemented
val = fullSpoolVal
if self._cachedValues[counter] != val:
valueStr = formatAmount(val, prec, lowest, highest)
label.SetLabel(valueFormat % valueStr)
tipStr = valueFormat % valueStr if altFormat is None else altFormat % value
label.SetToolTip(wx.ToolTip(tipStr))
self._cachedValues[counter] = value
self._cachedValues[counter] = val
counter += 1
self.panel.Layout()
self.headerPanel.Layout()

55
gui/builtinStatsViews/outgoingViewMinimal.py
View File

@@ -21,6 +21,7 @@
import wx
from gui.statsView import StatsView
from gui.utils.numberFormatter import formatAmount
from eos.utils.spoolSupport import SpoolType
class OutgoingViewMinimal(StatsView):
@@ -50,10 +51,10 @@ class OutgoingViewMinimal(StatsView):
counter = 0
rr_list = [
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor GJ/s per second transferred remotely."),
("RemoteShield", "Shield:", "shieldActive", "Shield hitpoints per second repaired remotely."),
("RemoteArmor", "Armor:", "armorActive", "Armor hitpoints per second repaired remotely."),
("RemoteHull", "Hull:", "hullActive", "Hull hitpoints per second repaired remotely."),
("RemoteCapacitor", "Capacitor:", "capacitorInfo", "Capacitor GJ per second restored remotely"),
("RemoteShield", "Shield:", "shieldActive", "Shield HP per second repaired remotely"),
("RemoteArmor", "Armor:", "armorActive", "Armor HP per second repaired remotely"),
("RemoteHull", "Hull:", "hullActive", "Hull HP per second repaired remotely"),
]
for outgoingType, label, image, tooltip in rr_list:
@@ -80,23 +81,43 @@ class OutgoingViewMinimal(StatsView):
# If we did anything intresting, we'd update our labels to reflect the new fit's stats here
stats = [
("labelRemoteArmor", lambda: fit.remoteReps["Armor"], 3, 0, 0, "%s HP/s", None),
("labelRemoteShield", lambda: fit.remoteReps["Shield"], 3, 0, 0, "%s HP/s", None),
("labelRemoteHull", lambda: fit.remoteReps["Hull"], 3, 0, 0, "%s HP/s", None),
("labelRemoteCapacitor", lambda: fit.remoteReps["Capacitor"], 3, 0, 0, "%s GJ/s", None),
]
(
"labelRemoteArmor",
lambda: fit.getRemoteReps().get("Armor"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Armor", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Armor", 0),
3, 0, 0, "%s HP/s", None),
(
"labelRemoteShield",
lambda: fit.getRemoteReps().get("Shield"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Shield", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Shield", 0),
3, 0, 0, "%s HP/s", None),
(
"labelRemoteHull",
lambda: fit.getRemoteReps().get("Hull"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Hull", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Hull", 0),
3, 0, 0, "%s HP/s", None),
(
"labelRemoteCapacitor",
lambda: fit.getRemoteReps().get("Capacitor"),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=0).get("Capacitor", 0),
lambda: fit.getRemoteReps(spoolType=SpoolType.SCALE, spoolAmount=1).get("Capacitor", 0),
3, 0, 0, "%s GJ/s", None)]
counter = 0
for labelName, value, prec, lowest, highest, valueFormat, altFormat in stats:
for labelName, val, preSpoolVal, fullSpoolVal, prec, lowest, highest, valueFormat, altFormat in stats:
label = getattr(self, labelName)
value = value() if fit is not None else 0
value = value if value is not None else 0
if self._cachedValues[counter] != value:
valueStr = formatAmount(value, prec, lowest, highest)
val = val() if fit is not None else 0
preSpoolVal = preSpoolVal() if fit is not None else 0
fullSpoolVal = fullSpoolVal() if fit is not None else 0
# TODO: temporary override, should be removed when spoolup settings are implemented
val = fullSpoolVal
if self._cachedValues[counter] != val:
valueStr = formatAmount(val, prec, lowest, highest)
label.SetLabel(valueFormat % valueStr)
tipStr = valueFormat % valueStr if altFormat is None else altFormat % value
label.SetToolTip(wx.ToolTip(tipStr))
self._cachedValues[counter] = value
self._cachedValues[counter] = val
counter += 1
self.panel.Layout()
self.headerPanel.Layout()