Author: bugman Date: Sun Apr 21 18:49:10 2013 New Revision: 19556 URL: http://svn.gna.org/viewcvs/relax?rev=19556&view=rev Log: Merged revisions 19555 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r19555 | bugman | 2013-04-21 18:48:39 +0200 (Sun, 21 Apr 2013) | 3 lines Simplified the wizard_update_noe_spectrum_type() method as in the previous commit. ........ Modified: branches/relax_disp/ (props changed) branches/relax_disp/gui/wizards/peak_intensity.py Propchange: branches/relax_disp/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Sun Apr 21 18:49:10 2013 @@ -1,1 +1,1 @@ -/trunk:1-19553 +/trunk:1-19555 Modified: branches/relax_disp/gui/wizards/peak_intensity.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/wizards/peak_intensity.py?rev=19556&r1=19555&r2=19556&view=diff ============================================================================== --- branches/relax_disp/gui/wizards/peak_intensity.py (original) +++ branches/relax_disp/gui/wizards/peak_intensity.py Sun Apr 21 18:49:10 2013 @@ -205,20 +205,6 @@ return self._num_pages + 1 - def wizard_update_noe_spectrum_type(self): - """Update the noe.spectrum_type page based on previous data.""" - - # The spectrum.read_intensities page. - page = self.get_page(self.page_indices['read']) - - # Set the spectrum ID. - id = page.uf_args['spectrum_id'].GetValue() - - # Set the ID in the noe.spectrum_type page. - page = self.get_page(self.page_indices['spectrum_type']) - page.uf_args['spectrum_id'].SetValue(id) - - def wizard_update_ids(self, page_key=None, arg_key='spectrum_id', index=None): """Update the spectrum ID on the page specified by the key based on previous data. @@ -242,6 +228,13 @@ page.uf_args[arg_key].SetValue(id) else: page.uf_args[arg_key].SetValue(value=id, index=index) + + + def wizard_update_noe_spectrum_type(self): + """Update the noe.spectrum_type page based on previous data.""" + + # Update the spectrum ID. + self.wizard_update_ids(page_key='spectrum_type') def wizard_update_pts(self):