Changeset ca6481c in sasview

Timestamp:

Dec 15, 2011 9:21:19 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:

8ca5890

Parents:

96814e1

Message:

Re #3 Removing plugin models from sansview app (now in fitting).

Files:

• sansview/plugins/sum_p1_p2.py (deleted)
• sansview/plugins/testmodel.py (deleted)
• sansview/plugins/testmodel_2.py (deleted)
• sansview/sansview.py (modified) (2 diffs)
• sansview/setup_exe.py (modified) (2 diffs)
• sansview/setup_mac.py (modified) (1 diff)
• setup.py (modified) (1 diff)

sansview/sansview.py

@@ -28 +28 @@
 import logging
 
-def run():
+def run_old():
     """
         Run function for linux/OSX installations
@@ -35 +35 @@
     os.system("cd %s;python sansview.py" % module_path)
 
+def run():
+    from multiprocessing import freeze_support
+    freeze_support()
+    sansview = SansView()
+        
 class SansViewApp(gui_manager.ViewApp):
     """

sansview/setup_exe.py

@@ -177 +177 @@
 path = os.getcwd()
 
-plugins_dir = os.path.join(path, "plugins")
+#plugins_dir = os.path.join(path, "plugins")
 media_dir = os.path.join(path, "media")
 images_dir = os.path.join(path, "images")
@@ -236 +236 @@
         
 # Copying the sample data user data
-for f in findall(plugins_dir):
-    if os.path.split(f)[0].count('.svn')==0:
-        data_files.append(('plugins', [f]))
+#for f in findall(plugins_dir):
+#    if os.path.split(f)[0].count('.svn')==0:
+#        data_files.append(('plugins', [f]))
         
 if py26MSdll != None:

sansview/setup_mac.py

@@ -54 +54 @@
 
 APP = ['sansview.py']
-DATA_FILES += ['images','test','plugins','media', 'custom_config.py', 'local_config.py']
+#DATA_FILES += ['images','test','plugins','media', 'custom_config.py', 'local_config.py']
+DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py']
 # locate file extensions
 def find_extension():

setup.py

@@ -232 +232 @@
 # SansView
 package_dir["sans.sansview"] = "sansview"
-package_data['sans.sansview'] = ['images/*', 'media/*', 'plugins/*', 'test/*']
+#package_data['sans.sansview'] = ['images/*', 'media/*', 'plugins/*', 'test/*']
+package_data['sans.sansview'] = ['images/*', 'media/*', 'test/*']
 packages.append("sans.sansview")