r18849 - in /trunk: generic_fns/structure/main.py user_functions/structure.py -- March 18, 2013 - 13:41

Author: bugman
Date: Mon Mar 18 13:41:23 2013
New Revision: 18849

URL: http://svn.gna.org/viewcvs/relax?rev=18849&view=rev
Log:
Added the merge flag to the structure.read_pdb user function.

This currently does nothing.


Modified:
    trunk/generic_fns/structure/main.py
    trunk/user_functions/structure.py

Modified: trunk/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/main.py?rev=18849&r1=18848&r2=18849&view=diff
==============================================================================
--- trunk/generic_fns/structure/main.py (original)
+++ trunk/generic_fns/structure/main.py Mon Mar 18 13:41:23 2013
@@ -487,7 +487,7 @@
     write_spin_data(file=sys.stdout, mol_names=mol_names, res_nums=res_nums, 
res_names=res_names, spin_nums=spin_nums, spin_names=spin_names)
 
 
-def read_pdb(file=None, dir=None, read_mol=None, set_mol_name=None, 
read_model=None, set_model_num=None, parser='internal', alt_loc=None, 
verbosity=1, fail=True):
+def read_pdb(file=None, dir=None, read_mol=None, set_mol_name=None, 
read_model=None, set_model_num=None, parser='internal', alt_loc=None, 
verbosity=1, merge=False, fail=True):
     """The PDB loading function.
 
     Parsers
@@ -519,6 +519,8 @@
     @type alt_loc:          str or None
     @keyword verbosity:     The amount of information to print to screen.  
Zero corresponds to minimal output while higher values increase the amount of 
output.  The default value is 1.
     @type verbosity:        int
+    @keyword merge:         A flag which if set to True will try to merge 
the PDB structure into the currently loaded structures.
+    @type merge:            bool
     @raise RelaxFileError:  If the fail flag is set, then a RelaxError is 
raised if the PDB file does not exist.
     """
 

Modified: trunk/user_functions/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/structure.py?rev=18849&r1=18848&r2=18849&view=diff
==============================================================================
--- trunk/user_functions/structure.py (original)
+++ trunk/user_functions/structure.py Mon Mar 18 13:41:23 2013
@@ -665,6 +665,13 @@
     desc_short = "alternate location indicator",
     desc = "The PDB ATOM record 'Alternate location indicator' field value.",
     can_be_none = True
+)
+uf.add_keyarg(
+    name = "merge",
+    default = False,
+    py_type = "bool",
+    desc_short = "merge structure flag",
+    desc = "A flag which if set to True will try to merge the PDB structure 
into the currently loaded structures."
 )
 # Description.
 uf.desc.append(Desc_container())
@@ -696,7 +703,7 @@
 uf.backend = generic_fns.structure.main.read_pdb
 uf.menu_text = "read_&pdb"
 uf.gui_icon = "oxygen.actions.document-open"
-uf.wizard_height_desc = 400
+uf.wizard_height_desc = 360
 uf.wizard_size = (1000, 750)
 uf.wizard_image = WIZARD_IMAGE_PATH + 'structure' + sep + 'read_pdb.png'