r14031 - in /branches/gui_testing/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py -- August 01, 2011 - 12:40

Author: bugman
Date: Mon Aug  1 12:40:04 2011
New Revision: 14031

URL: http://svn.gna.org/viewcvs/relax?rev=14031&view=rev
Log:
The text redirection to the relax controller is set up in the controller, so 
this removes repetition.

The redirection was happening in the controller first, and then again in each 
analysis.


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=14031&r1=14030&r2=14031&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Mon Aug  1 12:40:04 
2011
@@ -46,7 +46,6 @@
 from gui.analyses.results_analysis import model_free_results, see_results
 from gui.base_classes import Container
 from gui.components.relax_data import Relax_data_list
-from gui.controller import Redirect_text
 from gui.filedialog import opendir
 from gui.fonts import font
 from gui.message import error_message, Question, Missing_data
@@ -679,13 +678,6 @@
 
     def run_analysis(self):
         """Execute the calculation."""
-
-        # Controller.
-        if not status.debug and not status.test_mode:
-            # Redirect relax output and errors to the controller.
-            redir = Redirect_text(self.gui.controller)
-            sys.stdout = redir
-            sys.stderr = redir
 
         # Loop over the models.
         for global_model in self.data.global_models:

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=14031&r1=14030&r2=14031&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Mon Aug  1 12:40:04 2011
@@ -42,7 +42,6 @@
 from gui.analyses.results_analysis import color_code_noe
 from gui.base_classes import Container
 from gui.components.spectrum import Spectra_list
-from gui.controller import Redirect_text
 from gui.filedialog import opendir
 from gui.message import error_message, Missing_data
 from gui.misc import gui_to_str, protected_exec, str_to_gui
@@ -455,13 +454,6 @@
     def run_analysis(self):
         """Execute the calculation."""
 
-        # Controller.
-        if not status.debug and not status.test_mode:
-            # Redirect relax output and errors to the controller.
-            redir = Redirect_text(self.gui.controller)
-            sys.stdout = redir
-            sys.stderr = redir
-
         # Execute.
         NOE_calc(pipe_name=self.data.pipe_name, 
file_root=self.data.file_root, results_dir=self.data.save_dir, 
save_state=False)
 

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=14031&r1=14030&r2=14031&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Mon Aug  1 12:40:04 2011
@@ -42,7 +42,6 @@
 from gui.analyses.execute import Execute
 from gui.base_classes import Container
 from gui.components.spectrum import Spectra_list
-from gui.controller import Redirect_text
 from gui.filedialog import opendir
 from gui.message import error_message, Missing_data
 from gui.misc import gui_to_int, gui_to_str, int_to_gui, protected_exec, 
str_to_gui
@@ -481,13 +480,6 @@
     def run_analysis(self):
         """Execute the calculation."""
 
-        # Controller.
-        if not status.debug and not status.test_mode:
-            # Redirect relax output and errors to the controller.
-            redir = Redirect_text(self.gui.controller)
-            sys.stdout = redir
-            sys.stderr = redir
-
         # Execute.
         Relax_fit(pipe_name=self.data.pipe_name, 
file_root=self.data.file_root, results_dir=self.data.save_dir, 
grid_inc=self.data.inc, mc_sim_num=self.data.mc_sim_num, view_plots=False)