Changeset 23ccf07 in sasview for sansview/perspectives/fitting/models.py

Timestamp:

Apr 26, 2011 11:20:22 AM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

60642b4

Parents:

168a845

Message:

find the path for media

File:

• sansview/perspectives/fitting/models.py (modified) (4 diffs)

sansview/perspectives/fitting/models.py

@@ -9 +9 @@
 # Time is needed by the log method
 import time
+import logging
 
 from sans.guiframe.events import StatusEvent  
@@ -17 +18 @@
    
 PLUGIN_DIR = 'plugins' 
+path = os.path.dirname(os.path.sys.path[0])
+file = os.path.join(path, "plugins.log")
+
 
 def log(message):
     """
     """
-    out = open("plugins.log", 'a')
+    out = open(file, 'a')
     out.write("%10g:  %s\n" % (time.clock(), message))
     out.close()
@@ -107 +111 @@
     except:
         # Don't deal with bad plug-in imports. Just skip.
+        msg = "Could not import model plugin: %s\n" % sys.exc_value
+        log(msg)
         pass
     return plugins
@@ -172 +178 @@
         in the directory if file were modified
         """
+        temp = {}
         if self.is_changed():
             #always recompile the folder plugin
             import compileall
-            compileall.compile_dir(dir=PLUGIN_DIR, force=1)
-            dir = os.path.join(os.getcwd(), 'plugins')
-            log("looking for models in: %s" % str(dir))
-            return _findModels(PLUGIN_DIR)
-        return  {}
-       
-    
+            if os.path.isdir(os.path.abspath(PLUGIN_DIR)):
+                dir = os.path.abspath(PLUGIN_DIR)
+            else:
+                dir = os.path.join(os.path.dirname(os.path.sys.path[0]), 'plugins')
+            if not os.path.isdir(dir):
+                log("Could not locate models plugins in: %s" % str(dir))
+            else:
+                log("looking for models in: %s" % str(dir))
+                compileall.compile_dir(dir=dir, ddir=dir, force=1, quiet=True)
+                return  _findModels(dir)
+        logging.info("pluging model : %s\n" % str(temp))
+        return temp
+        
     def _getModelList(self):
         """