Changeset 3ee8a49 in sasview

Timestamp:

Jan 11, 2012 6:03:29 PM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

42c4f86

Parents:

c9de078

Message:

trying to fix windows installer

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -42 +42 @@
 from sans.dataloader.loader import Loader
 
-# gui_manager should not know about sansview
-#from sans import sansview
-#PATH_APP = os.path.dirname(sansview.__file__)
-
 def get_app_dir():
     """
+        The application directory is the one where the default custom_config.py
+        file resides.
     """
-    if os.name=='nt':
-        logging.info(sys.executable)
-        logging.info(str(sys.argv))
-        app_path = sys.path[0]
-        if os.path.isfile(app_path):
-            app_path = os.path.dirname(app_path)
-        return os.path.abspath(app_path)
-    else:
-        from sans import sansview
-        return os.path.dirname(sansview.__file__)
+    # 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)
+        logging.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")):
+        logging.info("Using application path: %s", os.getcwd())
+        return os.path.abspath(os.getcwd())
+    
+    # Finally, try the directory of the sansview module
+    #TODO: gui_manager will have to know about sansview until we
+    # clean all these module variables and put them into a config class
+    # that can be passed by sansview.py.
+    logging.info(sys.executable)
+    logging.info(str(sys.argv))
+    from sans import sansview
+    app_path = os.path.dirname(sansview.__file__)
+    logging.info("Using application path: %s", app_path)
+    return app_path
 
 def get_user_directory():