Changeset e9f6979 in sasview

Timestamp:

Dec 23, 2011 10:05:36 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

27f1ddb

Parents:

1eae432

Message:

Now got all the startup path right

File:

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

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -42 +42 @@
 from sans.dataloader.loader import Loader
 
-from sans import sansview
-PATH_APP = os.path.dirname(sansview.__file__)
-DATAPATH = PATH_APP
-
-def _change_current_dir():
+# gui_manager should not know about sansview
+#from sans import sansview
+#PATH_APP = os.path.dirname(sansview.__file__)
+
+def get_app_dir():
     """
-    Get the path of the current file
-    This is for openning sansview/data file from command line
+    Get the path of the current app (whatever among SansView/PrView/...) 
+    This is mainly for running app/data file from the command line
     """
     tem_path = sys.path[0]
     if os.path.isfile(tem_path):
         tem_path = os.path.dirname(tem_path)
-    
-    os.chdir(os.path.abspath(tem_path))
-_change_current_dir()   
+    return os.path.abspath(tem_path)
 
 def get_user_directory():
@@ -80 +78 @@
     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
@@ -292 +296 @@
         self.Bind(EVT_NEW_COLOR, self.on_color_selection)
         self.setup_custom_conf()
-    
+        
     def add_icon(self):
         """
@@ -3032 +3036 @@
         self.frame.Hide()
         self.s_screen = None
-        temp_path = None
-        try:
-            _change_current_dir()
-        except:
-            pass
+
         try:
             self.open_file()