Changeset cda697a in sasview

Timestamp:

Jan 11, 2012 11:04:29 AM (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:

aa07420

Parents:

9520702

Message:

Remove app path problem until we clean up the config

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (4 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -48 +48 @@
 def get_app_dir():
     """
-    Get the path of the current app (whatever among SansView/PrView/...) 
-    This is mainly for running app/data file from the command line
+      Return sansview dir until we clean up the gui_manager configuration.
+      There should be a proper config class so that we don't need all
+      the complexity currently used to figure out where things are.
     """
-    tem_path = sys.path[0]
-    if os.path.isfile(tem_path):
-        tem_path = os.path.dirname(tem_path)
-    return os.path.abspath(tem_path)
+    from sans import sansview
+    return os.path.dirname(sansview.__file__)
 
 def get_user_directory():
@@ -83 +82 @@
 
 # GUI always starts from the App folder 
-os.chdir(PATH_APP)
+#os.chdir(PATH_APP)
 # Read in the local config, which can either be with the main
 # application or in the installation directory
@@ -89 +88 @@
 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 sans.guiframe.config as config          
-       
+    if config is None:
+        # Didn't find local config, load the default 
+        import sans.guiframe.config as config
+        logging.info("using default local_config")        
+    else:
+        logging.info("found local_config in %s" % os.getcwd())  
+else:
+    logging.info("found local_config in %s" % PATH_APP)     
+           
 from sans.guiframe.customdir  import SetupCustom
 c_conf_dir = SetupCustom().setup_dir(PATH_APP)
@@ -98 +102 @@
 if custom_config is None:
     custom_config = _find_local_config('custom_config', os.getcwd())
-if custom_config is None:
-    msg = "Custom_config file was not imported"
-    logging.info(msg)
-    
+    if custom_config is None:
+        msg = "Custom_config file was not imported"
+        logging.info(msg)
+    else:
+        logging.info("using custom_config in %s" % os.getcwd())
+else:
+    logging.info("using custom_config from %s" % c_conf_dir)
 
 #read some constants from config