Changeset 16bd5ca in sasview

Timestamp:

Jan 22, 2014 10:38:42 AM (10 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:

e090c624

Parents:

76cd1ae

Message:

Find default categories with p2app

File:

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

src/sans/guiframe/CategoryInstaller.py

@@ -49 +49 @@
         returns the dir where default_cat.p should be
         """
+        # The default categories file is usually found with the code
         import sans.sansview
         cat_file = "default_categories.p"
         dir, file_name = os.path.split(sans.sansview.__file__)
         cat_file_path = os.path.join(dir, cat_file)
+        if os.path.isfile(cat_file_path):
+            cat_file_dir = os.path.dirname(cat_file_path)
+            return cat_file_dir
+        
+        # When deploying using py2app, the default categories file
+        # can be found in Contents/Resources
+        cat_file_path = os.path.join(os.path.dirname(sys.executable), '..', 'Resources', 'default_categories.p')
         if os.path.isfile(cat_file_path):
             cat_file_dir = os.path.dirname(cat_file_path)