Changeset 99f8760 in sasview for src/sas/qtgui/Utilities/GuiUtils.py

Timestamp:

Dec 4, 2018 7:37:38 AM (5 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.

File:

• src/sas/qtgui/Utilities/GuiUtils.py (modified) (4 diffs)

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):