Changeset 8ab3302 in sasview

Timestamp:

Dec 22, 2011 11:55:32 AM (13 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:

273801b

Parents:

7983000f

Message:

fixed a little bit the setting of .sansview folder

Files:

• fittingview/src/sans/perspectives/fitting/models.py (modified) (3 diffs)
• sansguiframe/src/sans/guiframe/customdir.py (modified) (2 diffs)
• sansview/installer_new.iss (modified) (1 diff)
• sansview/setup_exe.py (modified) (1 diff)
• setup.py (modified) (12 diffs)

fittingview/src/sans/perspectives/fitting/models.py

@@ -18 +18 @@
 from sans.models.pluginmodel import Model1DPlugin
    
-PLUGIN_DIR = 'plugins' 
+PLUGIN_DIR = 'plugin_models' 
 
 def log(message):
@@ -75 +75 @@
         The plugin directory is located in the user's home directory.
     """
-    dir = os.path.join(os.path.expanduser("~"),'.sansview',PLUGIN_DIR)
+    dir = os.path.join(os.path.expanduser("~"),'.sansview', PLUGIN_DIR)
     
     # If the plugin directory doesn't exist, create it
@@ -81 +81 @@
         os.makedirs(dir)
         
+    # Find paths needed
+    try:
+        # For source
+        if os.path.isdir(os.path.dirname(__file__)):
+            p_dir =  os.path.join(os.path.dirname(__file__), PLUGIN_DIR)
+        else:
+            raise
+    except:
+        # Check for data path next to exe/zip file.
+        #Look for maximum n_dir up of the current dir to find plugins dir
+        n_dir = 12
+        p_dir = None
+        f_dir = os.path.join(os.path.dirname(__file__))
+        for i in range(n_dir):
+            if i > 1:
+                f_dir, _ = os.path.split(f_dir)
+            plugin_path = os.path.join(f_dir, PLUGIN_DIR)
+            if os.path.isdir(plugin_path):
+                p_dir = plugin_path
+                break
+        if not p_dir:
+            raise
+
     # Place example user models as needed
-    if not os.path.isfile(os.path.join(dir,"testmodel.py")):
-        shutil.copy(os.path.join(os.path.dirname(__file__),"plugin_models","testmodel.py"), dir)
-    if not os.path.isfile(os.path.join(dir,"testmodel_2.py")):
-        shutil.copy(os.path.join(os.path.dirname(__file__),"plugin_models","testmodel_2.py"), dir)
-    if not os.path.isfile(os.path.join(dir,"sum_p1_p2.py")):
-        shutil.copy(os.path.join(os.path.dirname(__file__),"plugin_models","sum_p1_p2.py"), dir)
-        
+    for file in os.listdir(p_dir): 
+        file_path = os.path.join(p_dir, file)
+        if os.path.isfile(file_path):
+            if file.split(".")[-1] == 'py' and\
+                file.split(".")[0] != '__init__':
+                if not os.path.isfile(os.path.join(dir, file)):
+                    shutil.copy(file_path, dir)
     return dir
 

sansguiframe/src/sans/guiframe/customdir.py

@@ -12 +12 @@
     The plugin directory is located in the user's home directory.
     """
-    dir = os.path.join(os.path.expanduser("~"), ("." + APPLICATION_NAME), CONF_DIR)
+    dir = os.path.join(os.path.expanduser("~"), 
+                       ("." + APPLICATION_NAME), CONF_DIR)
     
     return dir
@@ -26 +27 @@
     file = os.path.join(dir, "custom_config.py")
     # Place example user models as needed
-    if not os.path.isfile(file):
-        shutil.copyfile(os.path.join(path, "custom_config.py"), file)
+    try:
+        if not os.path.isfile(file):
+         shutil.copyfile(os.path.join(path, "custom_config.py"), file)
+    except:
+        # Check for data path next to exe/zip file.
+        #Look for maximum n_dir up of the current dir to find plugins dir
+        n_dir = 12
+        is_dir = False
+        f_dir = path
+        for i in range(n_dir):
+            if i > 1:
+                f_dir, _ = os.path.split(f_dir)
+            temp_path = os.path.join(f_dir, "custom_config.py")
+            if os.path.isfile(temp_path):
+                shutil.copyfile(temp_path, file)
+                is_dir = True
+                break
+        if not is_dir:
+            raise
         
     return dir

sansview/installer_new.iss

@@ -68 +68 @@
 Source: "dist\SansView.exe";    DestDir: "{app}";       Flags: ignoreversion
 Source: "dist\*";       DestDir: "{app}";       Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sansview\plugins";  Flags: recursesubdirs createallsubdirs
-Source: "dist\config\custom_config.py"; DestDir: "{userappdata}\..\.sansview\config";   Flags: recursesubdirs createallsubdirs
+Source: "dist\plugin_models\*"; DestDir: "{userappdata}\..\.sansview\plugin_models";    Flags: recursesubdirs createallsubdirs 
+Source: "dist\config\custom_config.py"; DestDir: "{userappdata}\..\.sansview\config";   Flags: recursesubdirs createallsubdirs 
 ;       NOTE: Don't use "Flags: ignoreversion" on any shared system files
 

sansview/setup_exe.py

@@ -222 +222 @@
 f = 'custom_config.py'
 if os.path.isfile(f):
+    data_files.append(('.', [f]))
     data_files.append(('config', [f]))
 f = 'local_config.py'

setup.py

@@ -3 +3 @@
     #TODO: Add checks to see that all the dependencies are on the system
 """
+# [command] can be any of the following:
+#   -nomp: no openmp: Use this flag; C-lib without openmp as well as numpy < 1.6
+
 import sys
-
 import os
 import platform
@@ -16 +18 @@
     try:
         import numpy
-        NUMPY_INC = os.path.join(os.path.split(numpy.__file__)[0],"core","include")
+        NUMPY_INC = os.path.join(os.path.split(numpy.__file__)[0], 
+                                 "core","include")
     except:
-        print "\nNumpy is needed to build SansView. Try easy_install numpy.\n  %s" % str(sys.exc_value)
+        msg = "\nNumpy is needed to build SansView. "
+        print msg, "Try easy_install numpy.\n  %s" % str(sys.exc_value)
         sys.exit(0)
 
@@ -31 +35 @@
 ext_modules = []
 
+# Remove all files that should be updated by this setup
+# We do this here because application updates these files from .sansview
+# except when there is no such file
+# Todo : make this list generic
+plugin_model_list = ['polynominal5.py', 'sph_bessel_jn.py', 
+                     'sum_Ap1_1_Ap2.py', 'sum_p1_p2.py', 
+                     'testmodel_2.py', 'testmodel.py']
+sans_dir = os.path.join(os.path.expanduser("~"),'.sansview')
+if os.path.isdir(sans_dir):
+    f_path = os.path.join(sans_dir, "sansview.log")
+    if os.path.isfile(f_path):
+        os.remove(f_path)
+    f_path = os.path.join(sans_dir, 'config', "custom_config.py")
+    if os.path.isfile(f_path):
+        os.remove(f_path)
+    f_path = os.path.join(sans_dir, 'plugin_models')
+    if os.path.isdir(f_path):
+        for file in os.listdir(f_path): 
+            if file in plugin_model_list:
+                file_path =  os.path.join(f_path, file)
+                os.remove(file_path)
+                    
 if sys.argv[-1] == "-nomp":
     # Disable OpenMP
@@ -56 +82 @@
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
         
-        if not (sys.platform=='darwin' and not is_64bits):
+        if not (sys.platform =='darwin' and not is_64bits):
             if copt.has_key(c):
                for e in self.extensions:
@@ -74 +100 @@
 guiframe_path = os.path.join("sansguiframe", "src", "sans", "guiframe")
 package_dir["sans.guiframe"] = guiframe_path
-package_dir["sans.guiframe.local_perspectives"] = os.path.join(guiframe_path, "local_perspectives")
+package_dir["sans.guiframe.local_perspectives"] = os.path.join(guiframe_path, 
+                                                        "local_perspectives")
 package_data["sans.guiframe"] = ['images/*', 'media/*']
 packages.extend(["sans.guiframe", "sans.guiframe.local_perspectives"])
@@ -82 +109 @@
         package_name = "sans.guiframe.local_perspectives." + dir
         packages.append(package_name)
-        package_dir[package_name] = os.path.join(guiframe_path, "local_perspectives", dir)
+        package_dir[package_name] = os.path.join(guiframe_path, 
+                                                 "local_perspectives", dir)
 
 # sans.dataloader
-package_dir["sans.dataloader"] = os.path.join("sansdataloader", "src", "sans", "dataloader")
+package_dir["sans.dataloader"] = os.path.join("sansdataloader", 
+                                              "src", "sans", "dataloader")
 package_data["sans.dataloader.readers"] = ['defaults.xml']
 packages.extend(["sans.dataloader","sans.dataloader.readers"])
@@ -120 +149 @@
 
 # Invariant view
-package_dir["sans.perspectives"] = os.path.join("invariantview", "src", "sans", "perspectives")
-package_dir["sans.perspectives.invariant"] = os.path.join("invariantview", "src", "sans", "perspectives", "invariant")
+package_dir["sans.perspectives"] = os.path.join("invariantview", "src", 
+                                                "sans", "perspectives")
+package_dir["sans.perspectives.invariant"] = os.path.join("invariantview", 
+                                    "src", "sans", "perspectives", "invariant")
                 
 package_data['sans.perspectives.invariant'] = [os.path.join("media",'*')]
@@ -127 +158 @@
 
 # Fitting view
-package_dir["sans.perspectives"] = os.path.join("fittingview", "src", "sans", "perspectives"),
-package_dir["sans.perspectives.fitting"] = os.path.join("fittingview", "src", "sans", "perspectives", "fitting")
+fitting_path = os.path.join("fittingview", "src", "sans", 
+                            "perspectives", "fitting")
+package_dir["sans.perspectives"] = os.path.join("fittingview", 
+                                            "src", "sans", "perspectives"),
+package_dir["sans.perspectives.fitting"] = fitting_path
+package_dir["sans.perspectives.fitting.plugin_models"] = \
+                                os.path.join(fitting_path, "plugin_models")
 package_data['sans.perspectives.fitting'] = ['media/*','plugin_models/*']
-packages.extend(["sans.perspectives", "sans.perspectives.fitting"])
+packages.extend(["sans.perspectives", "sans.perspectives.fitting", 
+                 "sans.perspectives.fitting.plugin_models"])
 
 # Calculator view
 package_dir["sans.perspectives"] = "calculatorview/src/sans/perspectives"
-package_dir["sans.perspectives.calculator"] = os.path.join("calculatorview", "src", "sans", "perspectives", "calculator")
+package_dir["sans.perspectives.calculator"] = os.path.join("calculatorview", 
+                                "src", "sans", "perspectives", "calculator")
 package_data['sans.perspectives.calculator'] = ['images/*', 'media/*']
 packages.extend(["sans.perspectives", "sans.perspectives.calculator"])
@@ -144 +182 @@
 # Plottools
 package_dir["danse"] = os.path.join("plottools", "src", "danse")
-package_dir["danse.common"] = os.path.join("plottools", "src", "danse", "common")
-package_dir["danse.common.plottools"] = os.path.join("plottools", "src", "danse", "common", "plottools")
+package_dir["danse.common"] = os.path.join("plottools", "src", 
+                                           "danse", "common")
+package_dir["danse.common.plottools"] = os.path.join("plottools", 
+                                    "src", "danse", "common", "plottools")
 packages.extend(["danse", "danse.common", "danse.common.plottools"])
 
@@ -153 +193 @@
 package_data["park"] = ['park-1.2.1/*.txt', 'park-1.2.1/park.epydoc']
 ext_modules.append( Extension("park._modeling",
-                              sources = [ os.path.join("park-1.2.1", "park", "lib", "modeling.cc"),
-                                         os.path.join("park-1.2.1", "park", "lib", "resolution.c"),
+                              sources = [ os.path.join("park-1.2.1", 
+                                                "park", "lib", "modeling.cc"),
+                                         os.path.join("park-1.2.1", 
+                                                "park", "lib", "resolution.c"),
                                          ],
                               ) )
@@ -225 +267 @@
 ext_modules.extend( [ Extension("sans.models.sans_extension.c_models",
                                 sources=model_sources,                 
-                                include_dirs=[igordir, srcdir, c_model_dir, numpy_incl_path],
+                                include_dirs=[igordir, srcdir, 
+                                              c_model_dir, numpy_incl_path],
                                 ),       
                     # Smearer extension
                     Extension("sans.models.sans_extension.smearer",
                               sources = smearer_sources,
-                              include_dirs=[igordir, smear_dir, numpy_incl_path],
+                              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"),],
+                                                "smearer2d_helper_module.cpp"),
+                                         os.path.join(smear_dir, 
+                                                "smearer2d_helper.cpp"),],
                               include_dirs=[smear_dir,numpy_incl_path],
                               )
@@ -246 +291 @@
 packages.append("sans.sansview")
 
-#required = ['lxml>=2.2.2', 'numpy>=1.4.1', 'matplotlib>=0.99.1.1', 'wxPython>=2.8.11',
-#            'pil','periodictable>=1.3.0', 'scipy>=0.7.2']
+#required = ['lxml>=2.2.2', 'numpy>=1.4.1', 'matplotlib>=0.99.1.1', 
+#            'wxPython>=2.8.11', 'pil',
+#            'periodictable>=1.3.0', 'scipy>=0.7.2']
 required = ['lxml','periodictable>=1.3.0']
 """
 if os.name=='nt':
     #required.extend(['comtypes', 'pisa', 'html5lib', 'reportlab'])
-    required.extend(['pisa', 'html5lib'])
+    #required.extend(['pisa', 'html5lib'])
     if sys.version_info < (2, 7):
         required.append('comtypes')