Author: bugman Date: Fri Sep 16 16:06:42 2011 New Revision: 14675 URL: http://svn.gna.org/viewcvs/relax?rev=14675&view=rev Log: The Rx peak list wizard now no longer skips to the next page when an error occurs. The sync flag is now set for all the pages. Modified: 1.3/gui/analyses/auto_rx_base.py Modified: 1.3/gui/analyses/auto_rx_base.py URL: http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_rx_base.py?rev=14675&r1=14674&r2=14675&view=diff ============================================================================== --- 1.3/gui/analyses/auto_rx_base.py (original) +++ 1.3/gui/analyses/auto_rx_base.py Fri Sep 16 16:06:42 2011 @@ -303,8 +303,8 @@ self.page_indices = {} # The spectrum.read_intensities page. - self.page_intensity = Read_intensities_page(self.wizard) - self.page_indices['read'] = self.wizard.add_page(self.page_intensity, skip_button=True, proceed_on_error=False, uf_flush=True) + self.page_intensity = Read_intensities_page(self.wizard, sync=True) + self.page_indices['read'] = self.wizard.add_page(self.page_intensity, skip_button=True, proceed_on_error=False) # Error type selection page. self.page_error_type = Spectral_error_type_page(self.wizard) @@ -312,24 +312,24 @@ self.wizard.set_seq_next_fn(self.page_indices['err_type'], self.wizard_page_after_error_type) # The spectrum.replicated page. - page = Replicated_page(self.wizard) + page = Replicated_page(self.wizard, sync=True) self.page_indices['repl'] = self.wizard.add_page(page, skip_button=True, proceed_on_error=False) self.wizard.set_seq_next_fn(self.page_indices['repl'], self.wizard_page_after_repl) page.on_init = self.wizard_update_repl # The spectrum.baseplane_rmsd page. - page = Baseplane_rmsd_page(self.wizard) + page = Baseplane_rmsd_page(self.wizard, sync=True) self.page_indices['rmsd'] = self.wizard.add_page(page, skip_button=True, proceed_on_error=False) self.wizard.set_seq_next_fn(self.page_indices['rmsd'], self.wizard_page_after_rmsd) page.on_init = self.wizard_update_rmsd # The spectrum.integration_points page. - page = Integration_points_page(self.wizard) + page = Integration_points_page(self.wizard, sync=True) self.page_indices['pts'] = self.wizard.add_page(page, skip_button=True, proceed_on_error=False) page.on_init = self.wizard_update_pts # The relax_fit.relax_time page. - page = Relax_time_page(self.wizard) + page = Relax_time_page(self.wizard, sync=True) self.page_indices['relax_time'] = self.wizard.add_page(page, skip_button=False, proceed_on_error=False) page.on_init = self.wizard_update_relax_time