r13812 - in /branches/gui_testing/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py -- July 21, 2011 - 17:18

Author: bugman
Date: Thu Jul 21 17:18:09 2011
New Revision: 13812

URL: http://svn.gna.org/viewcvs/relax?rev=13812&view=rev
Log:
The auto-analysis initialisation can now associate with a pre-existing data 
pipe.

This is useful for bringing a data pipe into an analysis tab.


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

Modified: branches/gui_testing/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_model_free.py?rev=13812&r1=13811&r2=13812&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Thu Jul 21 17:18:09 
2011
@@ -33,6 +33,7 @@
 from auto_analyses import dauvergne_protocol
 from data import Relax_data_store; ds = Relax_data_store()
 from doc_builder import LIST, PARAGRAPH, SECTION, SUBSECTION, TITLE
+from generic_fns.pipes import has_pipe
 from status import Status; status = Status()
 
 # relax GUI module imports.
@@ -173,8 +174,8 @@
 
         # New data container.
         if data_index == None:
-            # First create the data pipe (if this fails, then no data is set 
up).
-            if not protected_exec(self.gui.interpreter.pipe.create, 
pipe_name, 'noe'):
+            # 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.pipe.create, pipe_name, 'noe'):
                 self.init_flag = False
                 return
 

Modified: branches/gui_testing/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_noe.py?rev=13812&r1=13811&r2=13812&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Thu Jul 21 17:18:09 2011
@@ -33,6 +33,7 @@
 from auto_analyses.noe import NOE_calc
 from data import Relax_data_store; ds = Relax_data_store()
 from generic_fns.mol_res_spin import are_spins_named
+from generic_fns.pipes import has_pipe
 from status import Status; status = Status()
 
 # relaxGUI module imports.
@@ -84,8 +85,8 @@
 
         # New data container.
         if data_index == None:
-            # First create the data pipe (if this fails, then no data is set 
up).
-            if not protected_exec(self.gui.interpreter.pipe.create, 
pipe_name, 'noe'):
+            # 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.pipe.create, pipe_name, 'noe'):
                 self.init_flag = False
                 return
 

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=13812&r1=13811&r2=13812&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Thu Jul 21 17:18:09 2011
@@ -34,6 +34,7 @@
 from auto_analyses.relax_fit import Relax_fit
 from data import Relax_data_store; ds = Relax_data_store()
 from generic_fns.mol_res_spin import are_spins_named
+from generic_fns.pipes import has_pipe
 from status import Status; status = Status()
 
 # relax GUI module imports.
@@ -83,8 +84,8 @@
 
         # New data container.
         if data_index == None:
-            # First create the data pipe (if this fails, then no data is set 
up).
-            if not protected_exec(self.gui.interpreter.pipe.create, 
pipe_name, 'relax_fit'):
+            # 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.pipe.create, pipe_name, 'relax_fit'):
                 self.init_flag = False
                 return