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

Merge pull request #790 from IndictionEve/miningyieldperhour

Browse Source 
Mining Yield "per hour".
This commit is contained in:
Ryan Holmes
2016-12-02 00:52:00 -05:00
committed by GitHub
parent b76e8df1bf 7493b92d83
commit 7bd6344359
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/builtinStatsViews/miningyieldViewFull.py
View File

@@ -124,9 +124,9 @@ class MiningYieldViewFull(StatsView):
def refreshPanel(self, fit):
#If we did anything intresting, we'd update our labels to reflect the new fit's stats here
stats = (("labelFullminingyieldMiner", lambda: fit.minerYield, 3, 0, 0, u"%s m\u00B3/s",None),
("labelFullminingyieldDrone", lambda: fit.droneYield, 3, 0, 0, u"%s m\u00B3/s", None),
("labelFullminingyieldTotal", lambda: fit.totalYield, 3, 0, 0, u"%s m\u00B3/s", None))
stats = (("labelFullminingyieldMiner", lambda: fit.minerYield * 3600, 3, 0, 0, u"%s m\u00B3/h",None),
("labelFullminingyieldDrone", lambda: fit.droneYield * 3600, 3, 0, 0, u"%s m\u00B3/h", None),
("labelFullminingyieldTotal", lambda: fit.totalYield * 3600, 3, 0, 0, u"%s m\u00B3/h", None))
counter = 0
for labelName, value, prec, lowest, highest, valueFormat, altFormat in stats:

12
gui/builtinViewColumns/misc.py
View File

@@ -405,9 +405,9 @@ class Miscellanea(ViewColumn):
cycleTime = stuff.cycleTime
if not miningAmount or not cycleTime:
return "", None
minePerSec = float(miningAmount) * 1000 / cycleTime
text = "{0}/s".format(formatAmount(minePerSec, 3, 0, 3))
tooltip = "Yield per second"
minePerHour = (float(miningAmount) * 1000 / cycleTime) * 3600
text = "{0}/h".format(formatAmount(minePerHour, 3, 0, 3))
tooltip = "Mining Yield per hour"
return text, tooltip
elif itemGroup == "Logistic Drone":
armorAmount = stuff.getModifiedItemAttr("armorDamageAmount")
@@ -442,9 +442,9 @@ class Miscellanea(ViewColumn):
cycleTime = stuff.getModifiedItemAttr("duration")
if not miningAmount or not cycleTime:
return "", None
minePerSec = float(miningAmount) * 1000 / cycleTime
text = "{0}/s".format(formatAmount(minePerSec, 3, 0, 3))
tooltip = "Yield per second"
minePerHour = (float(miningAmount) * 1000 / cycleTime) * 3600
text = "{0}/h".format(formatAmount(minePerHour, 3, 0, 3))
tooltip = "Mining Yield per hour"
return text, tooltip
elif itemGroup == "Micro Jump Drive":
cycleTime = stuff.getModifiedItemAttr("duration") / 1000