r14681 - /1.3/gui/analyses/auto_rx_base.py -- September 16, 2011 - 16:31

Author: bugman
Date: Fri Sep 16 16:31:47 2011
New Revision: 14681

URL: http://svn.gna.org/viewcvs/relax?rev=14681&view=rev
Log:
The spin.name page is now added to the front of the Rx peak list wizard as 
well.

This matches the NOE peak list wizard.


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=14681&r1=14680&r2=14681&view=diff
==============================================================================
--- 1.3/gui/analyses/auto_rx_base.py (original)
+++ 1.3/gui/analyses/auto_rx_base.py Fri Sep 16 16:31:47 2011
@@ -44,11 +44,12 @@
 from gui.base_classes import Container
 from gui.components.spectrum import Spectra_list
 from gui.filedialog import RelaxDirDialog
-from gui.message import error_message, Missing_data
+from gui.message import error_message, Missing_data, Question
 from gui.misc import gui_to_int, gui_to_str, int_to_gui, protected_exec, 
str_to_gui
 from gui import paths
 from gui.user_functions.relax_fit import Relax_time_page
 from gui.user_functions.spectrum import Baseplane_rmsd_page, 
Integration_points_page, Read_intensities_page, Replicated_page
+from gui.user_functions.spin import Name_page
 from gui.wizard import Wiz_window
 
 
@@ -294,13 +295,20 @@
         # Change the cursor to busy.
         wx.BeginBusyCursor()
 
-        # First check that at least a single spin is named!
-        if not are_spins_named():
-            error_message("No spins have been named.  Please use the 
spin.name user function first, otherwise it is unlikely that any data will be 
loaded from the peak intensity file.\n\nThis message can be ignored if the 
generic file format is used and spin names have not been specified.", 
caption='Incomplete setup')
-
         # Initialise a wizard.
         self.wizard = Wiz_window(parent=self.gui, size_x=1000, size_y=800, 
title="Set up the %s peak intensities" % self.label)
         self.page_indices = {}
+
+        # First check that at least a single spin is named!
+        if not are_spins_named():
+            # The message.
+            msg = "No spins have been named.  Please use the spin.name user 
function first, otherwise it is unlikely that any data will be loaded from 
the peak intensity file.\n\nThis message can be ignored if the generic file 
format is used and spin names have not been specified.  Would you like to 
name the spins already loaded into the relax data store?"
+
+            # Ask about naming spins, and add the spin.name user function 
page.
+            if status.show_gui and Question(msg, title="Incomplete setup", 
size=(450, 220), default=True).ShowModal() == wx.ID_YES:
+                page = Name_page(self.wizard, sync=True)
+                self.page_indices['read'] = self.wizard.add_page(page, 
proceed_on_error=False)
+
 
         # The spectrum.read_intensities page.
         self.page_intensity = Read_intensities_page(self.wizard, sync=True)