Changeset b221176 in sasview for src/sans

Timestamp:

Oct 9, 2013 10:42:24 AM (11 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:

f2148b2

Parents:

aebd16a

Message:

Fix installation and make sure SasView? starts

Location:

src/sans/guiframe

Files:

• CategoryInstaller.py (modified) (1 diff)
• gui_manager.py (modified) (1 diff)

src/sans/guiframe/CategoryInstaller.py

@@ -49 +49 @@
         returns the dir where default_cat.p should be
         """
+        import sans.sansview
         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')         
+        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
+        
+        raise RuntimeError('CategoryInstaller: Could not find folder containing default categories')
 
     @staticmethod

src/sans/guiframe/gui_manager.py

@@ -94 +94 @@
         config_module = imp.load_module(file, fObj, path_config, descr) 
     except:
-        pass
+        logging.error("Error loading %s/%s: %s" % (path, file, sys.exc_value))
     finally:
         if fObj is not None:
             fObj.close()
+    logging.info("GuiManager loaded %s/%s" % (path, file))
     return config_module