r18404 - /trunk/gui/analyses/base.py -- February 04, 2013 - 18:10

Author: bugman
Date: Mon Feb  4 18:10:32 2013
New Revision: 18404

URL: http://svn.gna.org/viewcvs/relax?rev=18404&view=rev
Log:
Fix for bug #20480 (https://gna.org/bugs/?20480).

This was reported by Stanislava Panova (https://gna.org/users/stacy).

The problem was that the state file was saved after a RelaxError occurred 
during the model-free
analysis.  The GUI data store information states that the active data pipe is 
called 'final'.  But
an error occurred prior to the 'final' data pipe being created.  The fix was 
to allow the state to
be loaded even if the GUI data store information has been corrupted.


Modified:
    trunk/gui/analyses/base.py

Modified: trunk/gui/analyses/base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/base.py?rev=18404&r1=18403&r2=18404&view=diff
==============================================================================
--- trunk/gui/analyses/base.py (original)
+++ trunk/gui/analyses/base.py Mon Feb  4 18:10:32 2013
@@ -1,7 +1,7 @@
 
###############################################################################
 #                                                                            
 #
 # Copyright (C) 2009 Michael Bieri                                           
 #
-# Copyright (C) 2010-2012 Edward d'Auvergne                                  
 #
+# Copyright (C) 2010-2013 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -31,7 +31,7 @@
  
 # relax module imports.
 from generic_fns.mol_res_spin import count_spins
-from generic_fns.pipes import cdp_name
+from generic_fns.pipes import cdp_name, has_pipe
 from user_functions.data import Uf_info; uf_info = Uf_info()
 from user_functions.data import Uf_tables; uf_tables = Uf_tables()
 
@@ -448,7 +448,10 @@
             pipe = cdp_name()
 
         # The count.
-        num = count_spins(pipe=pipe)
+        if not has_pipe(pipe):
+            num = 0
+        else:
+            num = count_spins(pipe=pipe)
 
         # Return the formatted string.
         return "%s spins loaded and selected" % num