Changeset 96d293da in sasview for src/sas/sasgui/perspectives/corfunc/corfunc_state.py

Timestamp:

Aug 24, 2016 9:15:28 AM (8 years ago)

Author:

lewis

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d45d590

Parents:

5a525e1

git-author:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/24/16 08:59:41)

git-committer:

Lewis O'Driscoll <lewis.o'driscoll@…> (08/24/16 09:15:28)

Message:

Implement save analysis in corfunc

File:

• src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) (3 diffs)

src/sas/sasgui/perspectives/corfunc/corfunc_state.py

@@ -10 +10 @@
 from sas.sasgui.guiframe.gui_style import GUIFRAME_ID
 from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.sascalc.dataloader.data_info import Data1D as LoaderData1D
 from sas.sascalc.dataloader.loader import Loader
 
@@ -250 +251 @@
     type_name = "Corfunc"
 
-    type = ["Invariant file (*.inv)|*.inv",
+    type = ["Corfunc file (*.cor)|*.cor",
             "SASView file (*.svs)|*.svs"]
 
@@ -312 +313 @@
         if datainfo is None:
             datainfo = Data1D(x=[], y=[])
-        elif not issubclass(datainfo.__class__, Data1D):
-            msg = ("The CanSAS writer expects a Data1D instance. {} was ",
+        elif not (isinstance(datainfo, Data1D) or isinstance(datainfo, LoaderData1D)):
+            msg = ("The CanSAS writer expects a Data1D instance. {} was "
                 "provided").format(datainfo.__class__.__name__)
             raise RuntimeError, msg