r22166 - /trunk/gui/analyses/auto_model_free.py -- February 10, 2014 - 10:43

Author: bugman
Date: Mon Feb 10 10:43:46 2014
New Revision: 22166

URL: http://svn.gna.org/viewcvs/relax?rev=22166&view=rev
Log:
Fix for bug #21615, the missing data dialog failure when executing the GUI 
model-free analysis.

This is the bug at https://gna.org/bugs/?21615 as reported by Ivan Leung 
(ivanhoe dott leung att
chem dott ox dot ac dot uk).

The problem is that the spin container's "isotope" variable is being accessed 
directly after a test
showing that this variable does not exist.  This is now fixed so that the 
missing data dialog is now
presented explaining that the spin isotope information is not set.


Modified:
    trunk/gui/analyses/auto_model_free.py

Modified: trunk/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/auto_model_free.py?rev=22166&r1=22165&r2=22166&view=diff
==============================================================================
--- trunk/gui/analyses/auto_model_free.py (original)
+++ trunk/gui/analyses/auto_model_free.py Mon Feb 10 10:43:46 2014
@@ -1,7 +1,7 @@
 
###############################################################################
 #                                                                            
 #
 # Copyright (C) 2009 Michael Bieri                                           
 #
-# Copyright (C) 2010-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2010-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -413,7 +413,7 @@
                 missing.append(msg % ("nuclear isotope data", 
"spin.isotope"))
 
             # Test if the CSA value has been set for the heteronuclei.
-            if spin.isotope in ['15N', '13C'] and (not hasattr(spin, 'csa') 
or spin.csa == None):
+            if (hasattr(spin, 'isotope') and spin.isotope in ['15N', '13C']) 
and (not hasattr(spin, 'csa') or spin.csa == None):
                 missing.append(msg % ("CSA data", "value.set"))
 
         # Interatomic data container variables.