Changeset 10786bc2 in sasview for src/sas/qtgui

Timestamp:

Jan 7, 2019 9:46:27 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:

d1ad101

Parents:

04a884a

Message:

Added missing types for (de)serialization. SASVIEW-984

File:

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

src/sas/qtgui/Utilities/GuiUtils.py

@@ -30 +30 @@
 from sas.qtgui.Plotting.Plottables import Plottable
 from sas.sascalc.dataloader.data_info import Sample, Source, Vector
+from sas.sascalc.dataloader.data_info import Detector, Process, TransmissionSpectrum
+from sas.sascalc.dataloader.data_info import Aperture, Collimation
 from sas.qtgui.Plotting.Plottables import View
 from sas.qtgui.Plotting.Plottables import PlottableTheory1D
@@ -1181 +1183 @@
         if isinstance(o, (Sample, Source, Vector, FResult)):
             return add_type(o.__dict__, type(o))
+        # detector
+        if isinstance(o, (Detector, Process, TransmissionSpectrum, Aperture, Collimation)):
+            return add_type(o.__dict__, type(o))
+
         if isinstance(o, (Plottable, View)):
             return add_type(o.__dict__, type(o))
@@ -1220 +1226 @@
         Sample, Source, Vector,
         Plottable, Data1D, Data2D, PlottableTheory1D, PlottableFit1D, Text, Chisq, View,
+        Detector, Process, TransmissionSpectrum, Collimation, Aperture,
         DataState, np.ndarray, FResult, FitData1D, FitData2D, SasviewModel]
 
@@ -1252 +1259 @@
 
         # "simple" types
-        if cls in (Sample, Source, Vector, FResult, FitData1D, FitData2D, SasviewModel):
+        if cls in (Sample, Source, Vector, FResult, FitData1D, FitData2D,
+                   SasviewModel, Detector, Process, TransmissionSpectrum,
+                   Collimation, Aperture):
             return simple_type(cls, data, level)
         if issubclass(cls, Plottable) or (cls == View):