Changeset 0a5d1a8 in sasview for src

Timestamp:

May 1, 2018 5:10:03 AM (7 years ago)

Author:

wojciech

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

f4161f7a

Parents:

1b068256

Message:

Checked order for check, so error is raised from wx

File:

• src/sas/sasview/sasview.py (modified) (2 diffs)

src/sas/sasview/sasview.py

@@ -196 +196 @@
     backend_bases.FigureCanvasBase.filetypes.pop('pgf', None)
 
-def setup_sasmodels():
-    """
-    Prepare sasmodels for running within sasview.
-    """
-    #Checking for the sasmodel compiler
+def check_sasmodels_compiler():
+    """
+    Checking c compiler for sasmodels
+    """
     if sys.platform == "darwin" and not os.path.exists("/Library/Developer/CommandLineTools/usr/bin/cc"):
         raise RuntimeError("No compiler. Open Terminal.app and type 'cc' at the command prompt for more instructions.")
+
+def setup_sasmodels():
+    """
+    Prepare sasmodels for running within sasview.
+    """
     # Set SAS_MODELPATH so sasmodels can find our custom models
     plugin_dir = os.path.join(sas.get_user_dir(), PLUGIN_MODEL_DIR)
@@ -221 +225 @@
     setup_sasmodels()
     setup_wx()
+    check_sasmodels_compiler()
     SasView()