r13717 - /branches/gui_testing/gui/analyses/wizard.py -- July 19, 2011 - 12:38

Author: bugman
Date: Tue Jul 19 12:38:49 2011
New Revision: 13717

URL: http://svn.gna.org/viewcvs/relax?rev=13717&view=rev
Log:
The assembly of data in the new analysis wizard is now performed by 
get_data().


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=13717&r1=13716&r2=13717&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/wizard.py (original)
+++ branches/gui_testing/gui/analyses/wizard.py Tue Jul 19 12:38:49 2011
@@ -61,12 +61,23 @@
         if not setup:
             return
 
+        # Return the analysis type, analysis name, and pipe name.
+        return get_data()
+
+
+    def get_data(self):
+        """Assemble and return the analysis type, analysis name, and pipe 
name.
+
+        @return:    The analysis type, analysis name, and data pipe name.
+        @rtype:     tuple of str
+        """
+
         # 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())
 
-        # Return the analysis type and pipe name.
+        # Return it.
         return analysis_type, analysis_name, pipe_name