r13207 - in /branches/gui_testing/gui: analyses/wizard.py relax_gui.py -- June 23, 2011 - 21:22

Author: bugman
Date: Thu Jun 23 21:22:14 2011
New Revision: 13207

URL: http://svn.gna.org/viewcvs/relax?rev=13207&view=rev
Log:
By using the wizard run() status value, the new analysis wizard can handle 
cancellation.


Modified:
    branches/gui_testing/gui/analyses/wizard.py
    branches/gui_testing/gui/relax_gui.py

Modified: branches/gui_testing/gui/analyses/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/wizard.py?rev=13207&r1=13206&r2=13207&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/wizard.py (original)
+++ branches/gui_testing/gui/analyses/wizard.py Thu Jun 23 21:22:14 2011
@@ -57,7 +57,9 @@
         wizard.add_page(pipe_page, apply_button=False)
 
         # Execute the wizard.
-        wizard.run()
+        setup = wizard.run()
+        if not setup:
+            return
 
         # Get the data.
         analysis_type = wizard.analysis_type

Modified: branches/gui_testing/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/relax_gui.py?rev=13207&r1=13206&r2=13207&view=diff
==============================================================================
--- branches/gui_testing/gui/relax_gui.py (original)
+++ branches/gui_testing/gui/relax_gui.py Thu Jun 23 21:22:14 2011
@@ -358,7 +358,14 @@
 
         # Initialise the analysis wizard, and obtain the user specified data.
         wizard = Analysis_wizard()
-        analysis_type, analysis_name, pipe_name = wizard.run()
+        data = wizard.run()
+
+        # Failure, so do nothing.
+        if data == None:
+            return
+
+        # Unpack the data.
+        analysis_type, analysis_name, pipe_name = data
 
         # Initialise the new analysis.
         self.new_analysis(analysis_type, analysis_name)