r5540 - /1.3/generic_fns/sequence.py -- April 10, 2008 - 12:23

Author: bugman
Date: Thu Apr 10 12:23:34 2008
New Revision: 5540

URL: http://svn.gna.org/viewcvs/relax?rev=5540&view=rev
Log:
Updated the display() function.


Modified:
    1.3/generic_fns/sequence.py

Modified: 1.3/generic_fns/sequence.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/sequence.py?rev=5540&r1=5539&r2=5540&view=diff
==============================================================================
--- 1.3/generic_fns/sequence.py (original)
+++ 1.3/generic_fns/sequence.py Thu Apr 10 12:23:34 2008
@@ -29,24 +29,29 @@
 
 
 
-def display(mol_name_col=None, res_num_col=None, res_name_col=None, 
spin_num_col=None, spin_name_col=None, sep=None):
+def display(sep=None, mol_name_flag=False, res_num_flag=False, 
res_name_flag=False, spin_num_flag=False, spin_name_flag=False):
     """Function for displaying the molecule, residue, and/or spin sequence 
data.
 
     This calls the write_body() function to do most of the work.
 
 
-    @param mol_name_col:    The column to contain the molecule name 
information.
-    @type mol_name_col:     int or None
-    @param res_name_col:    The column to contain the residue name 
information.
-    @type res_name_col:     int or None
-    @param res_num_col:     The column to contain the residue number 
information.
-    @type res_num_col:      int or None
-    @param spin_name_col:   The column to contain the spin name information.
-    @type spin_name_col:    int or None
-    @param spin_num_col:    The column to contain the spin number 
information.
-    @type spin_num_col:     int or None
-    @param sep:             The column seperator which, if None, defaults to 
whitespace.
-    @type sep:              str or None
+    @keyword sep:               The column seperator which, if None, 
defaults to whitespace.
+    @type sep:                  str or None
+    @keyword mol_name_flag:     A flag which if True will cause the molecule 
name column to be
+                                written.
+    @type mol_name_flag:        bool
+    @keyword res_num_flag:      A flag which if True will cause the residue 
number column to be
+                                written.
+    @type res_num_flag:         bool
+    @keyword res_name_flag:     A flag which if True will cause the residue 
name column to be
+                                written.
+    @type res_name_flag:        bool
+    @keyword spin_name_flag:    A flag which if True will cause the spin 
name column to be written.
+    @type spin_name_flag:       bool
+    @keyword spin_num_flag:     A flag which if True will cause the spin 
number column to be
+                                written.
+    @type spin_num_flag:        bool
+    @param mol_name_flag:    The column to contain the molecule name 
information.
     """
 
     # Test if the sequence data is loaded.
@@ -54,7 +59,7 @@
         raise RelaxNoSequenceError
 
     # Write the data.
-    write_body(file=sys.stdout, mol_name_col=mol_name_col, 
res_num_col=res_num_col, res_name_col=res_name_col, 
spin_num_col=spin_num_col, spin_name_col=spin_name_col, sep=sep)
+    write_body(file=sys.stdout, sep=sep, mol_name_flag=mol_name_flag, 
res_num_flag=res_num_flag, res_name_flag=res_name_flag, 
spin_num_flag=spin_num_flag, spin_name_flag=spin_name_flag)
 
 
 def read(file=None, dir=None, mol_name_col=None, res_num_col=0, 
res_name_col=1, spin_num_col=None, spin_name_col=None, sep=None):