r17317 - /branches/frame_order_testing/user_functions/align_tensor.py -- July 25, 2012 - 13:12

Author: bugman
Date: Wed Jul 25 13:12:10 2012
New Revision: 17317

URL: http://svn.gna.org/viewcvs/relax?rev=17317&view=rev
Log:
The align_tensor user functions now use the align_tensor.get_tensor_ids() 
function.

They were previously using align_tensor.get_ids() and returning the alignment 
IDs, causing failures
in a number of GUI tests.


Modified:
    branches/frame_order_testing/user_functions/align_tensor.py

Modified: branches/frame_order_testing/user_functions/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/user_functions/align_tensor.py?rev=17317&r1=17316&r2=17317&view=diff
==============================================================================
--- branches/frame_order_testing/user_functions/align_tensor.py (original)
+++ branches/frame_order_testing/user_functions/align_tensor.py Wed Jul 25 
13:12:10 2012
@@ -106,7 +106,7 @@
     desc_short = "tensor",
     desc = "The alignment tensor identification string.",
     wiz_element_type = 'combo',
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True,
     can_be_none = True
 )
@@ -130,7 +130,7 @@
     desc_short = "tensor",
     desc = "The alignment tensor identification string.",
     wiz_element_type = 'combo',
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True,
     can_be_none = True
 )
@@ -160,7 +160,7 @@
     desc_short = "tensor ID",
     desc = "The alignment tensor identification string.",
     wiz_element_type = 'combo',
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True,
     can_be_none = True
 )
@@ -195,7 +195,10 @@
     name = "align_id",
     py_type = "str",
     desc_short = "alignment ID",
-    desc = "The alignment ID string that the tensor corresponds to."
+    desc = "The alignment ID string that the tensor corresponds to.",
+    wiz_element_type = "combo",
+    wiz_combo_iter = align_tensor.get_tensor_ids,
+    wiz_read_only = False
 )
 uf.add_keyarg(
     name = "domain",
@@ -312,7 +315,7 @@
     desc_short = "alignment tensor IDs",
     desc = "A list of the tensors to apply the calculation to.  If None, all 
tensors are used.",
     wiz_element_type = "combo_list",
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True,
     can_be_none = True
 )
@@ -336,7 +339,7 @@
     desc_short = "full tensor",
     desc = "The full alignment tensor.",
     wiz_element_type = 'combo',
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True
 )
 uf.add_keyarg(
@@ -345,7 +348,7 @@
     desc_short = "reduced tensor",
     desc = "The reduced alignment tensor.",
     wiz_element_type = 'combo',
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True
 )
 # Description.
@@ -370,7 +373,7 @@
     desc_short = "tensor ID",
     desc = "The alignment tensor to assign the domain label to.",
     wiz_element_type = 'combo',
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True,
 )
 uf.add_keyarg(
@@ -413,7 +416,7 @@
     desc_short = "alignment tensor IDs",
     desc = "A list of the tensors to apply the calculation to.  If None, all 
tensors are used.",
     wiz_element_type = "combo_list",
-    wiz_combo_iter = align_tensor.get_ids,
+    wiz_combo_iter = align_tensor.get_tensor_ids,
     wiz_read_only = True,
     can_be_none = True
 )