Author: bugman Date: Fri Jun 24 11:06:38 2011 New Revision: 13210 URL: http://svn.gna.org/viewcvs/relax?rev=13210&view=rev Log: Fixed the missing part of passing the pipe name from the new analysis wizard to the tabs. Modified: branches/gui_testing/gui/relax_gui.py Modified: branches/gui_testing/gui/relax_gui.py URL: http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/relax_gui.py?rev=13210&r1=13209&r2=13210&view=diff ============================================================================== --- branches/gui_testing/gui/relax_gui.py (original) +++ branches/gui_testing/gui/relax_gui.py Fri Jun 24 11:06:38 2011 @@ -368,15 +368,15 @@ analysis_type, analysis_name, pipe_name = data # Initialise the new analysis. - self.new_analysis(analysis_type, analysis_name) - - - def new_analysis(self, analysis_type, analysis_name, index=None): + self.new_analysis(analysis_type, analysis_name, pipe_name) + + + def new_analysis(self, analysis_type=None, analysis_name=None, pipe_name=None, index=None): """Initialise a new analysis. - @param analysis_type: The type of analysis to initialise. This can be one of 'noe', 'r1', 'r2', or 'mf'. + @keyword analysis_type: The type of analysis to initialise. This can be one of 'noe', 'r1', 'r2', or 'mf'. @type analysis_type: str - @param analysis_name: The name of the analysis to initialise. + @keyword analysis_name: The name of the analysis to initialise. @type analysis_name: str @keyword index: The index of the analysis in the relax data store (set to None if no data currently exists). @type index: None or int @@ -416,7 +416,7 @@ analysis = classes[analysis_type] # Initialise the class and append it to the analysis window object. - self.analyses.append(analysis(self, analysis_name, self.notebook, index)) + self.analyses.append(analysis(gui=self, notebook=self.notebook, analysis_name=analysis_name, pipe_name=pipe_name, data_index=index)) # Add to the notebook. self.notebook.AddPage(self.analyses[-1].parent, analysis_name)