Changeset 99f8760 in sasview

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

Files:

• MainWindow/DataExplorer.py (modified) (2 diffs)
• MainWindow/GuiManager.py (modified) (2 diffs)
• Utilities/GridPanel.py (modified) (2 diffs)
• Utilities/GuiUtils.py (modified) (4 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)

src/sas/qtgui/Utilities/GridPanel.py

@@ -36 +36 @@
         # Tab numbering
         self.tab_number = 1
+
+        # save state
+        self.data_dict = {}
 
         # System dependent menu items
@@ -176 +179 @@
         model_name = results[0][0].model.id
         self.tabWidget.setTabToolTip(self.tabWidget.count()-1, model_name)
-
+        self.data_dict[page_name] = results
 
     @classmethod

src/sas/qtgui/Utilities/GuiUtils.py

@@ -36 +36 @@
 from sas.qtgui.Plotting.Plottables import Chisq
 from sas.qtgui.MainWindow.DataState import DataState
+
+from sas.sascalc.fit.AbstractFitEngine import FResult
+from sas.sascalc.fit.AbstractFitEngine import FitData1D, FitData2D
+from sasmodels.sasview_model import SasviewModel
 
 from sas.sascalc.dataloader.loader import Loader
@@ -1175 +1179 @@
 
         # "simple" types
-        if isinstance(o, (Sample, Source, Vector)):
+        if isinstance(o, (Sample, Source, Vector, FResult)):
             return add_type(o.__dict__, type(o))
         if isinstance(o, (Plottable, View)):
             return add_type(o.__dict__, type(o))
 
+        # SasviewModel - unique
+        if isinstance(o, SasviewModel):
+            # don't store parent
+            content = o.__dict__.copy()
+            return add_type(content, SasviewModel)
+
         # DataState
-        if isinstance(o, (Data1D, Data2D)):
+        if isinstance(o, (Data1D, Data2D, FitData1D, FitData2D)):
             # don't store parent
             content = o.__dict__.copy()
@@ -1210 +1220 @@
         Sample, Source, Vector,
         Plottable, Data1D, Data2D, PlottableTheory1D, PlottableFit1D, Text, Chisq, View,
-        DataState, np.ndarray]
+        DataState, np.ndarray, FResult, FitData1D, FitData2D, SasviewModel]
 
     lookup = dict((cls.__name__, cls) for cls in supported)
@@ -1242 +1252 @@
 
         # "simple" types
-        if cls in (Sample, Source, Vector):
+        if cls in (Sample, Source, Vector, FResult, FitData1D, FitData2D, SasviewModel):
             return simple_type(cls, data, level)
         if issubclass(cls, Plottable) or (cls == View):