r23497 - /trunk/gui/uf_objects.py -- May 28, 2014 - 11:28

Author: tlinnet
Date: Wed May 28 11:28:30 2014
New Revision: 23497

URL: http://svn.gna.org/viewcvs/relax?rev=23497&view=rev
Log:
Moved py_type "list_val_or_list_of_list_val" to 2D sequence types.

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=23497&r1=23496&r2=23497&view=diff
==============================================================================
--- trunk/gui/uf_objects.py     (original)
+++ trunk/gui/uf_objects.py     Wed May 28 11:28:30 2014
@@ -565,15 +565,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', 
'float_object', 'list_val_or_list_of_list_val']:
+            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', 
'float_object', 'list_val_or_list_of_list_val']:
+                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', 
'float_object', 'list_val_or_list_of_list_val']:
+                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'
@@ -595,15 +595,15 @@
                 self.uf_args[arg['name']] = Sequence(name=arg['name'], 
parent=self, default=arg['default'], element_type=arg['wiz_element_type'], 
seq_type=seq_type, value_type=value_type, dim=dim, min=arg['min'], 
max=arg['max'], sizer=sizer, desc=desc, 
combo_choices=arg['wiz_combo_choices'], combo_data=arg['wiz_combo_data'], 
combo_list_min=arg['wiz_combo_list_min'], tooltip=arg['desc'], 
single_value=single_value, divider=self._div_left, 
height_element=self.height_element, read_only=arg['wiz_read_only'], 
can_be_none=arg['can_be_none'])
 
             # 2D sequence types.
-            elif arg['py_type'] in ['float_list_of_lists', 
'int_list_of_lists', 'num_list_of_lists', 'str_list_of_lists', 
'float_tuple_of_tuples', 'int_tuple_of_tuples', 'num_tuple_of_tuples', 
'str_tuple_of_tuples', 'float_matrix', 'int_matrix']:
+            elif arg['py_type'] in ['float_list_of_lists', 
'int_list_of_lists', 'num_list_of_lists', 'str_list_of_lists', 
'float_tuple_of_tuples', 'int_tuple_of_tuples', 'num_tuple_of_tuples', 
'str_tuple_of_tuples', 'float_matrix', 'int_matrix', 
'list_val_or_list_of_list_val']:
                 # The sequence type.
-                if arg['py_type'] in ['float_list_of_lists', 
'int_list_of_lists', 'num_list_of_lists', 'str_list_of_lists', 
'float_matrix', 'int_matrix']:
+                if arg['py_type'] in ['float_list_of_lists', 
'int_list_of_lists', 'num_list_of_lists', 'str_list_of_lists', 
'float_matrix', 'int_matrix', 'list_val_or_list_of_list_val']:
                     seq_type = 'list'
                 else:
                     seq_type = 'tuple'
 
                 # The value type.
-                if arg['py_type'] in ['float_list_of_lists', 
'float_tuple_of_tuples', 'num_list_of_lists', 'num_tuple_of_tuples', 
'float_matrix']:
+                if arg['py_type'] in ['float_list_of_lists', 
'float_tuple_of_tuples', 'num_list_of_lists', 'num_tuple_of_tuples', 
'float_matrix', 'list_val_or_list_of_list_val']:
                     value_type = 'float'
                 elif arg['py_type'] in ['int_list_of_lists', 
'int_tuple_of_tuples', 'int_matrix']:
                     value_type = 'int'