Changeset b221176 in sasview

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

Files:

• setup.py (modified) (2 diffs)
• src/sans/guiframe/CategoryInstaller.py (modified) (1 diff)
• src/sans/guiframe/gui_manager.py (modified) (1 diff)

setup.py

@@ -166 +166 @@
 package_data['sans.perspectives.fitting'] = ['media/*','plugin_models/*']
 
-package_dir["sans.perspectives.calculator"] = os.path.join("src", "sans", "perspectives", "calculator")
 packages.extend(["sans.perspectives", "sans.perspectives.calculator"])    
 package_data['sans.perspectives.calculator'] = ['images/*', 'media/*']
     
 # Data util
-package_dir["data_util"] = os.path.join("src", "sansutil")
+package_dir["data_util"] = os.path.join("src", "data_util")
 packages.extend(["data_util"])
 
@@ -249 +248 @@
 
 
-package_dir["sans"] = os.path.join("src", "sans")
-package_dir["sans.models"] = model_dir
-package_dir["sans.models.sans_extension"] = os.path.join("src", "sans", "models", "sans_extension")
-package_data['sans.models'] = [os.path.join('media', "*.*")]
-package_data['sans.models'] += [os.path.join('media','img', "*.*")]
-packages.extend(["sans","sans.models","sans.models.sans_extension"])
-    
-smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
-                  os.path.join(smear_dir, "smearer_module.cpp")]
-geni_sources = [os.path.join(gen_dir, "sld2i_module.cpp")]
-if os.name=='nt':
-    smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
-    geni_sources.append(os.path.join(igordir, "winFuncs.c"))
-ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
-                                sources=model_sources,                 
-                                include_dirs=[igordir, includedir, 
-                                              c_model_dir, numpy_incl_path, cephes_dir],
-                                ),       
-                    # Smearer extension
-                    Extension("sans.models.sans_extension.smearer",
-                              sources = smearer_sources,
-                              include_dirs=[igordir, 
-                                            smear_dir, numpy_incl_path],
-                              ),
-                    
-                    Extension("sans.models.sans_extension.smearer2d_helper",
-                              sources = [os.path.join(smear_dir, 
-                                                "smearer2d_helper_module.cpp"),
-                                         os.path.join(smear_dir, 
-                                                "smearer2d_helper.cpp"),],
-                              include_dirs=[smear_dir, numpy_incl_path],
-                              ),
-                    
-                    Extension("sans.models.sans_extension.sld2i",
-                              sources = [os.path.join(gen_dir, 
-                                                "sld2i_module.cpp"),
-                                         os.path.join(gen_dir, 
-                                                "sld2i.cpp"),
-                                         os.path.join(c_model_dir, 
-                                                "libfunc.c"),
-                                         os.path.join(c_model_dir, 
-                                                "librefl.c"),],
-                              include_dirs=[gen_dir, includedir, 
-                                            c_model_dir, numpy_incl_path],
-                              )
-                    ] )
+#package_dir["sans.models"] = model_dir
+#package_dir["sans.models.sans_extension"] = os.path.join("src", "sans", "models", "sans_extension")
+#package_data['sans.models'] = [os.path.join('media', "*.*")]
+#package_data['sans.models'] += [os.path.join('media','img', "*.*")]
+#packages.extend(["sans","sans.models","sans.models.sans_extension"])
+#    
+#smearer_sources = [os.path.join(smear_dir, "smearer.cpp"),
+#                  os.path.join(smear_dir, "smearer_module.cpp")]
+#geni_sources = [os.path.join(gen_dir, "sld2i_module.cpp")]
+#if os.name=='nt':
+#    smearer_sources.append(os.path.join(igordir, "winFuncs.c"))
+#    geni_sources.append(os.path.join(igordir, "winFuncs.c"))
+#ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
+#                                sources=model_sources,                 
+#                                include_dirs=[igordir, includedir, 
+#                                              c_model_dir, numpy_incl_path, cephes_dir],
+#                                ),       
+#                    # Smearer extension
+#                    Extension("sans.models.sans_extension.smearer",
+#                              sources = smearer_sources,
+#                              include_dirs=[igordir, 
+#                                            smear_dir, numpy_incl_path],
+#                              ),
+#                    
+#                    Extension("sans.models.sans_extension.smearer2d_helper",
+#                              sources = [os.path.join(smear_dir, 
+#                                                "smearer2d_helper_module.cpp"),
+#                                         os.path.join(smear_dir, 
+#                                                "smearer2d_helper.cpp"),],
+#                              include_dirs=[smear_dir, numpy_incl_path],
+#                              ),
+#                    
+#                    Extension("sans.models.sans_extension.sld2i",
+#                              sources = [os.path.join(gen_dir, 
+#                                                "sld2i_module.cpp"),
+#                                         os.path.join(gen_dir, 
+#                                                "sld2i.cpp"),
+#                                         os.path.join(c_model_dir, 
+#                                                "libfunc.c"),
+#                                         os.path.join(c_model_dir, 
+#                                                "librefl.c"),],
+#                              include_dirs=[gen_dir, includedir, 
+#                                            c_model_dir, numpy_incl_path],
+#                              )
+#                    ] )
         
 # SasView

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