Changes in src/sas/sasgui/guiframe/gui_manager.py [b963b20:2f22db9] in sasview

File:

• src/sas/sasgui/guiframe/gui_manager.py (modified) (12 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -22 +22 @@
 import re
 import logging
+import httplib
 import traceback
 import urllib
+import urllib2
 import json
 
-from matplotlib import _pylab_helpers
-
-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 +46 @@
 from sas.sascalc.dataloader.loader import Loader
 from sas.sasgui.guiframe.proxy import Connection
+from matplotlib import _pylab_helpers
 
 logger = logging.getLogger(__name__)
+
 warnings.simplefilter("ignore")
 
-config = get_local_config()
-custom_config = get_custom_config()
+def get_app_dir():
+    """
+        The application directory is the one where the default custom_config.py
+        file resides.
+
+        :returns: app_path - the path to the applicatin directory
+    """
+    # First, try the directory of the executable we are running
+    app_path = sys.path[0]
+    if os.path.isfile(app_path):
+        app_path = os.path.dirname(app_path)
+    if os.path.isfile(os.path.join(app_path, "custom_config.py")):
+        app_path = os.path.abspath(app_path)
+        logger.info("Using application path: %s", app_path)
+        return app_path
+
+    # Next, try the current working directory
+    if os.path.isfile(os.path.join(os.getcwd(), "custom_config.py")):
+        logger.info("Using application path: %s", os.getcwd())
+        return os.path.abspath(os.getcwd())
+
+    # Finally, try the directory of the sasview module
+    # TODO: gui_manager will have to know about sasview until we
+    # clean all these module variables and put them into a config class
+    # that can be passed by sasview.py.
+    logger.debug(sys.executable)
+    logger.debug(str(sys.argv))
+    from sas import sasview as sasview
+    app_path = os.path.dirname(sasview.__file__)
+    logger.debug("Using application path: %s", app_path)
+    return app_path
+
+
+def get_user_directory():
+    """
+        Returns the user's home directory
+    """
+    userdir = os.path.join(os.path.expanduser("~"), ".sasview")
+    if not os.path.isdir(userdir):
+        os.makedirs(userdir)
+    return userdir
+
+
+def _find_local_config(file, path):
+    """
+        Find configuration file for the current application
+    """
+    config_module = None
+    fObj = None
+    try:
+        fObj, path_config, descr = imp.find_module(file, [path])
+        config_module = imp.load_module(file, fObj, path_config, descr)
+    except:
+        logger.error("Error loading %s/%s: %s" % (path, file, sys.exc_value))
+    finally:
+        if fObj is not None:
+            fObj.close()
+    logger.debug("GuiManager loaded %s/%s" % (path, file))
+    return config_module
+
+# Get APP folder
+PATH_APP = get_app_dir()
+DATAPATH = PATH_APP
+
+# GUI always starts from the App folder
+# os.chdir(PATH_APP)
+# Read in the local config, which can either be with the main
+# application or in the installation directory
+config = _find_local_config('local_config', PATH_APP)
+if config is None:
+    config = _find_local_config('local_config', os.getcwd())
+    if config is None:
+        # Didn't find local config, load the default
+        import sas.sasgui.guiframe.config as config
+        logger.debug("using default local_config")
+    else:
+        logger.debug("found local_config in %s" % os.getcwd())
+else:
+    logger.debug("found local_config in %s" % PATH_APP)
+
+from sas.sasgui.guiframe.customdir import SetupCustom
+c_conf_dir = SetupCustom().setup_dir(PATH_APP)
+custom_config = _find_local_config('custom_config', c_conf_dir)
+if custom_config is None:
+    custom_config = _find_local_config('custom_config', os.getcwd())
+    if custom_config is None:
+        msgConfig = "Custom_config file was not imported"
+        logger.debug(msgConfig)
+    else:
+        logger.debug("using custom_config in %s" % os.getcwd())
+else:
+    logger.debug("using custom_config from %s" % c_conf_dir)
 
 # read some constants from config
@@ -62 +153 @@
 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
@@ -85 +177 @@
         DEFAULT_OPEN_FOLDER = os.path.abspath(open_folder)
     else:
-        DEFAULT_OPEN_FOLDER = get_app_dir()
+        DEFAULT_OPEN_FOLDER = PATH_APP
     SAS_OPENCL = custom_config.SAS_OPENCL
 except:
@@ -100 +192 @@
     DEFAULT_PERSPECTIVE = None
     CLEANUP_PLOT = False
-    DEFAULT_OPEN_FOLDER = get_app_dir()
     DEFAULT_OPEN_FOLDER = PATH_APP
     SAS_OPENCL = None
@@ -137 +228 @@
         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):
     """
@@ -170 +265 @@
                 if os.path.isfile(ico_file):
                     self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
-        self.path = get_app_dir()
+        self.path = PATH_APP
         self.application_name = APPLICATION_NAME
         # Application manager
@@ -445 +540 @@
         try:
             fd = open(file_name, 'w')
-        except Exception:
+        except:
             # On Permission denied: IOError
-            temp_dir = get_user_dir()
+            temp_dir = get_user_directory()
             temp_file_name = os.path.join(temp_dir, name)
             fd = open(temp_file_name, 'w')
@@ -1437 +1532 @@
             # want Analysis.  This is NOT an issue on the Mac which does not
             # have the extra Window menu item.
-            #      March 2016 Code Camp  -- PDB
+            #      March 2016 Code Camp  -- PDB 
             Tools_pos = self._menubar.FindMenu("Tools")
             self._menubar.Insert(Tools_pos+1, self._applications_menu,
@@ -2068 +2163 @@
                 logger.info("Failed to connect to www.sasview.org")
         self._process_version(version_info, standalone=event is None)
-
 
     def _process_version(self, version_info, standalone=True):
@@ -3257 +3351 @@
                 if basename.lower() in [app_py, app_exe, app_app, app_base]:
                     data_base = sys.argv[1]
-                    input_file = os.path.normpath(os.path.join(get_app_dir(),
+                    input_file = os.path.normpath(os.path.join(DATAPATH,
                                                                data_base))
         if input_file is None:
@@ -3272 +3366 @@
         # do it only the first time app loaded
         # delete unused model folder
-        model_folder = os.path.join(get_app_dir(), path)
+        model_folder = os.path.join(PATH_APP, path)
         if os.path.exists(model_folder) and os.path.isdir(model_folder):
             if len(os.listdir(model_folder)) > 0: