Author: bugman
Date: Sun Apr 21 18:23:47 2013
New Revision: 19551
URL: http://svn.gna.org/viewcvs/relax?rev=19551&view=rev
Log:
Merged revisions 19549-19550 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19549 | bugman | 2013-04-21 18:20:36 +0200 (Sun, 21 Apr 2013) | 3 lines
Small docstring fix.
........
r19550 | bugman | 2013-04-21 18:21:48 +0200 (Sun, 21 Apr 2013) | 3 lines
Small rearrangements in the gui.wizards.peak_intensity module.
........
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:23:47 2013
@@ -1,1 +1,1 @@
-/trunk:1-19544
+/trunk:1-19550
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=19551&r1=19550&r2=19551&view=diff
==============================================================================
--- branches/relax_disp/gui/wizards/peak_intensity.py (original)
+++ branches/relax_disp/gui/wizards/peak_intensity.py Sun Apr 21 18:23:47 2013
@@ -50,14 +50,14 @@
def __init__(self, parent=None, size_x=1000, size_y=750, title="Peak
intensity loading wizard", noe=False, relax_fit=False):
"""Set up the peak intensity loading wizard.
- @keyword parent: The parent window.
- @type parent: wx.Window instance
- @keyword size_x: The width of the wizard.
- @type size_x: int
- @keyword size_y: The height of the wizard.
- @type size_y: int
- @keyword title: The title of the wizard dialog.
- @type title: str
+ @keyword parent: The parent window.
+ @type parent: wx.Window instance
+ @keyword size_x: The width of the wizard.
+ @type size_x: int
+ @keyword size_y: The height of the wizard.
+ @type size_y: int
+ @keyword title: The title of the wizard dialog.
+ @type title: str
@keyword noe: A flag which when True will enable the
steady-state NOE portions of the wizard.
@type noe: bool
@keyword relax_fit: A flag which when True will enable the
relaxation curve-fitting portions of the wizard.
@@ -117,17 +117,19 @@
self.page_indices['pts'] = self.add_page(page, skip_button=True,
proceed_on_error=False)
page.on_init = self.wizard_update_pts
- # The relax_fit.relax_time page.
+ # NOE pages.
+ if self.noe_flag:
+ # The noe.spectrum_type page.
+ page = uf_store['noe.spectrum_type'].create_page(self, sync=True)
+ self.page_indices['spectrum_type'] = self.add_page(page,
skip_button=False, proceed_on_error=False)
+ page.on_display_post = self.wizard_update_noe_spectrum_type
+
+ # Relaxation curve-fitting pages.
if self.relax_fit_flag:
+ # The relax_fit.relax_time page.
page = uf_store['relax_fit.relax_time'].create_page(self,
sync=True)
self.page_indices['relax_time'] = self.add_page(page,
skip_button=False, proceed_on_error=False)
page.on_init = self.wizard_update_relax_fit_relax_time
-
- # The noe.spectrum_type page.
- if self.noe_flag:
- page = uf_store['noe.spectrum_type'].create_page(self, sync=True)
- self.page_indices['spectrum_type'] = self.add_page(page,
skip_button=False, proceed_on_error=False)
- page.on_display_post = self.wizard_update_noe_spectrum_type
# Reset the cursor.
if wx.IsBusy():
@@ -165,13 +167,13 @@
if int_method != 'height':
return self.page_indices['pts']
+ # Skip to the noe.spectrum_type page.
+ elif self.noe_flag:
+ return self.page_indices['spectrum_type']
+
# Skip to the relax_fit.relax_time page.
elif self.relax_fit_flag:
return self.page_indices['relax_time']
-
- # Skip to the noe.spectrum_type page.
- elif self.noe_flag:
- return self.page_indices['spectrum_type']
# Nothing left, so run off the end.
else:
@@ -190,13 +192,13 @@
if int_method != 'height':
return self.page_indices['pts']
+ # Skip to the noe.spectrum_type page.
+ elif self.noe_flag:
+ return self.page_indices['spectrum_type']
+
# Skip to the relax_fit.relax_time page.
elif self.relax_fit_flag:
return self.page_indices['relax_time']
-
- # Skip to the noe.spectrum_type page.
- elif self.noe_flag:
- return self.page_indices['spectrum_type']
# Nothing left, so run off the end.
else:
r19551 - in /branches/relax_disp: ./ gui/wizards/peak_intensity.py