r14287 - /branches/gui_testing/gui/analyses/execute.py -- August 09, 2011 - 13:46

Author: bugman
Date: Tue Aug  9 13:46:34 2011
New Revision: 14287

URL: http://svn.gna.org/viewcvs/relax?rev=14287&view=rev
Log:
Reverted r14027 and r14033 as the results viewer will soon be launched via an 
observer notification.

The command used was:
svn merge -r14033:r14026 gui/analyses/execute.py

.....
  r14033 | bugman | 2011-08-01 15:26:35 +0200 (Mon, 01 Aug 2011) | 3 lines
  Changed paths:
     M /branches/gui_testing/gui/analyses/execute.py
  
  The opening of the results viewer window after an analysis is now thread 
safe!

.....
  r14027 | bugman | 2011-08-01 11:12:04 +0200 (Mon, 01 Aug 2011) | 3 lines
  Changed paths:
     M /branches/gui_testing/gui/analyses/execute.py
  
  The results display window is now shown at the end of the auto-analysis 
execution.

.....


Modified:
    branches/gui_testing/gui/analyses/execute.py

Modified: branches/gui_testing/gui/analyses/execute.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/execute.py?rev=14287&r1=14286&r2=14287&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/execute.py (original)
+++ branches/gui_testing/gui/analyses/execute.py Tue Aug  9 13:46:34 2011
@@ -27,7 +27,6 @@
 import sys
 from threading import Thread
 from traceback import print_exc
-import wx
 
 # relax module imports.
 from relax_errors import RelaxImplementError
@@ -37,26 +36,23 @@
 class Execute(Thread):
     """The analysis execution object."""
 
-    def __init__(self, gui, data, data_index, results_display=True, 
thread=True):
+    def __init__(self, gui, data, data_index, thread=True):
         """Set up the analysis execution object.
 
-        @param gui:                 The GUI object.
-        @type gui:                  wx object
-        @param data:                The data container with all data for the 
analysis.
-        @type data:                 class instance
-        @param data_index:          The index of the analysis in the relax 
data store.
-        @type data_index:           int
-        @keyword results_display:   A flag which if True will cause the 
results display window to be shown at then end of the execution.
-        @type results_display:      bool
-        @keyword thread:            The flag for turning threading on and 
off.
-        @type thread:               bool
+        @param gui:         The GUI object.
+        @type gui:          wx object
+        @param data:        The data container with all data for the 
analysis.
+        @type data:         class instance
+        @param data_index:  The index of the analysis in the relax data 
store.
+        @type data_index:   int
+        @keyword thread:    The flag for turning threading on and off.
+        @type thread:       bool
         """
 
         # Store the args.
         self.gui = gui
         self.data = data
         self.data_index = data_index
-        self.results_display = results_display
 
         # Threaded execution.
         if thread:
@@ -102,10 +98,12 @@
             if status.exec_lock.locked():
                 status.exec_lock.release()
 
+<<<<<<< .working
         # Display the results viewer.
         if self.results_display:
             wx.CallAfter(self.gui.show_results_viewer, None)
-
+=======
+>>>>>>> .merge-right.r14026
 
     def run_analysis(self):
         """Execute the analysis