r24537 - in /branches/frame_order_cleanup: ./ lib/timing.py user_functions/sys_info.py -- July 15, 2014 - 12:42

Author: bugman
Date: Tue Jul 15 12:42:35 2014
New Revision: 24537

URL: http://svn.gna.org/viewcvs/relax?rev=24537&view=rev
Log:
Merged revisions 24535-24536 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r24535 | bugman | 2014-07-15 12:36:47 +0200 (Tue, 15 Jul 2014) | 5 lines
  
  Created the time user function.
  
  This is just a shortcut for printing out the output of the time.asctime() 
function.
........
  r24536 | bugman | 2014-07-15 12:38:40 +0200 (Tue, 15 Jul 2014) | 3 lines
  
  The time user function now uses the chronometer Oxygen icon in the GUI.
........

Added:
    branches/frame_order_cleanup/lib/timing.py
      - copied unchanged from r24536, trunk/lib/timing.py
Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/user_functions/sys_info.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 15 12:42:35 2014
@@ -1 +1 @@
-/trunk:1-24528
+/trunk:1-24536

Modified: branches/frame_order_cleanup/user_functions/sys_info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/sys_info.py?rev=24537&r1=24536&r2=24537&view=diff
==============================================================================
--- branches/frame_order_cleanup/user_functions/sys_info.py     (original)
+++ branches/frame_order_cleanup/user_functions/sys_info.py     Tue Jul 15 
12:42:35 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2011-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2011-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -24,6 +24,7 @@
 
 # relax module imports.
 from info import print_sys_info
+from lib.timing import print_time
 from user_functions.data import Uf_info; uf_info = Uf_info()
 from user_functions.objects import Desc_container
 
@@ -41,3 +42,18 @@
 uf.gui_icon = "oxygen.actions.help-about"
 uf.wizard_size = (700, 400)
 uf.wizard_apply_button = False
+
+
+# The time user function.
+uf = uf_info.add_uf('time')
+uf.title = "Display the current time."
+uf.title_short = "Current time."
+uf.display = True
+# Description.
+uf.desc.append(Desc_container())
+uf.desc[-1].add_paragraph("This user function will display the current time 
which can be useful for timing long calculations by having time information 
in any saved log files.")
+uf.backend = print_time
+uf.menu_text = "&time"
+uf.gui_icon = "oxygen.actions.chronometer"
+uf.wizard_size = (700, 400)
+uf.wizard_apply_button = False