Bläddra i källkod

wxGUI: improve time formatting (when command finished)
(merge https://trac.osgeo.org/grass/changeset/49048 from devbr6)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49050 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 13 år sedan
förälder
incheckning
111f09aec3
1 ändrade filer med 11 tillägg och 3 borttagningar
  1. 11 3
      gui/wxpython/gui_modules/goutput.py

+ 11 - 3
gui/wxpython/gui_modules/goutput.py

@@ -776,9 +776,17 @@ class GMConsole(wx.SplitterWindow):
         else:
             try:
                 # Process results here
-                self.WriteCmdLog('(%s) %s (%d sec)' % (str(time.ctime()),
-                                                       _('Command finished'),
-                                                       (time.time() - event.time)))
+                ctime = time.time() - event.time
+                if ctime < 60:
+                    stime = _("%d sec") % int(ctime)
+                else:
+                    mtime = int(ctime / 60)
+                    stime = _("%d min %d sec") % (mtime, 
+                                                  int(ctime - (mtime * 60)))
+                
+                self.WriteCmdLog('(%s) %s (%s)' % (str(time.ctime()),
+                                                   _('Command finished'),
+                                                   (stime)))
             except KeyError:
                 # stopped deamon
                 pass