Changeset b963b20 in sasview for src/sas/sasview

Timestamp:

Sep 24, 2017 11:29:13 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:

b277220, fca1f50

Parents:

d3b0c77

Message:

pull config out of sas.sasgui so it can be used without reference to wx

Location:

src/sas/sasview

Files:

• local_config.py (modified) (1 diff)
• sasview.py (modified) (5 diffs)
• welcome_panel.py (modified) (1 diff)

src/sas/sasview/local_config.py

@@ -145 +145 @@
 UPDATE_TIMEOUT = 2
 
-#OpenCL option
-SAS_OPENCL = None
-
 # Time out for updating sasview
 UPDATE_TIMEOUT = 2

src/sas/sasview/sasview.py

@@ -20 +20 @@
 reload(sys)
 sys.setdefaultencoding("iso-8859-1")
+
+import sas
 
 APP_NAME = 'SasView'
@@ -171 +173 @@
 
 
-def setup_mpl(backend='WXAgg'):
-    import sas.sasgui
+def setup_mpl(backend=None):
     # Always use private .matplotlib setup to avoid conflicts with other
-    mplconfigdir = os.path.join(sas.sasgui.get_user_dir(), '.matplotlib')
+    mplconfigdir = os.path.join(sas.get_user_dir(), '.matplotlib')
     if not os.path.exists(mplconfigdir):
         os.mkdir(mplconfigdir)
@@ -192 +193 @@
     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)
+    plugin_dir = os.path.join(sas.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.
+    #Initiliaze enviromental variable with custom setting but only if variable not set
+    SAS_OPENCL = sas.get_custom_config().SAS_OPENCL
+    if SAS_OPENCL and "SAS_OPENCL" not in os.environ:
+        os.environ["SAS_OPENCL"] = SAS_OPENCL
 
 def run_gui():
@@ -207 +208 @@
     freeze_support()
     setup_logging()
-    setup_mpl()
+    setup_mpl(backend='WXAgg')
     setup_sasmodels()
     setup_wx()
@@ -217 +218 @@
     freeze_support()
     setup_logging()
-    setup_mpl(backend='Agg')
+    # Use default matplotlib backend on mac/linux, but wx on windows.
+    # The problem on mac is that the wx backend requires pythonw.  On windows
+    # we are sure to wx since it is the shipped with the app.
+    setup_mpl(backend='WXAgg' if os.name == 'nt' else None)
     setup_sasmodels()
     if len(sys.argv) == 1:

src/sas/sasview/welcome_panel.py

@@ -10 +10 @@
 from wx.lib.scrolledpanel import ScrolledPanel
 
-from sas.sasgui import get_local_config
+from sas import get_local_config
 from sas.sasgui.guiframe.panel_base import PanelBase
 config = get_local_config()