r11903 - in /branches/bieri_gui/gui_bieri/analyses: auto_model_free.py auto_noe.py auto_rx_base.py -- December 19, 2010 - 17:27

Author: bugman
Date: Sun Dec 19 17:27:53 2010
New Revision: 11903

URL: http://svn.gna.org/viewcvs/relax?rev=11903&view=rev
Log:
Error messages are displayed for all the 'Execute relax' buttons when the 
execution lock is set.


Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
    branches/bieri_gui/gui_bieri/analyses/auto_noe.py
    branches/bieri_gui/gui_bieri/analyses/auto_rx_base.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=11903&r1=11902&r2=11903&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Sun Dec 19 
17:27:53 2010
@@ -37,6 +37,7 @@
 from auto_analyses.dauvergne_protocol import dAuvergne_protocol
 from data import Relax_data_store; ds = Relax_data_store()
 from relax_io import DummyFileObject
+from status import Status
 
 
 # relax GUI module imports.
@@ -47,7 +48,7 @@
 from gui_bieri.controller import Redirect_text, Thread_container
 from gui_bieri.derived_wx_classes import StructureTextCtrl
 from gui_bieri.filedialog import opendir, openfile
-from gui_bieri.message import missing_data
+from gui_bieri.message import error_message, missing_data
 from gui_bieri.paths import IMAGE_PATH
 
 
@@ -652,6 +653,13 @@
         @type event:    wx event
         """
 
+        # relax execution lock.
+        status = Status()
+        if status.exec_lock.locked():
+            error_message("relax is currently executing.", "relax execution 
lock")
+            event.Skip()
+            return
+
         # The required data has not been set up correctly or has not all 
been given, so clean up and exit.
         if not self.check_entries():
             event.Skip()

Modified: branches/bieri_gui/gui_bieri/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_noe.py?rev=11903&r1=11902&r2=11903&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_noe.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_noe.py Sun Dec 19 17:27:53 2010
@@ -38,6 +38,7 @@
 from data import Relax_data_store; ds = Relax_data_store()
 from relax_errors import RelaxError
 from relax_io import DummyFileObject
+from status import Status
 
 # relaxGUI module imports.
 from gui_bieri.analyses.project import open_file
@@ -540,6 +541,13 @@
         @type event:    wx event
         """
 
+        # relax execution lock.
+        status = Status()
+        if status.exec_lock.locked():
+            error_message("relax is currently executing.", "relax execution 
lock")
+            event.Skip()
+            return
+
         # Synchronise the frame data to the relax data store.
         self.sync_ds(upload=True)
 

Modified: branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py?rev=11903&r1=11902&r2=11903&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_rx_base.py Sun Dec 19 17:27:53 
2010
@@ -37,6 +37,7 @@
 from auto_analyses.relax_fit import Relax_fit
 from data import Relax_data_store; ds = Relax_data_store()
 from relax_io import DummyFileObject
+from status import Status
 
 # relaxGUI module imports.
 from gui_bieri.analyses.project import open_file
@@ -420,6 +421,13 @@
         @type event:    wx event
         """
 
+        # relax execution lock.
+        status = Status()
+        if status.exec_lock.locked():
+            error_message("relax is currently executing.", "relax execution 
lock")
+            event.Skip()
+            return
+
         # Synchronise the frame data to the relax data store.
         self.sync_ds(upload=True)