r10521 - /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py -- January 28, 2010 - 14:37

Author: bugman
Date: Thu Jan 28 14:37:31 2010
New Revision: 10521

URL: http://svn.gna.org/viewcvs/relax?rev=10521&view=rev
Log:
Reverted the temporary commit of r10518.

The command used was:
svn merge -r10518:10517 .

.....
  r10518 | bugman | 2010-01-28 14:32:59 +0100 (Thu, 28 Jan 2010) | 5 lines
  Changed paths:
     M /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
  
  Temporary commit - this disables the threaded execution and the IO 
redirection.
  
  Some threading bug is being hidden by a bug in the IO redirection.
.....


Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_model_free.py

Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=10521&r1=10520&r2=10521&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Thu Jan 28 
14:37:31 2010
@@ -799,8 +799,7 @@
         thread_cont = self.gui.calc_threads[-1]
 
         # Start the thread.
-        #id = thread.start_new_thread(self.execute_thread, (), 
{'global_model': global_model, 'automatic': automatic})
-        self.execute_thread(global_model, automatic)
+        id = thread.start_new_thread(self.execute_thread, (), 
{'global_model': global_model, 'automatic': automatic})
 
         # Add the thread info to the container.
         thread_cont.id = id
@@ -823,8 +822,8 @@
 
         # Redirect relax output and errors to the controller.
         redir = Redirect_text(self.gui.controller)
-        #sys.stdout = redir
-        #sys.stderr = redir
+        sys.stdout = redir
+        sys.stderr = redir
 
         # Print a header in the controller.
         wx.CallAfter(self.gui.controller.log_panel.AppendText, ('Starting 
Model-free calculation\n------------------------------------------\n\n') )