Changeset a3c59503 in sasview for src/sas/qtgui/MainWindow/GuiManager.py

Timestamp:

Oct 22, 2018 7:48:54 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:

d00475d

Parents:

b8dccb8

Message:

Working project load/save. new format only. SASVIEW-983/984

File:

• src/sas/qtgui/MainWindow/GuiManager.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -554 +554 @@
         Menu Save Project
         """
-        self.filesWidget.saveProject()
+        filename = self.filesWidget.saveProject()
+
+        # datasets
+        all_data = self.filesWidget.getAllData()
+
+        # fit tabs
+        params = self.perspective().serializeAllFitpage()
+
+        # project dictionary structure:
+        # analysis[data.id] = [{"fit_data":[data, checkbox, child data],
+        #                       "fit_params":[fitpage_state]}
+        # "fit_params" not present if dataset not sent to fitting
+        analysis = {}
+
+        for id, data in all_data.items():
+            data_content = {"fit_data":data}
+            if id in params.keys():
+                # this dataset is represented also by the fit tab. Add to it.
+                data_content["fit_params"] = params[id]
+            analysis[id] = data_content
+
+        with open(filename, 'w') as outfile:
+            GuiUtils.saveData(outfile, analysis)
 
     def actionSave_Analysis(self):
@@ -564 +586 @@
             return
         # get fit page serialization
-        params = per.getSerializedFitpage()
+        params = per.serializeCurrentFitpage()
         data_id = per.currentTabDataId()
         tab_id = per.currentTab.tab_id