Changeset b963b20 in sasview for src/sas/sasgui

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/sasgui

Files:

• __init__.py (modified) (1 diff)
• guiframe/CategoryInstaller.py (modified) (1 diff)
• guiframe/aboutbox.py (modified) (1 diff)
• guiframe/acknowledgebox.py (modified) (1 diff)
• guiframe/config.py (modified) (1 diff)
• guiframe/customdir.py (deleted)
• guiframe/data_panel.py (modified) (1 diff)
• guiframe/documentation_window.py (modified) (1 diff)
• guiframe/gui_manager.py (modified) (5 diffs)
• guiframe/local_perspectives/data_loader/data_loader.py (modified) (1 diff)
• guiframe/startup_configuration.py (modified) (2 diffs)

src/sas/sasgui/__init__.py

@@ -1 @@
-import sys
-import os
-from os.path import exists, expanduser, dirname, realpath, join as joinpath
-
-
-def dirn(path, n):
-    path = realpath(path)
-    for _ in range(n):
-        path = dirname(path)
-    return path
-
-# Set up config directories
-def make_user_folder():
-    path = joinpath(expanduser("~"),'.sasview')
-    if not exists(path):
-        os.mkdir(path)
-    return path
-
-
-def find_app_folder():
-    # We are starting out with the following info:
-    #     __file__ = .../sas/sasgui/__init__.pyc
-    # Check if the sister path .../sas/sasview exists, and use it as the
-    # app directory.  This will only be the case if the app is not frozen.
-    path = joinpath(dirn(__file__, 2), 'sasview')
-    if exists(path):
-        return path
-
-    # If we are running frozen, then root is a parent directory
-    if sys.platform == 'darwin':
-        # Here is the path to the file on the mac:
-        #     .../Sasview.app/Contents/Resources/lib/python2.7/site-packages.zip/sas/sasgui/__init__.pyc
-        # We want the path to the Resources directory.
-        path = dirn(__file__, 6)
-    elif os.name == 'nt':
-        # Here is the path to the file on windows:
-        #     ../Sasview/library.zip/sas/sasgui/__init__.pyc
-        # We want the path to the Sasview directory.
-        path = dirn(__file__, 4)
-    else:
-        raise RuntimeError("Couldn't find the app directory")
-    return path
-
-USER_FOLDER = make_user_folder()
-APP_FOLDER = find_app_folder()
-
-
-def get_app_dir():
-    return APP_FOLDER
-
-def get_user_dir():
-    return USER_FOLDER
-
-def get_custom_config_path():
-    dirname = os.path.join(get_user_dir(), 'config')
-    # If the directory doesn't exist, create it
-    if not os.path.exists(dirname):
-        os.makedirs(dirname)
-    path = os.path.join(dirname, "custom_config.py")
-    return path
-
-_config_cache = None
-def get_local_config():
-    global _config_cache
-    if not _config_cache:
-        _config_cache = _load_config()
-    return _config_cache
-
-def _load_config():
-    import os
-    import sys
-    import logging
-    from sasmodels.custom import load_module_from_path
-
-    logger = logging.getLogger(__name__)
-    dirname = get_app_dir()
-    filename = 'local_config.py'
-    path = os.path.join(dirname, filename)
-    try:
-        module = load_module_from_path('sas.sasgui.local_config', path)
-        logger.info("GuiManager loaded %s", path)
-        return module
-    except Exception as exc:
-        logger.critical("Error loading %s: %s", path, exc)
-        sys.exit()

src/sas/sasgui/guiframe/CategoryInstaller.py

@@ -15 +15 @@
 from collections import defaultdict, OrderedDict
 
-from sas.sasgui import get_user_dir
+from sas import get_user_dir
 
 USER_FILE = 'categories.json'

src/sas/sasgui/guiframe/aboutbox.py

@@ -25 +25 @@
 import os
 
-from sas.sasgui import get_local_config
+from sas import get_local_config
 config = get_local_config()
 

src/sas/sasgui/guiframe/acknowledgebox.py

@@ -13 +13 @@
 from wx.lib.expando import ExpandoTextCtrl
 
-from sas.sasgui import get_local_config
+from sas import get_local_config
 config = get_local_config()
 

src/sas/sasgui/guiframe/config.py

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

src/sas/sasgui/guiframe/data_panel.py

@@ -33 +33 @@
 from sas.sasgui.guiframe.local_perspectives.plotting.SimplePlot \
     import PlotFrame as QucikPlotDialog
-from sas.sasgui import get_local_config
+from sas import get_local_config
 
 config = get_local_config()

src/sas/sasgui/guiframe/documentation_window.py

@@ -27 +27 @@
     WX_SUPPORTS_HTML2 = False
 
-from sas.sasgui import get_app_dir
+from sas import get_app_dir
 
 # Don't use wx html renderer on windows.

src/sas/sasgui/guiframe/gui_manager.py

@@ -28 +28 @@
 from matplotlib import _pylab_helpers
 
-from sas.sasgui import get_local_config, get_app_dir, get_user_dir
+from sas import get_local_config, get_custom_config, get_app_dir, get_user_dir
 from sas.sasgui.guiframe.events import EVT_CATEGORY
 from sas.sasgui.guiframe.events import EVT_STATUS
@@ -47 +47 @@
 from sas.sascalc.dataloader.loader import Loader
 from sas.sasgui.guiframe.proxy import Connection
-from sas.sasgui.guiframe.customdir import setup_custom_config
 
 logger = logging.getLogger(__name__)
@@ -53 +52 @@
 
 config = get_local_config()
-custom_config = setup_custom_config()
+custom_config = get_custom_config()
 
 # read some constants from config
@@ -63 +62 @@
 SPLASH_SCREEN_HEIGHT = config.SPLASH_SCREEN_HEIGHT
 SS_MAX_DISPLAY_TIME = config.SS_MAX_DISPLAY_TIME
-SAS_OPENCL = config.SAS_OPENCL
 if not WELCOME_PANEL_ON:
     WELCOME_PANEL_SHOW = False
@@ -138 +136 @@
         PARENT_FRAME = wx.Frame
         CHILD_FRAME = wx.Frame
-
-#Initiliaze enviromental variable with custom setting but only if variable not set
-if SAS_OPENCL and not "SAS_OPENCL" in os.environ:
-    os.environ["SAS_OPENCL"] = SAS_OPENCL
 
 class ViewerFrame(PARENT_FRAME):

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -10 +10 @@
 logger = logging.getLogger(__name__)
 
+from sas import get_local_config
+
 from sas.sascalc.dataloader.loader import Loader
 from sas.sascalc.dataloader.loader_exceptions import NoKnownLoaderException
 
-from sas.sasgui import get_local_config
 from sas.sasgui.guiframe.plugin_base import PluginBase
 from sas.sasgui.guiframe.events import StatusEvent

src/sas/sasgui/guiframe/startup_configuration.py

@@ -13 +13 @@
 import wx
 
-from sas.sasgui import get_custom_config_path
+from sas import make_custom_config_path
 from sas.sasgui.guiframe.events import StatusEvent
 from sas.sasgui.guiframe.gui_style import GUIFRAME
@@ -194 +194 @@
         Write custom configuration
         """
-        path = get_custom_config_path()
+        path = make_custom_config_path()
         with open(path, 'w') as out_f:
             out_f.write("#Application appearance custom configuration\n")