r23085 - in /trunk: prompt/uf_objects.py user_functions/dx.py user_functions/objects.py -- May 08, 2014 - 15:01

Author: tlinnet
Date: Thu May  8 15:01:04 2014
New Revision: 23085

URL: http://svn.gna.org/viewcvs/relax?rev=23085&view=rev
Log:
Completely removed the list_of_lists argument.

task #7791: (https://gna.org/task/index.php?7791 ) the dx.map should accept a 
list of list with values for points.

Modified:
    trunk/prompt/uf_objects.py
    trunk/user_functions/dx.py
    trunk/user_functions/objects.py

Modified: trunk/prompt/uf_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/prompt/uf_objects.py?rev=23085&r1=23084&r2=23085&view=diff
==============================================================================
--- trunk/prompt/uf_objects.py  (original)
+++ trunk/prompt/uf_objects.py  Thu May  8 15:01:04 2014
@@ -164,7 +164,6 @@
             can_be_none = arg['can_be_none']
             can_be_empty = arg['can_be_empty']
             none_elements = arg['none_elements']
-            list_of_lists = arg['list_of_lists']
 
             # Check if the correct Python object type has been supplied.
             if py_type == 'bool':
@@ -188,7 +187,7 @@
             elif py_type == 'list':
                 lib.arg_check.is_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'list_val_or_list_of_list_val':
-                lib.arg_check.is_list_val_or_list_of_list_val(value, 
desc_short, size=dim, can_be_none=can_be_none, can_be_empty=can_be_empty, 
list_of_lists=list_of_lists)
+                lib.arg_check.is_list_val_or_list_of_list_val(value, 
desc_short, size=dim, can_be_none=can_be_none, can_be_empty=can_be_empty, 
list_of_lists=True)
             elif py_type == 'none':
                 lib.arg_check.is_none(value, desc_short)
             elif py_type == 'num':

Modified: trunk/user_functions/dx.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/dx.py?rev=23085&r1=23084&r2=23085&view=diff
==============================================================================
--- trunk/user_functions/dx.py  (original)
+++ trunk/user_functions/dx.py  Thu May  8 15:01:04 2014
@@ -177,7 +177,6 @@
     desc_short = "[x, y, x] point of list of x, y, x points. [[x1, y1, z1], 
[x2, y2, z2]]",
     desc = "An list of parameter values where a point in the map, shown as a 
red sphere, will be placed.  The length of each point must be equal to the 
number of parameters.",
     can_be_none = True,
-    list_of_lists = True
 )
 uf.add_keyarg(
     name = "point_file",

Modified: trunk/user_functions/objects.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/objects.py?rev=23085&r1=23084&r2=23085&view=diff
==============================================================================
--- trunk/user_functions/objects.py     (original)
+++ trunk/user_functions/objects.py     Thu May  8 15:01:04 2014
@@ -391,7 +391,7 @@
         self.__dict__[name] = value
 
 
-    def add_keyarg(self, name=None, default=None, py_type=None, 
arg_type=None, dim=None, min=0, max=1000, desc_short=None, desc=None, 
list_titles=None, wiz_element_type='default', wiz_combo_choices=None, 
wiz_combo_data=None, wiz_combo_iter=None, wiz_combo_list_min=None, 
wiz_filesel_wildcard=FileSelectorDefaultWildcardStr, wiz_filesel_style=None, 
wiz_dirsel_style=DD_DEFAULT_STYLE, wiz_read_only=None, 
wiz_filesel_preview=True, can_be_none=False, can_be_empty=False, 
none_elements=False, list_of_lists=False):
+    def add_keyarg(self, name=None, default=None, py_type=None, 
arg_type=None, dim=None, min=0, max=1000, desc_short=None, desc=None, 
list_titles=None, wiz_element_type='default', wiz_combo_choices=None, 
wiz_combo_data=None, wiz_combo_iter=None, wiz_combo_list_min=None, 
wiz_filesel_wildcard=FileSelectorDefaultWildcardStr, wiz_filesel_style=None, 
wiz_dirsel_style=DD_DEFAULT_STYLE, wiz_read_only=None, 
wiz_filesel_preview=True, can_be_none=False, can_be_empty=False, 
none_elements=False):
         """Wrapper method for adding keyword argument information to the 
container.
 
         @keyword name:                  The name of the argument.
@@ -443,8 +443,6 @@
         @type can_be_empty:             bool
         @keyword none_elements:         A flag which if True allows the 
sequence type object to contain None elements.
         @type none_elements:            bool
-        @keyword list_of_lists:         A flag which if True allows the 
sequence type object to contain list of lists.
-        @type list_of_lists:            bool
         """
 
         # Check that the args have been properly supplied.
@@ -492,4 +490,3 @@
         arg['can_be_none'] = can_be_none
         arg['can_be_empty'] = can_be_empty
         arg['none_elements'] = none_elements
-        arg['list_of_lists'] = list_of_lists