Changes in src/sas/qtgui/Utilities/GuiUtils.py [133812c7:99f8760] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Utilities/GuiUtils.py
r133812c7 r99f8760 36 36 from sas.qtgui.Plotting.Plottables import Chisq 37 37 from sas.qtgui.MainWindow.DataState import DataState 38 39 from sas.sascalc.fit.AbstractFitEngine import FResult 40 from sas.sascalc.fit.AbstractFitEngine import FitData1D, FitData2D 41 from sasmodels.sasview_model import SasviewModel 38 42 39 43 from sas.sascalc.dataloader.loader import Loader … … 1175 1179 1176 1180 # "simple" types 1177 if isinstance(o, (Sample, Source, Vector )):1181 if isinstance(o, (Sample, Source, Vector, FResult)): 1178 1182 return add_type(o.__dict__, type(o)) 1179 1183 if isinstance(o, (Plottable, View)): 1180 1184 return add_type(o.__dict__, type(o)) 1181 1185 1186 # SasviewModel - unique 1187 if isinstance(o, SasviewModel): 1188 # don't store parent 1189 content = o.__dict__.copy() 1190 return add_type(content, SasviewModel) 1191 1182 1192 # DataState 1183 if isinstance(o, (Data1D, Data2D )):1193 if isinstance(o, (Data1D, Data2D, FitData1D, FitData2D)): 1184 1194 # don't store parent 1185 1195 content = o.__dict__.copy() … … 1210 1220 Sample, Source, Vector, 1211 1221 Plottable, Data1D, Data2D, PlottableTheory1D, PlottableFit1D, Text, Chisq, View, 1212 DataState, np.ndarray ]1222 DataState, np.ndarray, FResult, FitData1D, FitData2D, SasviewModel] 1213 1223 1214 1224 lookup = dict((cls.__name__, cls) for cls in supported) … … 1242 1252 1243 1253 # "simple" types 1244 if cls in (Sample, Source, Vector ):1254 if cls in (Sample, Source, Vector, FResult, FitData1D, FitData2D, SasviewModel): 1245 1255 return simple_type(cls, data, level) 1246 1256 if issubclass(cls, Plottable) or (cls == View):
Note: See TracChangeset
for help on using the changeset viewer.