r19564 - in /branches/relax_disp: ./ user_functions/frq.py -- April 21, 2013 - 21:05

Author: bugman
Date: Sun Apr 21 21:05:12 2013
New Revision: 19564

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

........
  r19563 | bugman | 2013-04-21 21:04:41 +0200 (Sun, 21 Apr 2013) | 6 lines
  
  Fixes for the frq.set user function in the GUI.
  
  The ID list is now set to the spectrum IDs, and the frequency units are no 
longer all fused into one
  string.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/user_functions/frq.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 21 21:05:12 2013
@@ -1,1 +1,1 @@
-/trunk:1-19557
+/trunk:1-19563

Modified: branches/relax_disp/user_functions/frq.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/frq.py?rev=19564&r1=19563&r2=19564&view=diff
==============================================================================
--- branches/relax_disp/user_functions/frq.py (original)
+++ branches/relax_disp/user_functions/frq.py Sun Apr 21 21:05:12 2013
@@ -24,6 +24,7 @@
 
 # relax module imports.
 import pipe_control.frq
+from pipe_control import spectrum
 from graphics import WIZARD_IMAGE_PATH
 from user_functions.data import Uf_info; uf_info = Uf_info()
 from user_functions.objects import Desc_container
@@ -43,7 +44,10 @@
     name = "id",
     py_type = "str",
     desc_short = "experiment ID",
-    desc = "The experiment identification string."
+    desc = "The experiment identification string.",
+    wiz_element_type = 'combo',
+    wiz_combo_iter = spectrum.get_ids,
+    wiz_read_only = True
 )
 uf.add_keyarg(
     name = "frq",
@@ -60,8 +64,8 @@
     wiz_element_type = "combo",
     wiz_combo_choices = [
         "Hz",
-        "kHz"
-        "MHz"
+        "kHz",
+        "MHz",
         "GHz"
     ],
     wiz_read_only = False