r21334 - in /branches/relax_disp: ./ gui/uf_objects.py user_functions/structure.py -- October 29, 2013 - 18:28

Author: bugman
Date: Tue Oct 29 18:28:21 2013
New Revision: 21334

URL: http://svn.gna.org/viewcvs/relax?rev=21334&view=rev
Log:
Merged revisions 21332-21333 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21332 | bugman | 2013-10-29 18:25:14 +0100 (Tue, 29 Oct 2013) | 17 lines
  
  Reverted r21330 as this fix was not correct.
  
  The command used was:
  svn merge -r21330:r21329 .
  
  .....
    r21330 | bugman | 2013-10-29 17:57:36 +0100 (Tue, 29 Oct 2013) | 6 lines
    Changed paths:
       M /trunk/user_functions/structure.py
    
    Fix for a fatal bug in the rarely used structure.add_atom user function.
    
    The position argument in the user function definitions was incorrectly 
defined causing the user
    function to be non-functional.
  .....
........
  r21333 | bugman | 2013-10-29 18:27:40 +0100 (Tue, 29 Oct 2013) | 5 lines
  
  Proper fix for the structure.add_atom user function.
  
  The 'float_object' argument type is now supported in the GUI.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/uf_objects.py
    branches/relax_disp/user_functions/structure.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 29 18:28:21 2013
@@ -1,1 +1,1 @@
-/trunk:1-21330
+/trunk:1-21333

Modified: branches/relax_disp/gui/uf_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/uf_objects.py?rev=21334&r1=21333&r2=21334&view=diff
==============================================================================
--- branches/relax_disp/gui/uf_objects.py (original)
+++ branches/relax_disp/gui/uf_objects.py Tue Oct 29 18:28:21 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'

Modified: branches/relax_disp/user_functions/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/structure.py?rev=21334&r1=21333&r2=21334&view=diff
==============================================================================
--- branches/relax_disp/user_functions/structure.py (original)
+++ branches/relax_disp/user_functions/structure.py Tue Oct 29 18:28:21 2013
@@ -74,7 +74,7 @@
 )
 uf.add_keyarg(
     name = "pos",
-    py_type = "float",
+    py_type = "float_object",
     desc_short = "atomic position",
     desc = "The atomic coordinates."
 )