Re: r23481 - /trunk/gui/uf_objects.py -- May 27, 2014

Hi Troels,

This is close to the correct fix, but not quite right.  The
'list_val_or_list_of_list_val' fits into the "2D sequence types"
below.  Have a look at what it does for the GUI - just search for user
functions with other 2D sequence types, and open those up.  You will
probably need to modify the user function argument options in
user_functions.dx to set it up correctly.  Again see the other user
functions with these 2D sequence arguments for inspiration.

Cheers!

Edward



On 27 May 2014 18:47,  <tlinnet@xxxxxxxxxxxxx> wrote:

Author: tlinnet
Date: Tue May 27 18:47:30 2014
New Revision: 23481

URL: http://svn.gna.org/viewcvs/relax?rev=23481&view=rev
Log:
Added py_type "list_val_or_list_of_list_val" to be handled in GUI 
uf_objects.

Bug #22035: (https://gna.org/bugs/?22035) The dx.map user function is 
broken 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=23481&r1=23480&r2=23481&view=diff
==============================================================================
--- trunk/gui/uf_objects.py     (original)
+++ trunk/gui/uf_objects.py     Tue May 27 18:47: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']:
+            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']:
                 # 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']:
+                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']:
                     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']:
+                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']:
                     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'


_______________________________________________
relax (http://www.nmr-relax.com)

This is the relax-commits mailing list
relax-commits@xxxxxxx

To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits

Re: r23481 - /trunk/gui/uf_objects.py

Header

Content

Related Messages