r20092 - in /branches/relax_disp: ./ user_functions/interatom.py -- June 13, 2013 - 15:13

Author: bugman
Date: Thu Jun 13 15:13:35 2013
New Revision: 20092

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

........
  r20091 | bugman | 2013-06-13 15:13:11 +0200 (Thu, 13 Jun 2013) | 6 lines
  
  Bug fix for the GUI element for the interatom.define user function.
  
  The special spin ID GUI elements can not be set to the get_spin_ids() 
function as then SetValue can
  no longer work for IDs not in the list.  This fixes the 
Mf.test_mf_auto_analysis GUI test.
........

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

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 13 15:13:35 2013
@@ -1,1 +1,1 @@
-/trunk:1-20089
+/trunk:1-20091

Modified: branches/relax_disp/user_functions/interatom.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/interatom.py?rev=20092&r1=20091&r2=20092&view=diff
==============================================================================
--- branches/relax_disp/user_functions/interatom.py (original)
+++ branches/relax_disp/user_functions/interatom.py Thu Jun 13 15:13:35 2013
@@ -115,7 +115,6 @@
     arg_type = "spin ID",
     desc_short = "first spin ID string",
     desc = "The spin ID string for the first spin of the interatomic 
interaction.",
-    wiz_combo_iter = get_spin_ids,
     can_be_none = True
 )
 uf.add_keyarg(
@@ -125,7 +124,6 @@
     arg_type = "spin ID",
     desc_short = "second spin ID string",
     desc = "The spin ID string for the second spin of the interatomic 
interaction.",
-    wiz_combo_iter = get_spin_ids,
     can_be_none = True
 )
 uf.add_keyarg(