Changeset 96814e1 in sasview

Timestamp:

Dec 15, 2011 11:15:21 AM (12 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:

ca6481c

Parents:

8ff5cb3

Message:

Re #3 Move plugin directory for models to the user's home directory

Location:

fittingview/src/sans/perspectives/fitting

Files:

• models.py (modified) (3 diffs)
• plugin_models/__init__.py (added)
• plugin_models/sum_p1_p2.py (added)
• plugin_models/testmodel.py (added)
• plugin_models/testmodel_2.py (added)

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

@@ -11 +11 @@
 import logging
 import py_compile
+import shutil
 from sans.guiframe.events import StatusEvent  
 # Explicitly import from the pluginmodel module so that py2exe
@@ -71 +72 @@
 def find_plugins_dir():
     """
-    Find path of the plugins dir
-    """
-    dir = os.path.abspath(PLUGIN_DIR)
+        Find path of the plugins directory.
+        The plugin directory is located in the user's home directory.
+    """
+    dir = os.path.join(os.path.expanduser("~"),'.sansview',PLUGIN_DIR)
+    
+    # If the plugin directory doesn't exist, create it
     if not os.path.isdir(dir):
-        dir = os.path.join(os.getcwd(), PLUGIN_DIR)
-    if not os.path.isdir(dir):
-        dir = os.path.join(os.path.dirname(__file__), PLUGIN_DIR)
-    if not os.path.isdir(dir):
-        dir = os.path.join(os.path.dirname(os.path.sys.path[0]), PLUGIN_DIR)
+        os.makedirs(dir)
+        
+    # 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)
+        
     return dir
 
@@ -471 +480 @@
         """
         is_modified = False
-        if os.path.isdir(PLUGIN_DIR):
-            temp =  os.path.getmtime(PLUGIN_DIR)
+        plugin_dir = find_plugins_dir()
+        if os.path.isdir(plugin_dir):
+            temp =  os.path.getmtime(plugin_dir)
             if  self.last_time_dir_modified != temp:
                 is_modified = True