r13305 - /branches/gui_testing/gui/analyses/auto_rx_base.py -- June 29, 2011 - 15:59

Author: bugman
Date: Wed Jun 29 15:59:00 2011
New Revision: 13305

URL: http://svn.gna.org/viewcvs/relax?rev=13305&view=rev
Log:
The Rx data is now assembled outside of the thread and a message dialog is 
shown for missing data.

The missing data was previously printed to stdout (the relax controller or 
shell), but is now shown
in a dialog.


Modified:
    branches/gui_testing/gui/analyses/auto_rx_base.py

Modified: branches/gui_testing/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_rx_base.py?rev=13305&r1=13304&r2=13305&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Wed Jun 29 15:59:00 2011
@@ -257,6 +257,14 @@
         # Synchronise the frame data to the relax data store.
         self.sync_ds(upload=True)
 
+        # Assemble all the data needed for the Relax_fit class.
+        data, missing = self.assemble_data()
+
+        # Missing data.
+        if len(missing):
+            missing_data(missing)
+            return
+
         # Display the relax controller.
         if not status.debug:
             self.gui.controller.Show()
@@ -284,17 +292,6 @@
             wx.CallAfter(self.gui.controller.log_panel.AppendText, 
(header+'\n\n'))
             time.sleep(0.5)
 
-        # Assemble all the data needed for the Relax_fit class.
-        data, complete, missing = self.assemble_data()
-
-        # Incomplete.
-        if not complete:
-            print 'Aborting Rx caclulation as the following informations are 
missing:\n'
-            for i in range(len(missing)):
-                print '\t'+missing[i]
-            print ''
-            return
-
         # Execute.
         Relax_fit(file_root=self.filename, pipe_name=data.pipe_name, 
seq_args=data.seq_args, results_directory=data.save_dir, 
file_names=data.file_names, relax_times=data.relax_times, 
int_method=data.int_method, mc_num=data.mc_num, pdb_file=data.structure_file, 
unresolved=data.unresolved, view_plots = False, heteronuc=data.heteronuc, 
proton=data.proton, load_spin_ids=data.load_spin_ids, inc=data.inc)