diff --git a/gui/builtinStatsViews/miningyieldViewFull.py b/gui/builtinStatsViews/miningyieldViewFull.py index ab4df69e9..65ce9ae96 100644 --- a/gui/builtinStatsViews/miningyieldViewFull.py +++ b/gui/builtinStatsViews/miningyieldViewFull.py @@ -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: diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 0c7f9ef8f..bea5c945c 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -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