r13718 - /branches/gui_testing/gui/analyses/wizard.py -- July 19, 2011 - 12:43

Author: bugman
Date: Tue Jul 19 12:43:05 2011
New Revision: 13718

URL: http://svn.gna.org/viewcvs/relax?rev=13718&view=rev
Log:
Fix for the get_data() method - the new analysis wizard pages are now located 
in the class namespace.


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

Modified: branches/gui_testing/gui/analyses/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/wizard.py?rev=13718&r1=13717&r2=13718&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/wizard.py (original)
+++ branches/gui_testing/gui/analyses/wizard.py Tue Jul 19 12:43:05 2011
@@ -49,12 +49,12 @@
         self.wizard = Wiz_window(size_x=850, size_y=700, title='Set 
parameter values')
 
         # Add the new analysis panel.
-        new_page = New_analysis_page(self.wizard)
-        self.wizard.add_page(new_page, apply_button=False)
+        self.new_page = New_analysis_page(self.wizard)
+        self.wizard.add_page(self.new_page, apply_button=False)
 
         # Add the data pipe name panel.
-        pipe_page = Data_pipe_page(self.wizard)
-        self.wizard.add_page(pipe_page, apply_button=False)
+        self.pipe_page = Data_pipe_page(self.wizard)
+        self.wizard.add_page(self.pipe_page, apply_button=False)
 
         # Execute the wizard.
         setup = self.wizard.run(modal=True)
@@ -74,8 +74,8 @@
 
         # Get the data.
         analysis_type = gui_to_str(self.wizard.analysis_type)
-        analysis_name = gui_to_str(new_page.analysis_name.GetValue())
-        pipe_name = gui_to_str(pipe_page.pipe_name.GetValue())
+        analysis_name = gui_to_str(self.new_page.analysis_name.GetValue())
+        pipe_name = gui_to_str(self.pipe_page.pipe_name.GetValue())
 
         # Return it.
         return analysis_type, analysis_name, pipe_name