Changeset 1c98850 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Jan 7, 2019 9:38:15 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

07d744c

Parents:

a3b7542 (diff), 04a884a (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

File:

• src/sas/qtgui/MainWindow/DataExplorer.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -488 +488 @@
             params = value['fit_params']
             for page in params:
+                if not isinstance(page, dict):
+                    continue
+                if 'is_batch_fitting' not in page:
+                    continue
                 if page['is_batch_fitting'][0] != 'True':
                     continue
@@ -551 +555 @@
             if isinstance(new_data, (old_data1d, old_data2d)):
                 new_data = self.manager.create_gui_data(value[0], new_data.filename)
+            if hasattr(value[0], 'id'):
+                new_data.id = value[0].id
+                new_data.group_id = value[0].group_id
             assert isinstance(new_data, (Data1D, Data2D))
             # make sure the ID is retained
-            new_data.id = value[0].id
-            new_data.group_id = value[0].group_id
             properties = value[1]
             is_checked = properties['checked']
@@ -561 +566 @@
             items.append(new_item)
             model = self.theory_model
-            if value[0].is_data:
+            if new_data.is_data:
                 model = self.model
                 # Caption for the theories