r13360 - in /branches/gui_testing: ./ gui/components/spectrum.py -- July 01, 2011 - 14:31

Author: bugman
Date: Fri Jul  1 14:31:13 2011
New Revision: 13360

URL: http://svn.gna.org/viewcvs/relax?rev=13360&view=rev
Log:
Merged revisions 13357-13359 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13357 | bugman | 2011-07-01 13:33:41 +0200 (Fri, 01 Jul 2011) | 3 lines
  
  Added support for old save files in the Peak_intensity.sync_ds() method.
........
  r13358 | bugman | 2011-07-01 13:35:09 +0200 (Fri, 01 Jul 2011) | 6 lines
  
  Fix for the bug reported as sr #2764 
(https://gna.org/support/index.php?2764).
  
  The problem was that the sequence file is now in the variable sequence_file.
........
  r13359 | bugman | 2011-07-01 13:36:36 +0200 (Fri, 01 Jul 2011) | 5 lines
  
  Another fix for the bug of sr #2764 (https://gna.org/support/?2764).
  
  The sequence file variable is in self.data!!!
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/gui/components/spectrum.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul  1 14:31:13 2011
@@ -1,1 +1,1 @@
-/1.3:1-13258
+/1.3:1-13359

Modified: branches/gui_testing/gui/components/spectrum.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/components/spectrum.py?rev=13360&r1=13359&r2=13360&view=diff
==============================================================================
--- branches/gui_testing/gui/components/spectrum.py (original)
+++ branches/gui_testing/gui/components/spectrum.py Fri Jul  1 14:31:13 2011
@@ -733,6 +733,14 @@
 
             # Loop over the rows.
             for i in range(self.num_rows):
+                # Old save file support.
+                if not hasattr(self.data, 'file_list'):
+                    self.data.file_list = []
+                if not hasattr(self.data, 'ncyc'):
+                    self.data.ncyc = []
+                if not hasattr(self.data, 'relax_times'):
+                    self.data.relax_times = []
+
                 # The cell data.
                 file_name = str(self.grid.GetCellValue(i, 0))
                 relax_time = str(self.grid.GetCellValue(i, 1))