r16421 - /branches/uf_redesign/test_suite/gui_tests/model_free.py -- May 23, 2012 - 20:10

Author: bugman
Date: Wed May 23 20:10:31 2012
New Revision: 16421

URL: http://svn.gna.org/viewcvs/relax?rev=16421&view=rev
Log:
Fixes to the model-free GUI auto-analysis test.

This includes an attempt to test out the spin viewer window code paths, 
thought that was stopped
short due to a bug in the spin viewer.


Modified:
    branches/uf_redesign/test_suite/gui_tests/model_free.py

Modified: branches/uf_redesign/test_suite/gui_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/test_suite/gui_tests/model_free.py?rev=16421&r1=16420&r2=16421&view=diff
==============================================================================
--- branches/uf_redesign/test_suite/gui_tests/model_free.py (original)
+++ branches/uf_redesign/test_suite/gui_tests/model_free.py Wed May 23 
20:10:31 2012
@@ -71,8 +71,15 @@
         # The data path.
         data_path = status.install_path + sep + 'test_suite' + sep + 
'shared_data' + sep + 'model_free' + sep + 'sphere' + sep
 
+        # Launch the spin viewer window.
+        self.app.gui.show_tree()
+
+        # Run through the spin loading wizard.
+        self.app.gui.spin_viewer.load_spins_wizard()
+        page = self.app.gui.spin_viewer.wizard.get_page(0)
+
         # Load the sequence.
-        self._execute_uf(uf_name='sequence.read', 
file=data_path+'noe.500.out')
+        self._execute_uf(uf_name='sequence.read', 
file=data_path+'noe.500.out', mol_name_col=1, res_num_col=2, res_name_col=3, 
spin_num_col=4, spin_name_col=5)
 
         # Load the relaxation data.
         data = [
@@ -84,7 +91,7 @@
             ['r2.900.out',  'r2_900',  'R2',  900e6]
         ]
         for i in range(len(data)):
-            self._execute_uf(uf_name='relax_data.read', 
file=data_path+data[i][0], ri_id=data[i][1], ri_type=data[i][2], 
frq=data[i][3])
+            self._execute_uf(uf_name='relax_data.read', 
file=data_path+data[i][0], ri_id=data[i][1], ri_type=data[i][2], 
frq=data[i][3], mol_name_col=1, res_num_col=2, res_name_col=3, 
spin_num_col=4, spin_name_col=5, data_col=6, error_col=7)
 
         # Set the values.
         self._execute_uf(uf_name='value.set', param='csa')