r13220 - in /branches/gui_testing/gui: analyses/wizard.py relax_gui.py -- June 24, 2011 - 14:46

Author: bugman
Date: Fri Jun 24 14:46:05 2011
New Revision: 13220

URL: http://svn.gna.org/viewcvs/relax?rev=13220&view=rev
Log:
The new analysis wizard is now accessible via self.gui.new_wizard.wizard.

This will allow for GUI testing of this wizard.


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=13220&r1=13219&r2=13220&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/wizard.py (original)
+++ branches/gui_testing/gui/analyses/wizard.py Fri Jun 24 14:46:05 2011
@@ -46,23 +46,23 @@
         """
 
         # Set up the wizard.
-        wizard = Wiz_window(size_x=850, size_y=700, title='Set parameter 
values')
+        self.wizard = Wiz_window(size_x=850, size_y=700, title='Set 
parameter values')
 
         # Add the new analysis panel.
-        new_page = New_analysis_page(wizard)
-        wizard.add_page(new_page, apply_button=False)
+        new_page = New_analysis_page(self.wizard)
+        self.wizard.add_page(new_page, apply_button=False)
 
         # Add the data pipe name panel.
-        pipe_page = Data_pipe_page(wizard)
-        wizard.add_page(pipe_page, apply_button=False)
+        pipe_page = Data_pipe_page(self.wizard)
+        self.wizard.add_page(pipe_page, apply_button=False)
 
         # Execute the wizard.
-        setup = wizard.run()
+        setup = self.wizard.run()
         if not setup:
             return
 
         # Get the data.
-        analysis_type = wizard.analysis_type
+        analysis_type = self.wizard.analysis_type
         analysis_name = gui_to_str(new_page.analysis_name.GetValue())
         pipe_name = gui_to_str(pipe_page.pipe_name.GetValue())
 

Modified: branches/gui_testing/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/relax_gui.py?rev=13220&r1=13219&r2=13220&view=diff
==============================================================================
--- branches/gui_testing/gui/relax_gui.py (original)
+++ branches/gui_testing/gui/relax_gui.py Fri Jun 24 14:46:05 2011
@@ -357,8 +357,8 @@
         """
 
         # Initialise the analysis wizard, and obtain the user specified data.
-        wizard = Analysis_wizard()
-        data = wizard.run()
+        self.new_wizard = Analysis_wizard()
+        data = self.new_wizard.run()
 
         # Failure, so do nothing.
         if data == None:
@@ -369,6 +369,9 @@
 
         # Initialise the new analysis.
         self.new_analysis(analysis_type, analysis_name, pipe_name)
+
+        # Delete the wizard data.
+        del self.new_wizard
 
 
     def new_analysis(self, analysis_type=None, analysis_name=None, 
pipe_name=None, index=None):