r11205 - /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py -- May 19, 2010 - 09:11

Author: michaelbieri
Date: Wed May 19 09:11:00 2010
New Revision: 11205

URL: http://svn.gna.org/viewcvs/relax?rev=11205&view=rev
Log:
Included 'cancel' function of model-free model selection dialog.

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=11205&r1=11204&r2=11205&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Wed May 19 
09:11:00 2010
@@ -657,6 +657,10 @@
                     print("Optimisation failed.")
                     return
 
+        elif which_model == None:
+            # Cancel.
+            return
+
         # Single global model selected.
         else:
             # All models, excluding the final run.
@@ -840,7 +844,7 @@
         # Redirect relax output and errors to the controller.
         redir = Redirect_text(self.gui.controller)
         sys.stdout = redir
-        #sys.stderr = 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') )