Changeset 1fa4f736 in sasview

Timestamp:

Sep 25, 2017 10:02:52 AM (7 years ago)

Author:

krzywon

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:

7b07fbe

Parents:

e3ad3c8

Message:

Only process data element if <perspective> element is present in <SASentry>.

Location:

src/sas/sasgui/perspectives

Files:

• corfunc/corfunc_state.py (modified) (1 diff)
• fitting/pagestate.py (modified) (1 diff)
• invariant/invariant_state.py (modified) (1 diff)
• pr/inversion_state.py (modified) (1 diff)

src/sas/sasgui/perspectives/corfunc/corfunc_state.py

@@ -289 +289 @@
                 namespaces={'ns': CANSAS_NS})
             for entry in entry_list:
-                sas_entry, _ = self._parse_entry(entry)
                 corstate = self._parse_state(entry)
 
                 if corstate is not None:
+                    sas_entry, _ = self._parse_entry(entry)
                     sas_entry.meta_data['corstate'] = corstate
                     sas_entry.filename = corstate.file

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

@@ -1297 +1297 @@
                                             namespaces={'ns': CANSAS_NS})
                     for entry in entry_list:
-                        try:
-                            sas_entry, _ = self._parse_save_state_entry(entry)
-                        except:
-                            raise
                         fitstate = self._parse_state(entry)
-
                         # state could be None when .svs file is loaded
                         # in this case, skip appending to output
                         if fitstate is not None:
+                            try:
+                                sas_entry, _ = self._parse_save_state_entry(
+                                    entry)
+                            except:
+                                raise
                             sas_entry.meta_data['fitstate'] = fitstate
                             sas_entry.filename = fitstate.file

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/pr/inversion_state.py

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