r14462 - in /1.3/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py -- August 26, 2011 - 08:50

Author: bugman
Date: Fri Aug 26 08:50:33 2011
New Revision: 14462

URL: http://svn.gna.org/viewcvs/relax?rev=14462&view=rev
Log:
The auto-analysis GUI pages are now waiting for the data pipe to be created.

This fixes race conditions.


Modified:
    1.3/gui/analyses/auto_model_free.py
    1.3/gui/analyses/auto_noe.py
    1.3/gui/analyses/auto_rx_base.py

Modified: 1.3/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_model_free.py?rev=14462&r1=14461&r2=14462&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_model_free.py (original)
+++ 1.3/gui/analyses/auto_model_free.py Fri Aug 26 08:50:33 2011
@@ -168,10 +168,10 @@
 
         # New data container.
         if data_index == None:
-            # First create the data pipe if not already in existence (if 
this fails, then no data is set up).
-            if not has_pipe(pipe_name) and not 
protected_exec(self.gui.interpreter.queue, 'pipe.create', pipe_name, 'mf'):
-                self.init_flag = False
-                return
+            # First create the data pipe if not already in existence.
+            if not has_pipe(pipe_name):
+                self.gui.interpreter.queue('pipe.create', pipe_name, 'mf')
+                self.gui.interpreter.flush()
 
             # Generate a storage container in the relax data store, and 
alias it for easy access.
             data_index = ds.relax_gui.analyses.add('model-free')

Modified: 1.3/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_noe.py?rev=14462&r1=14461&r2=14462&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_noe.py (original)
+++ 1.3/gui/analyses/auto_noe.py Fri Aug 26 08:50:33 2011
@@ -95,10 +95,10 @@
 
         # New data container.
         if data_index == None:
-            # First create the data pipe if not already in existence (if 
this fails, then no data is set up).
-            if not has_pipe(pipe_name) and not 
protected_exec(self.gui.interpreter.queue, 'pipe.create', pipe_name, 'noe'):
-                self.init_flag = False
-                return
+            # First create the data pipe if not already in existence.
+            if not has_pipe(pipe_name):
+                self.gui.interpreter.queue('pipe.create', pipe_name, 'noe')
+                self.gui.interpreter.flush()
 
             # Generate a storage container in the relax data store, and 
alias it for easy access.
             data_index = ds.relax_gui.analyses.add('NOE')

Modified: 1.3/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_rx_base.py?rev=14462&r1=14461&r2=14462&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_rx_base.py (original)
+++ 1.3/gui/analyses/auto_rx_base.py Fri Aug 26 08:50:33 2011
@@ -94,10 +94,10 @@
 
         # New data container.
         if data_index == None:
-            # First create the data pipe if not already in existence (if 
this fails, then no data is set up).
-            if not has_pipe(pipe_name) and not 
protected_exec(self.gui.interpreter.queue, 'pipe.create', pipe_name, 
'relax_fit'):
-                self.init_flag = False
-                return
+            # First create the data pipe if not already in existence.
+            if not has_pipe(pipe_name):
+                self.gui.interpreter.queue('pipe.create', pipe_name, 
'relax_fit')
+                self.gui.interpreter.flush()
 
             # Generate a storage container in the relax data store, and 
alias it for easy access.
             data_index = ds.relax_gui.analyses.add(self.label)