Author: bugman
Date: Tue Sep 20 18:04:18 2011
New Revision: 14719
URL: http://svn.gna.org/viewcvs/relax?rev=14719&view=rev
Log:
The NOE and Rx peak list wizards have been reverted to the form prior to
r14689.
This, combined with the previous commit causing on_apply() to do nothing by
default, should now
finally eliminate the Mac OS X bug causing a crash in these wizards.
Modified:
1.3/gui/analyses/auto_noe.py
1.3/gui/analyses/auto_rx_base.py
Modified: 1.3/gui/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/auto_noe.py?rev=14719&r1=14718&r2=14719&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_noe.py (original)
+++ 1.3/gui/analyses/auto_noe.py Tue Sep 20 18:04:18 2011
@@ -442,8 +442,7 @@
# Set the ID in the spectrum.replicated page.
page = self.wizard.get_page(self.page_indices['pts'])
- if page.spectrum_id.GetSelection() != 1 and not
gui_to_str(page.spectrum_id.GetValue()):
- page.spectrum_id.SetStringSelection(str_to_gui(id))
+ page.spectrum_id.SetStringSelection(str_to_gui(id))
def wizard_update_repl(self):
@@ -457,8 +456,7 @@
# Set the ID in the spectrum.replicated page.
page = self.wizard.get_page(self.page_indices['repl'])
- if page.spectrum_id.GetSelection() != -1 and not
gui_to_str(page.spectrum_id_boxes[0].GetValue()):
- page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
+ page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
def wizard_update_rmsd(self):
@@ -472,8 +470,7 @@
# Set the ID in the spectrum.baseplane_rmsd page.
page = self.wizard.get_page(self.page_indices['rmsd'])
- if page.spectrum_id.GetSelection() != -1 and not
gui_to_str(page.spectrum_id.GetValue()):
- page.spectrum_id.SetStringSelection(str_to_gui(id))
+ page.spectrum_id.SetStringSelection(str_to_gui(id))
def wizard_update_spectrum_type(self):
@@ -487,8 +484,7 @@
# Set the ID in the noe.spectrum_type page.
page = self.wizard.get_page(self.page_indices['spectrum_type'])
- if page.spectrum_id.GetSelection() != -1 and not
gui_to_str(page.spectrum_id.GetValue()):
- page.spectrum_id.SetStringSelection(str_to_gui(id))
+ page.spectrum_id.SetStringSelection(str_to_gui(id))
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=14719&r1=14718&r2=14719&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_rx_base.py (original)
+++ 1.3/gui/analyses/auto_rx_base.py Tue Sep 20 18:04:18 2011
@@ -470,8 +470,7 @@
# Set the ID in the spectrum.replicated page.
page = self.wizard.get_page(self.page_indices['pts'])
- if page.spectrum_id.GetSelection() != -1 and not
gui_to_str(page.spectrum_id.GetValue()):
- page.spectrum_id.SetStringSelection(str_to_gui(id))
+ page.spectrum_id.SetStringSelection(str_to_gui(id))
def wizard_update_repl(self):
@@ -485,8 +484,7 @@
# Set the ID in the spectrum.replicated page.
page = self.wizard.get_page(self.page_indices['repl'])
- if page.spectrum_id.GetSelection() != -1 and not
gui_to_str(page.spectrum_id_boxes[0].GetValue()):
- page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
+ page.spectrum_id_boxes[0].SetStringSelection(str_to_gui(id))
def wizard_update_rmsd(self):
@@ -500,8 +498,7 @@
# Set the ID in the spectrum.baseplane_rmsd page.
page = self.wizard.get_page(self.page_indices['rmsd'])
- if page.spectrum_id.GetSelection() != -1 and not
gui_to_str(page.spectrum_id.GetValue()):
- page.spectrum_id.SetStringSelection(str_to_gui(id))
+ page.spectrum_id.SetStringSelection(str_to_gui(id))
def wizard_update_relax_time(self):
@@ -515,8 +512,7 @@
# Set the ID in the relax_fit.relax_time page.
page = self.wizard.get_page(self.page_indices['relax_time'])
- if page.spectrum_id.GetSelection() != -1 and not
gui_to_str(page.spectrum_id.GetValue()):
- page.spectrum_id.SetStringSelection(str_to_gui(id))
+ page.spectrum_id.SetStringSelection(str_to_gui(id))
r14719 - in /1.3/gui/analyses: auto_noe.py auto_rx_base.py