r14017 - /branches/gui_testing/gui/analyses/__init__.py -- July 29, 2011 - 22:48

Author: bugman
Date: Fri Jul 29 22:48:40 2011
New Revision: 14017

URL: http://svn.gna.org/viewcvs/relax?rev=14017&view=rev
Log:
The new_analysis method now checks that the C modules are compiled, and 
returns cleanly if not.


Modified:
    branches/gui_testing/gui/analyses/__init__.py

Modified: branches/gui_testing/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/__init__.py?rev=14017&r1=14016&r2=14017&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/__init__.py (original)
+++ branches/gui_testing/gui/analyses/__init__.py Fri Jul 29 22:48:40 2011
@@ -30,6 +30,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
+import dep_check
 from generic_fns import pipes
 from status import Status; status = Status()
 
@@ -312,6 +313,11 @@
         @type index:            None or int
         """
 
+        # Check the C modules.
+        if analysis_type in ['r1', 'r2'] and not dep_check.C_module_exp_fn:
+            error_message("Relaxation curve fitting is not available.  Try 
compiling the C modules on your platform.")
+            return
+
         # Starting from the initial state.
         if self.init_state:
             # A new sizer for the notebook (to replace the current sizer).