From c63bcc2b28bda8dcf325fd49e61c18b65ec1cfc9 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Wed, 20 Oct 2010 16:58:43 +0200 Subject: [PATCH] Format capacitor discharge time correctly --- gui/builtinStatsViews/capacitorViewFull.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py index 0bafc1dfb..cd51a1d80 100644 --- a/gui/builtinStatsViews/capacitorViewFull.py +++ b/gui/builtinStatsViews/capacitorViewFull.py @@ -125,7 +125,14 @@ class CapacitorViewFull(StatsView): t = "%.1f%%-%.1f%%" % capState s = "" else: - t = ("%ds" if not capStable else "%.1f%%") % capState + if capStable: + t = "%.1f%%" % capState + else: + if capState > 60: + t = "%dm%ds" % divmod(capState, 60) + else: + t = "%ds" % capState + s = "Stable: " if capStable else "Lasts " getattr(self, lblNameTime % panel).SetLabel(t)