Changeset 1693141 in sasview

Timestamp:

Sep 20, 2017 7:26:56 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

92df9cbd

Parents:

5a405bd

Message:

fix broken startup

File:

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

src/sas/sasview/sasview.py

@@ -21 +21 @@
 sys.setdefaultencoding("iso-8859-1")
 
+APP_NAME = 'SasView'
 PLUGIN_MODEL_DIR = 'plugin_models'
-APP_NAME = 'SasView'
-
-# Set SAS_MODELPATH so sasmodels can find our custom models
-os.environ['SAS_MODELPATH'] = os.path.join(sasdir, PLUGIN_MODEL_DIR)
-
-class SasView():
+
+class SasView(object):
     """
     Main class for running the SasView application
@@ -163 +160 @@
 
 
-def setup_mpl():
+def setup_mpl(backend='WXAgg'):
     import sas.sasgui
     # Always use private .matplotlib setup to avoid conflicts with other
@@ -174 +171 @@
     # we are running may not actually need it; also, putting as little on the
     # path as we can
-    os.environ['MPLBACKEND'] = 'WXAgg'
-
+    os.environ['MPLBACKEND'] = backend
+
+    # TODO: ... so much for not importing matplotlib unless we need it...
     from matplotlib import backend_bases
     backend_bases.FigureCanvasBase.filetypes.pop('pgf', None)
 
+def setup_sasmodels():
+    """
+    Prepare sasmodels for running within sasview.
+    """
+    import sas.sasgui
+    # Set SAS_MODELPATH so sasmodels can find our custom models
+    plugin_dir = os.path.join(sas.sasgui.get_user_dir(), PLUGIN_MODEL_DIR)
+    os.environ['SAS_MODELPATH'] = plugin_dir
+    # TODO: SAS_OPENCL flag belongs in setup_sasmodels
+    # this will require restructuring of the config management so that it
+    # can occur outside of sasgui.
 
 def run_gui():
@@ -187 +196 @@
     freeze_support()
     setup_logging()
+    setup_mpl()
+    setup_sasmodels()
     setup_wx()
-    setup_mpl()
     SasView()
 
 
 def run_cli():
+    from multiprocessing import freeze_support
+    freeze_support()
     setup_logging()
-    setup_mpl()
+    setup_mpl(backend='Agg')
+    setup_sasmodels()
     if len(sys.argv) == 1:
         # Run sasview as an interactive python interpreter