Changeset dad7cef in sasview

Timestamp:

Sep 21, 2012 9:31:54 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:

944724a

Parents:

2bb625f

Message:

more flexible finding of default cat folder

File:

• sansguiframe/src/sans/guiframe/CategoryInstaller.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/CategoryInstaller.py

@@ -6 +6 @@
 
 @author kieranrcampbell@gmail.com
-@modified by NIST/MD sanview team
+@modified by NIST/MD sasview team
 """
 
@@ -43 +43 @@
         import sans.perspectives.fitting.models
         return sans.perspectives.fitting.models.get_model_python_path()
+    
     @staticmethod
     def _get_default_cat_p_dir():
@@ -48 +49 @@
         returns the dir where default_cat.p should be
         """
-        app_path = sys.path[0]
-        if os.path.isfile(app_path):
-            app_path = os.path.dirname(app_path)
-        return app_path
+        cat_file = "default_categories.p"
+        app_dir = sys.path[0]
+        if os.path.isfile(app_dir):
+            app_dir = os.path.dirname(app_dir)
+        n_dir = 12
+        for i in range(n_dir): 
+            path = os.path.join(app_dir, cat_file)
+            if os.path.isfile(path):
+                path = os.path.dirname(path)
+                return path
+            else:
+                app_dir, _ = os.path.split(app_dir)
+                
+        raise RuntimeError('Could not find the App folder')         
 
     @staticmethod