r20899 - in /branches/relax_disp: ./ lib/errors.py -- September 06, 2013 - 15:19

Author: bugman
Date: Fri Sep  6 15:19:36 2013
New Revision: 20899

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

........
  r20898 | bugman | 2013-09-06 15:18:45 +0200 (Fri, 06 Sep 2013) | 3 lines
  
  Created the new RelaxNoPeakIntensityError error object.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/lib/errors.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep  6 15:19:36 2013
@@ -1,1 +1,1 @@
-/trunk:1-20873
+/trunk:1-20898

Modified: branches/relax_disp/lib/errors.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/errors.py?rev=20899&r1=20898&r2=20899&view=diff
==============================================================================
--- branches/relax_disp/lib/errors.py (original)
+++ branches/relax_disp/lib/errors.py Fri Sep  6 15:19:36 2013
@@ -751,6 +751,14 @@
 # Spectral data errors.
 #######################
 
+# No peak intensity data.
+class RelaxNoPeakIntensityError(BaseError):
+    def __init__(self, spectrum_id=None):
+        if spectrum_id == None:
+            self.text = "No peak intensity data has been loaded."
+        else:
+            self.text = "Peak intensity data for the '%s' spectrum ID does 
not exist."
+
 # No spectral data.
 class RelaxNoSpectraError(BaseError):
     def __init__(self, spectrum_id):