r13316 - in /branches/gui_testing/gui/analyses: auto_noe.py auto_rx_base.py execute.py -- June 29, 2011 - 17:37

Author: bugman
Date: Wed Jun 29 17:37:02 2011
New Revision: 13316

URL: http://svn.gna.org/viewcvs/relax?rev=13316&view=rev
Log:
The run() thread (and pseudo-thread) method has been shifted to the Execute 
class.

The derived classes must now provide the run_analysis() method.


Modified:
    branches/gui_testing/gui/analyses/auto_noe.py
    branches/gui_testing/gui/analyses/auto_rx_base.py
    branches/gui_testing/gui/analyses/execute.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=13316&r1=13315&r2=13316&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Wed Jun 29 17:37:02 2011
@@ -473,7 +473,7 @@
 class Execute_noe(Execute):
     """The NOE analysis execution object."""
 
-    def run(self):
+    def run_analysis(self):
         """Execute the calculation."""
 
         # Controller.

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=13316&r1=13315&r2=13316&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Wed Jun 29 17:37:02 2011
@@ -369,7 +369,7 @@
 class Execute_rx(Execute):
     """The Rx analysis execution object."""
 
-    def run(self):
+    def run_analysis(self):
         """Execute the calculation."""
 
         # Controller.

Modified: branches/gui_testing/gui/analyses/execute.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/execute.py?rev=13316&r1=13315&r2=13316&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/execute.py (original)
+++ branches/gui_testing/gui/analyses/execute.py Wed Jun 29 17:37:02 2011
@@ -71,3 +71,10 @@
 
         # Execute the run() method.
         self.run()
+
+
+    def run(self):
+        """Execute the thread (or pseudo-thread)."""
+
+        # Execute the analysis.
+        self.run_analysis()