r20053 - in /branches/relax_disp: ./ gui/wizards/peak_intensity.py -- June 11, 2013 - 18:59

Author: bugman
Date: Tue Jun 11 18:59:47 2013
New Revision: 20053

URL: http://svn.gna.org/viewcvs/relax?rev=20053&view=rev
Log:
Merged revisions 20052 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20052 | bugman | 2013-06-11 18:59:29 +0200 (Tue, 11 Jun 2013) | 11 lines
  
  Manually ported r20048 from the relax_disp branch where it was deleted to 
the trunk.
  
  .....
    Partial fix for bug #20889 (https://gna.org/bugs/?20889).
    
    The peak intensity wizard now detects when the spectrum ID argument of 
the first page is set to a
    list.  The default value for all subsequent user functions is now set to 
the first element of that
    list.
  .....
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/wizards/peak_intensity.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 11 18:59:47 2013
@@ -1,1 +1,1 @@
-/trunk:1-20049
+/trunk:1-20052

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=20053&r1=20052&r2=20053&view=diff
==============================================================================
--- branches/relax_disp/gui/wizards/peak_intensity.py (original)
+++ branches/relax_disp/gui/wizards/peak_intensity.py Tue Jun 11 18:59:47 2013
@@ -265,6 +265,10 @@
         # Set the spectrum ID.
         id = page.uf_args['spectrum_id'].GetValue()
 
+        # Handle list arguments.
+        if isinstance(id, list):
+            id = id[0]
+
         # Set the ID in the page.
         page = self.get_page(self.page_indices[page_key])
         if index == None: