r19701 - /trunk/gui/wizards/peak_intensity.py -- May 23, 2013 - 18:35

Author: bugman
Date: Thu May 23 18:35:19 2013
New Revision: 19701

URL: http://svn.gna.org/viewcvs/relax?rev=19701&view=rev
Log:
The peak intensity wizard can now function remotely when the spins are not 
named.

This will be needed for the GUI tests to allow the Question() call to be 
bypassed and still adding
the spin.name user function as the first page of the wizard.  The key for 
spin.name page has also
been fixed so that the page can be accessed.


Modified:
    trunk/gui/wizards/peak_intensity.py

Modified: trunk/gui/wizards/peak_intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/wizards/peak_intensity.py?rev=19701&r1=19700&r2=19701&view=diff
==============================================================================
--- trunk/gui/wizards/peak_intensity.py (original)
+++ trunk/gui/wizards/peak_intensity.py Thu May 23 18:35:19 2013
@@ -87,9 +87,9 @@
             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, 250), default=True).ShowModal() == wx.ID_YES:
+            if (status.show_gui and Question(msg, title="Incomplete setup", 
size=(450, 250), default=True).ShowModal() == wx.ID_YES) or not 
status.show_gui:
                 page = uf_store['spin.name'].create_page(self, sync=True)
-                self.page_indices['read'] = self.add_page(page, 
proceed_on_error=False)
+                self.page_indices['name'] = self.add_page(page, 
proceed_on_error=False)
 
         # The spectrum.read_intensities page.
         self.page_intensity = 
uf_store['spectrum.read_intensities'].create_page(self, sync=True)