r13573 - in /branches/gui_testing/gui/analyses: auto_noe.py auto_rx_base.py -- July 13, 2011 - 10:25

Author: bugman
Date: Wed Jul 13 10:25:43 2011
New Revision: 13573

URL: http://svn.gna.org/viewcvs/relax?rev=13573&view=rev
Log:
The data pipe creation in the auto NOE, R1 and R2 analysis pages is now 
protected.

This creation is at the start, prior to data initialisation, so that if 
errors occur, no analysis
page data is created.


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

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=13573&r1=13572&r2=13573&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Wed Jul 13 10:25:43 2011
@@ -80,6 +80,11 @@
         # Store the main class.
         self.gui = gui
 
+        # First create the data pipe (if this fails, then no data is set up).
+        status = 
protected_exec(self.gui.user_functions.interpreter.pipe.create, pipe_name, 
'noe')
+        if not status:
+            return
+
         # New data container.
         if data_index == None:
             # Generate a storage container in the relax data store, and 
alias it for easy access.
@@ -98,9 +103,6 @@
             ds.relax_gui.analyses[data_index].save_dir = self.gui.launch_dir
             ds.relax_gui.analyses[data_index].results_list = []
 
-            # Create the data pipe.
-            self.gui.user_functions.interpreter.pipe.create(pipe_name, 'noe')
-
         # Alias the data.
         self.data = ds.relax_gui.analyses[data_index]
         self.data_index = data_index

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=13573&r1=13572&r2=13573&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Wed Jul 13 10:25:43 2011
@@ -46,7 +46,7 @@
 from gui.derived_wx_classes import StructureTextCtrl
 from gui.filedialog import opendir
 from gui.message import error_message, missing_data
-from gui.misc import add_border, gui_to_str, str_to_gui
+from gui.misc import add_border, gui_to_str, protected_exec, str_to_gui
 from gui import paths
 from gui.settings import load_sequence
 
@@ -78,6 +78,11 @@
         # Store the main class.
         self.gui = gui
 
+        # First create the data pipe (if this fails, then no data is set up).
+        status = 
protected_exec(self.gui.user_functions.interpreter.pipe.create, pipe_name, 
'relax_fit')
+        if not status:
+            return
+
         # New data container.
         if data_index == None:
             # Generate a storage container in the relax data store, and 
alias it for easy access.
@@ -95,9 +100,6 @@
             ds.relax_gui.analyses[data_index].relax_times = []
             ds.relax_gui.analyses[data_index].save_dir = self.gui.launch_dir
             ds.relax_gui.analyses[data_index].results_list = []
-
-            # Create the data pipe.
-            self.gui.user_functions.interpreter.pipe.create(pipe_name, 
'relax_fit')
 
         # Alias the data.
         self.data = ds.relax_gui.analyses[data_index]