r16329 - in /branches/uf_redesign/user_functions: objects.py pipe.py spectrum.py spin.py -- May 18, 2012 - 10:47

Author: bugman
Date: Fri May 18 10:47:16 2012
New Revision: 16329

URL: http://svn.gna.org/viewcvs/relax?rev=16329&view=rev
Log:
Renamed the user function arg arg wiz_combo_list_size to wiz_combo_list_min.

This will be used by the Combo_list object to ensure a minimum length.


Modified:
    branches/uf_redesign/user_functions/objects.py
    branches/uf_redesign/user_functions/pipe.py
    branches/uf_redesign/user_functions/spectrum.py
    branches/uf_redesign/user_functions/spin.py

Modified: branches/uf_redesign/user_functions/objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/objects.py?rev=16329&r1=16328&r2=16329&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/objects.py (original)
+++ branches/uf_redesign/user_functions/objects.py Fri May 18 10:47:16 2012
@@ -185,7 +185,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_size=None, 
wiz_read_only=None, can_be_none=False, can_be_empty=False, 
none_elements=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_read_only=None, 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.
@@ -219,8 +219,8 @@
         @type wiz_combo_data:           list
         @keyword wiz_combo_iter:        An iterator method for regenerating 
the ComboBox choices.
         @type wiz_combo_iter:           iterator or None
-        @keyword wiz_combo_list_size:   An iterator method for regenerating 
the ComboBox choices.
-        @type wiz_combo_list_size:      iterator or None
+        @keyword wiz_combo_list_min:    The minimum length of the Combo_list 
element.
+        @type wiz_combo_list_min:       int or None
         @keyword wiz_read_only:         A flag which if True means that the 
text of the GUI wizard page element cannot be edited.  If the default of None 
is given, then each UI element will decide for itself what to do.
         @type wiz_read_only:            bool or None
         @keyword can_be_none:           A flag which specifies if the 
argument is allowed to have the None value.
@@ -263,7 +263,7 @@
             arg['wiz_combo_choices'] = wiz_combo_choices
         arg['wiz_combo_data'] = wiz_combo_data
         arg['wiz_combo_iter'] = wiz_combo_iter
-        arg['wiz_combo_list_size'] = wiz_combo_list_size
+        arg['wiz_combo_list_min'] = wiz_combo_list_min
         arg['wiz_read_only'] = wiz_read_only
         arg['can_be_none'] = can_be_none
         arg['can_be_empty'] = can_be_empty

Modified: branches/uf_redesign/user_functions/pipe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/pipe.py?rev=16329&r1=16328&r2=16329&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/pipe.py (original)
+++ branches/uf_redesign/user_functions/pipe.py Fri May 18 10:47:16 2012
@@ -192,7 +192,7 @@
     desc = "An array containing the names of all data pipes to hybridise.",
     wiz_element_type = 'combo_list',
     wiz_combo_iter = pipes.pipe_names,
-    wiz_combo_list_size = 2
+    wiz_combo_list_min = 2
 )
 uf.backend = hybrid_obj._hybridise
 uf.desc = """

Modified: branches/uf_redesign/user_functions/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/spectrum.py?rev=16329&r1=16328&r2=16329&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/spectrum.py (original)
+++ branches/uf_redesign/user_functions/spectrum.py Fri May 18 10:47:16 2012
@@ -407,7 +407,7 @@
     desc = "The list of replicated spectra ID strings.",
     wiz_element_type = 'combo_list',
     wiz_combo_iter = spectrum.get_ids,
-    wiz_combo_list_size = 2,
+    wiz_combo_list_min = 2,
     wiz_read_only = True
 )
 uf.desc = """

Modified: branches/uf_redesign/user_functions/spin.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/spin.py?rev=16329&r1=16328&r2=16329&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/spin.py (original)
+++ branches/uf_redesign/user_functions/spin.py Fri May 18 10:47:16 2012
@@ -208,7 +208,7 @@
     desc = "A list of the atoms (as spin ID strings) that the pseudo-atom is 
composed of.",
     wiz_element_type = "combo_list",
     wiz_combo_iter = get_spin_ids,
-    wiz_combo_list_size = 2,
+    wiz_combo_list_min = 2,
     wiz_read_only = True
 )
 uf.add_keyarg(