Changeset c6bdb3b in sasview

Timestamp:

May 2, 2017 10:03:50 PM (8 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:

a67ec83

Parents:

7c105e8

Message:

more fiddling with configs

Files:

• run.py (modified) (2 diffs)
• src/sas/sasgui/__init__.py (modified) (3 diffs)
• src/sas/sasgui/guiframe/config.py (modified) (3 diffs)
• src/sas/sasgui/guiframe/customdir.py (modified) (2 diffs)
• src/sas/sasgui/guiframe/data_panel.py (modified) (1 diff)
• src/sas/sasview/local_config.py (modified) (2 diffs)

run.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 #!/usr/bin/env python
-
 """
 Run sasview in place.  This allows sasview to use the python
@@ -15 +14 @@
 the given module or script.
 """
+from __future__ import print_function
 
 import imp

src/sas/sasgui/__init__.py

@@ -47 +47 @@
 
 def get_app_dir():
-    if APP_FOLDER is None:
-        raise RuntimeError("Need to initialize sas.sasgui.USER_FOLDER")
     return APP_FOLDER
 
 def get_user_dir():
-    if USER_FOLDER is None:
-        raise RuntimeError("Need to initialize sas.sasgui.USER_FOLDER")
     return USER_FOLDER
 
@@ -74 +70 @@
     import os
     import sys
-    import imp
     import logging
+    from sasmodels.custom import load_module_from_path
 
     logger = logging.getLogger(__name__)
@@ -81 +77 @@
     filename = 'local_config.py'
     path = os.path.join(dirname, filename)
-    if os.path.exists(path):
-        try:
-            fObj = None
-            fObj, config_path, descr = imp.find_module('local_config', [APP_FOLDER])
-            config = imp.load_module('local_config', fObj, config_path, descr)
-            logger.info("GuiManager loaded %s" % config_path)
-            return config
-        except Exception:
-            import traceback; logger.error(traceback.format_exc())
-            logger.error("Error loading %s: %s" % (path, sys.exc_value))
-        finally:
-            if fObj is not None:
-                fObj.close()
-    from sas.sasgui.guiframe import config
-    logger.info("GuiManager config defaults to sas.sasgui.guiframe")
-    return config
-
+    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/config.py

@@ -1 +1 @@
 """
-    Application settings
+Application settings
 """
 from __future__ import print_function
@@ -6 +6 @@
 import time
 import os
+import logging
+
 from sas.sasgui.guiframe.gui_style import GUIFRAME
 import sas.sasview
-import logging
-
 
 logger = logging.getLogger(__name__)
@@ -75 +75 @@
 _ansto_logo = os.path.join(icon_path, "ansto_logo.png")
 _tudelft_logo = os.path.join(icon_path, "tudelft_logo.png")
+_dls_logo = os.path.join(icon_path, "dls_logo.png")
 _nsf_logo = os.path.join(icon_path, "nsf_logo.png")
 _danse_logo = os.path.join(icon_path, "danse_logo.png")

src/sas/sasgui/guiframe/customdir.py

@@ -1 +1 @@
 # Setup and find Custom config dir
+from __future__ import print_function
+
 import os.path
 import logging
 import shutil
-import imp
 
-from sas.sasgui import get_custom_config_path
+from sasmodels.custom import load_module_from_path
+
+from sas.sasgui import get_custom_config_path, get_app_dir
 
 logger = logging.getLogger(__name__)
@@ -22 +25 @@
 def _setup_custom_config():
     path = get_custom_config_path()
-    try:
-        if not os.path.isfile(path):
+    if not os.path.isfile(path):
+        try:
             # if the custom config file does not exist, copy the default from
             # the app dir
             shutil.copyfile(os.path.join(get_app_dir(), "custom_config.py"),
                             path)
-        #Adding SAS_OPENCL if it doesn't exist in the config file
-        # - to support backcompability
-        if not "SAS_OPENCL" in open(path).read():
+        except Exception:
+            logger.error("Could not copy default custom config.")
+
+    #Adding SAS_OPENCL if it doesn't exist in the config file
+    # - to support backcompability
+    if not "SAS_OPENCL" in open(path).read():
+        try:
             open(config_file, "a+").write("SAS_OPENCL = \"None\"\n")
-    except Exception:
-        #import traceback; logging.error(traceback.format_exc())
-        logger.error("Could not copy default custom config.")
+        except Exception:
+            logger.error("Could not update custom config with SAS_OPENCL.")
 
     custom_config = _load_config(path)
     return custom_config
 
+
 def _load_config(path):
     if os.path.exists(path):
         try:
-            fObj = None
-            fObj, config_path, descr = imp.find_module('custom_config', [os.path.dirname(path)])
-            custom_config = imp.load_module('custom_config', fObj, config_path, descr)
-            logger.info("GuiManager loaded %s" % config_path)
-            return custom_config
-        except Exception:
-            logger.error("Error loading %s: %s" % (path, sys.exc_value))
-        finally:
-            if fObj is not None:
-                fObj.close()
+            module = load_module_from_path('sas.sasview.custom_config', path)
+            logger.info("GuiManager loaded %s", path)
+            return module
+        except Exception as exc:
+            logger.error("Error loading %s: %s", path, exc)
+
     from sas.sasview import custom_config
-    logging.info("GuiManager custom_config defaults to sas.sasview.custom_config")
+    logger.info("GuiManager custom_config defaults to sas.sasview.custom_config")
     return custom_config

src/sas/sasgui/guiframe/data_panel.py

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

src/sas/sasview/local_config.py

@@ -94 +94 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft and DLS"
+_copyright = "(c) 2009 - 2017, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, and DLS"
 marketplace_url = "http://marketplace.sasview.org/"
 
@@ -148 +148 @@
 SAS_OPENCL = None
 
+# Time out for updating sasview
+UPDATE_TIMEOUT = 2
+
 def printEVT(message):
     if __EVT_DEBUG__: