Changeset 17e2d502 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Nov 5, 2018 2:58:21 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

490e230

Parents:

4396300

Message:

Batch page serialization/deserialization

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingPerspective.py (modified) (1 diff)
• FittingWidget.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

@@ -120 +120 @@
             tab_data = self.getSerializedFitpage(tab)
             if tab.tab_id is None: continue
+            if 'data_id' not in tab_data: continue
             id = tab_data['data_id'][0]
-            params[id] = tab_data
+            if isinstance(id, list):
+                for i in id:
+                    if i in params:
+                        params[i].append(tab_data)
+                    else:
+                        params[i] = [tab_data]
+            else:
+                if id in params:
+                    params[id].append(tab_data)
+                else:
+                    params[id] = [tab_data]
         return params
 

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -3512 +3512 @@
 
         param_list.append(['is_data', str(self.data_is_loaded)])
-        if self.data_is_loaded:
-            param_list.append(['data_id', str(self.logic.data.id)])
-            param_list.append(['data_name', str(self.logic.data.filename)])
-
+        data_ids = []
+        filenames = []
+        if self.is_batch_fitting:
+            for item in self.all_data:
+                # need item->data->data_id
+                data = GuiUtils.dataFromItem(item)
+                data_ids.append(data.id)
+                filenames.append(data.filename)
+        else:
+            if self.data_is_loaded:
+                data_ids = [str(self.logic.data.id)]
+                filenames = [str(self.logic.data.filename)]
+        param_list.append(['is_batch_fitting', str(self.is_batch_fitting)])
+        param_list.append(['data_name', filenames])
+        param_list.append(['data_id', data_ids])
         # option tab
         param_list.append(['q_range_min', str(self.q_range_min)])