Changeset 66000ae in sasview for src/sas/sasgui/perspectives/invariant

Timestamp:

Sep 25, 2017 3:01:30 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:

fca1f50, 83db1cc

Parents:

dba8557 (diff), 72d3f1e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-869' into ticket-887-reorg

Location:

src/sas/sasgui/perspectives/invariant

Files:

• invariant_state.py (modified) (1 diff)
• __init__.py (modified) (4 diffs)

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

@@ -728 +728 @@
 
                 for entry in entry_list:
-
-                    sas_entry, _ = self._parse_entry(entry)
                     invstate = self._parse_state(entry)
-
                     # invstate could be None when .svs file is loaded
                     # in this case, skip appending to output
                     if invstate is not None:
+                        sas_entry, _ = self._parse_entry(entry)
                         sas_entry.meta_data['invstate'] = invstate
                         sas_entry.filename = invstate.file

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