Changeset 5a405bd in sasview

Timestamp:

Sep 20, 2017 7:26:17 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1693141

Parents:

6e50a8d

Message:

bundle resource files by directory

Location:

src/sas/sasgui

Files:

• guiframe/__init__.py (modified) (5 diffs)
• perspectives/calculator/__init__.py (modified) (4 diffs)
• perspectives/fitting/__init__.py (modified) (4 diffs)
• perspectives/invariant/__init__.py (modified) (4 diffs)

src/sas/sasgui/guiframe/__init__.py

@@ -14 +14 @@
     # Check for data path next to exe/zip file.
     # If we are inside a py2exe zip file, we need to go up
-    # to get to the directory containing 
+    # to get to the directory containing
     # the media for this module
     path = os.path.dirname(__file__)
@@ -27 +27 @@
                 return module_media_path
             return media_path
-   
+
     raise RuntimeError('Could not find guiframe images files')
 
@@ -40 +40 @@
     # Check for data path next to exe/zip file.
     # If we are inside a py2exe zip file, we need to go up
-    # to get to the directory containing 
+    # to get to the directory containing
     # the media for this module
     path = os.path.dirname(__file__)
@@ -58 +58 @@
     """
     Return the data files associated with guiframe images .
-    
+
     The format is a list of (directory, [files...]) pairs which can be
     used directly in setup(...,data_files=...) for setup.py.
@@ -64 +64 @@
     """
     data_files = []
-    path = get_data_path(media="images")
-    for f in findall(path):
-        data_files.append(('images/icons', [f]))
-    path = get_media_path(media="media")
-    for f in findall(path):
-        data_files.append(('media/guiframe_media', [f]))
+    data_files.append(('images/icons', findall(get_data_path("images"))))
+    data_files.append(('media/guiframe_media', findall(get_data_path("media"))))
 
     return data_files

src/sas/sasgui/perspectives/calculator/__init__.py

@@ -18 +18 @@
     path = os.path.dirname(__file__)
     #Look for maximum n_dir up of the current dir to find media
-   
+
     #for i in range(n_dir):
     i = 0
@@ -30 +30 @@
              return media_path
         i += 1
-   
+
     raise RuntimeError('Could not find calculator media files')
 
@@ -36 +36 @@
     """
     Return the data files associated with media calculator.
-    
+
     The format is a list of (directory, [files...]) pairs which can be
     used directly in setup(...,data_files=...) for setup.py.
@@ -42 +42 @@
     """
     data_files = []
-    path = get_data_path(media="media")
-    for f in findall(path):
-        data_files.append(('media/calculator_media', [f]))
+    data_files.append(('media/calculator_media', findall(get_data_path("media"))))
     return data_files

src/sas/sasgui/perspectives/fitting/__init__.py

@@ -13 +13 @@
     # Check for data path next to exe/zip file.
     # If we are inside a py2exe zip file, we need to go up
-    # to get to the directory containing 
+    # to get to the directory containing
     # the media for this module
     path = os.path.dirname(__file__)
@@ -26 +26 @@
                 return module_media_path
             return media_path
-   
+
     raise RuntimeError('Could not find models media files')
 
@@ -32 +32 @@
     """
     Return the data files associated with media.
-    
+
     The format is a list of (directory, [files...]) pairs which can be
     used directly in setup(...,data_files=...) for setup.py.
@@ -38 +38 @@
     """
     data_files = []
-    path = os.path.dirname(__file__)
-    p_path = os.path.join(path, 'plugin_models')
-    for f in findall(p_path):
-        data_files.append(('plugin_models', [f]))
-    # path = get_data_path(media="media")
-    for f in findall(path):
-        data_files.append(('media/fitting_media', [f]))
-    
+    # plugin_models = os.path.join(os.path.dirname(__file__), "plugin_models")
+    # data_files.append('plugin_models', findall(plugin_models)))
+    data_files.append(('media/fitting_media', findall(get_data_path("media"))))
+
     return data_files

src/sas/sasgui/perspectives/invariant/__init__.py

@@ -15 +15 @@
     # Check for data path next to exe/zip file.
     # If we are inside a py2exe zip file, we need to go up
-    # to get to the directory containing 
+    # to get to the directory containing
     # the media for this module
     path = os.path.dirname(__file__)
@@ -28 +28 @@
                 return module_media_path
             return media_path
-   
+
     raise RuntimeError('Could not find invariant media files')
 
@@ -34 +34 @@
     """
     Return the data files associated with media invariant.
-    
+
     The format is a list of (directory, [files...]) pairs which can be
     used directly in setup(...,data_files=...) for setup.py.
@@ -40 +40 @@
     """
     data_files = []
-    path = get_data_path(media="media")
-    for f in findall(path):
-        data_files.append(('media/invariant_media', [f]))
+    data_files.append(('media/invariant_media', findall(get_data_path("media"))))
     return data_files