r3849 - /1.3/generic_fns/sequence.py -- November 23, 2007 - 15:38

Author: bugman
Date: Fri Nov 23 15:38:54 2007
New Revision: 3849

URL: http://svn.gna.org/viewcvs/relax?rev=3849&view=rev
Log:
The display() function now works (although not fully).


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=3849&r1=3848&r2=3849&view=diff
==============================================================================
--- 1.3/generic_fns/sequence.py (original)
+++ 1.3/generic_fns/sequence.py Fri Nov 23 15:38:54 2007
@@ -27,19 +27,19 @@
 
 
 
-def display(run=None):
-    """Function for displaying the sequence."""
+def display():
+    """Function for displaying the molecule, residue, and spin sequence."""
 
     # Test if the sequence data is loaded.
-    if not relax_data_store.res.has_key(run):
-        raise RelaxNoSequenceError, run
+    if not count_spins():
+        raise RelaxNoSequenceError
 
     # Print a header.
-    print "%-8s%-8s%-10s" % ("Number", "Name", "Selected")
-
-    # Print the sequence.
-    for i in xrange(len(relax_data_store.res[run])):
-        print "%-8i%-8s%-10i" % (relax_data_store.res[run][i].num, 
relax_data_store.res[run][i].name, relax_data_store.res[run][i].select)
+    print "%-8s%-8s%-8s%-8s%-8s%-10s" % ("Mol name", "Res num", "Res name", 
"Spin num", "Spin name", "Selected")
+
+    # Print the data.
+    for spin, mol_name, res_num, res_name in spin_loop(full_info=True):
+        print "%-8s%-8i%-8s%-8i%-8s%-10i" % (mol_name, res_num, res_name, 
spin.num, spin.name, spin.select)
 
 
 def load_PDB_sequence():