Changeset 99f8760 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Dec 4, 2018 7:37:38 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

0989bad

Parents:

d9e7792

Message:

Improvements to batch save/load SASVIEW-1222.
Project save/load will now recreate the grid window as well as retain
result theories under dataset indices.

Location:

src/sas/qtgui/MainWindow

Files:

• DataExplorer.py (modified) (2 diffs)
• GuiManager.py (modified) (2 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -354 +354 @@
             properties['checked'] = is_checked
             other_datas = []
-            # no need to save other_datas - things will be refit on read
-            #other_datas = GuiUtils.plotsFromFilename(filename, model)
+            # save underlying theories
+            other_datas = GuiUtils.plotsFromFilename(filename, model)
             # skip the main plot
-            #other_datas = list(other_datas.values())[1:]
+            other_datas = list(other_datas.values())[1:]
             all_data[data.id] = [data, properties, other_datas]
         return all_data
@@ -457 +457 @@
             if key=='is_batch':
                 self.chkBatch.setChecked(True if value=='True' else False)
+                if 'batch_grid' not in all_data:
+                    continue
+                grid_pages = all_data['batch_grid']
+                for grid_name, grid_page in grid_pages.items():
+                    grid_page.append(grid_name)
+                    self.parent.showBatchOutput(grid_page)
                 continue
             if 'cs_tab' in key:

src/sas/qtgui/MainWindow/GuiManager.py

@@ -588 +588 @@
             if id=='is_batch':
                 analysis['is_batch'] = data
+                analysis['batch_grid'] = self.grid_window.data_dict
                 continue
             data_content = {"fit_data":data}
@@ -710 +711 @@
         """
         self.grid_subwindow.setVisible(True)
+        self.grid_subwindow.raise_()
         if output_data:
             self.grid_window.addFitResults(output_data)