r19592 - in /trunk/gui/analyses: auto_model_free.py auto_noe.py auto_rx_base.py base.py -- April 22, 2013 - 23:50

Author: bugman
Date: Mon Apr 22 23:50:29 2013
New Revision: 19592

URL: http://svn.gna.org/viewcvs/relax?rev=19592&view=rev
Log:
Changed the 'Execute relax' button in all analyses in the GUI to 'Execute 
analysis'.

It makes no sense to execute relax as relax has been executing during the 
analysis initialisation
and the user setting up all the data for the analysis.  This is a remnant of 
ancient design of
Michael Bieri's GUI being a separate program to relax, which would execute 
relax with the click of
this button.


Modified:
    trunk/gui/analyses/auto_model_free.py
    trunk/gui/analyses/auto_noe.py
    trunk/gui/analyses/auto_rx_base.py
    trunk/gui/analyses/base.py

Modified: trunk/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_model_free.py?rev=19592&r1=19591&r2=19592&view=diff
==============================================================================
--- trunk/gui/analyses/auto_model_free.py (original)
+++ trunk/gui/analyses/auto_model_free.py Mon Apr 22 23:50:29 2013
@@ -548,7 +548,7 @@
         box.AddStretchSpacer()
 
         # Add the execution GUI element.
-        self.button_exec_relax = self.add_execute_relax(box, self.execute)
+        self.button_exec_relax = self.add_execute_analysis(box, self.execute)
 
         # Return the box.
         return box

Modified: trunk/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_noe.py?rev=19592&r1=19591&r2=19592&view=diff
==============================================================================
--- trunk/gui/analyses/auto_noe.py (original)
+++ trunk/gui/analyses/auto_noe.py Mon Apr 22 23:50:29 2013
@@ -212,7 +212,7 @@
         box.AddStretchSpacer()
 
         # Add the execution GUI element.
-        self.button_exec_relax = self.add_execute_relax(box, self.execute)
+        self.button_exec_relax = self.add_execute_analysis(box, self.execute)
 
         # Return the box.
         return box

Modified: trunk/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_rx_base.py?rev=19592&r1=19591&r2=19592&view=diff
==============================================================================
--- trunk/gui/analyses/auto_rx_base.py (original)
+++ trunk/gui/analyses/auto_rx_base.py Mon Apr 22 23:50:29 2013
@@ -227,7 +227,7 @@
         box.AddStretchSpacer()
 
         # Add the execution GUI element.
-        self.button_exec_relax = self.add_execute_relax(box, self.execute)
+        self.button_exec_relax = self.add_execute_analysis(box, self.execute)
 
         # Return the box.
         return box

Modified: trunk/gui/analyses/base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/base.py?rev=19592&r1=19591&r2=19592&view=diff
==============================================================================
--- trunk/gui/analyses/base.py (original)
+++ trunk/gui/analyses/base.py Mon Apr 22 23:50:29 2013
@@ -129,10 +129,10 @@
         return button
 
 
-    def add_execute_relax(self, box, method):
-        """Create and add the relax execution GUI element to the given box.
-
-        @param box:     The box element to pack the relax execution GUI 
element into.
+    def add_execute_analysis(self, box, method):
+        """Create and add the analysis execution GUI element to the given 
box.
+
+        @param box:     The box element to pack the analysis execution GUI 
element into.
         @type box:      wx.BoxSizer instance
         @param method:  The method to execute when the button is clicked.
         @type method:   method
@@ -147,7 +147,7 @@
         id = wx.NewId()
 
         # The button.
-        button = buttons.ThemedGenBitmapTextButton(self, id, None, " Execute 
relax")
+        button = buttons.ThemedGenBitmapTextButton(self, id, None, " Execute 
analysis")
         button.SetBitmapLabel(wx.Bitmap(paths.IMAGE_PATH+'relax_start.gif', 
wx.BITMAP_TYPE_ANY))
         button.SetFont(font.normal)
         self.gui.Bind(wx.EVT_BUTTON, method, button)