r21333 - /trunk/gui/uf_objects.py -- October 29, 2013 - 18:27

Author: bugman
Date: Tue Oct 29 18:27:40 2013
New Revision: 21333

URL: http://svn.gna.org/viewcvs/relax?rev=21333&view=rev
Log:
Proper fix for the structure.add_atom user function.

The 'float_object' argument type is now supported in the GUI.


Modified:
    trunk/gui/uf_objects.py

Modified: trunk/gui/uf_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/uf_objects.py?rev=21333&r1=21332&r2=21333&view=diff
==============================================================================
--- trunk/gui/uf_objects.py (original)
+++ trunk/gui/uf_objects.py Tue Oct 29 18:27:40 2013
@@ -561,15 +561,15 @@
                 self.uf_args[arg['name']] = Selector_bool(name=arg['name'], 
parent=self, element_type=arg['wiz_element_type'], sizer=sizer, desc=desc, 
tooltip=arg['desc'], default=arg['default'], divider=self._div_left, 
height_element=self.height_element)
 
             # Sequence types.
-            elif arg['py_type'] in ['float_list', 'int_list', 'num_list', 
'str_list', 'float_tuple', 'int_tuple', 'num_tuple', 'str_tuple', 
'float_array', 'int_array', 'float_or_float_list', 'int_or_int_list', 
'num_or_num_list', 'str_or_str_list', 'float_or_float_tuple', 
'int_or_int_tuple', 'num_or_num_tuple', 'str_or_str_tuple', 'val_or_list']:
+            elif arg['py_type'] in ['float_list', 'int_list', 'num_list', 
'str_list', 'float_tuple', 'int_tuple', 'num_tuple', 'str_tuple', 
'float_array', 'int_array', 'float_or_float_list', 'int_or_int_list', 
'num_or_num_list', 'str_or_str_list', 'float_or_float_tuple', 
'int_or_int_tuple', 'num_or_num_tuple', 'str_or_str_tuple', 'val_or_list', 
'float_object']:
                 # The sequence type.
-                if arg['py_type'] in ['float_list', 'int_list', 'num_list', 
'str_list', 'float_array', 'int_array', 'float_or_float_list', 
'int_or_int_list', 'num_or_num_list', 'str_or_str_list', 'val_or_list']:
+                if arg['py_type'] in ['float_list', 'int_list', 'num_list', 
'str_list', 'float_array', 'int_array', 'float_or_float_list', 
'int_or_int_list', 'num_or_num_list', 'str_or_str_list', 'val_or_list', 
'float_object']:
                     seq_type = 'list'
                 else:
                     seq_type = 'tuple'
 
                 # The value type.
-                if arg['py_type'] in ['float_list', 'num_list', 
'float_tuple', 'num_tuple', 'float_array', 'float_or_float_list', 
'num_or_num_list', 'float_or_float_tuple', 'num_or_num_tuple']:
+                if arg['py_type'] in ['float_list', 'num_list', 
'float_tuple', 'num_tuple', 'float_array', 'float_or_float_list', 
'num_or_num_list', 'float_or_float_tuple', 'num_or_num_tuple', 
'float_object']:
                     value_type = 'float'
                 elif arg['py_type'] in ['int_list', 'int_tuple', 
'int_array', 'int_or_int_list', 'int_or_int_tuple']:
                     value_type = 'int'