Changes in src/sas/qtgui/Utilities/GuiUtils.py [10786bc2:4333edf] in sasview

File:

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

src/sas/qtgui/Utilities/GuiUtils.py

@@ -12 +12 @@
 import urllib.parse
 import json
+import types
 from io import BytesIO
 
@@ -44 +45 @@
 
 from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.file_converter.nxcansas_writer import NXcanSASWriter
+
 from sas.qtgui.Utilities import CustomDir
 
@@ -793 +796 @@
 
     wildcard = "Text files (*.txt);;"\
-                "CanSAS 1D files(*.xml)"
+                "CanSAS 1D files(*.xml);;"\
+                "NXcanSAS files (*.h5)"
     kwargs = {
         'caption'   : 'Save As',
@@ -812 +816 @@
     if os.path.splitext(filename)[1].lower() == ".txt":
         onTXTSave(data, filename)
-    if os.path.splitext(filename)[1].lower() == ".xml":
+    elif os.path.splitext(filename)[1].lower() == ".xml":
         loader.save(filename, data, ".xml")
+    elif os.path.splitext(filename)[1].lower() == ".h5":
+        nxcansaswriter = NXcanSASWriter()
+        nxcansaswriter.write([data], filename)
 
 def saveData2D(data):
@@ -824 +831 @@
     default_name += "_out" + ext_format
 
-    wildcard = "IGOR/DAT 2D file in Q_map (*.dat)"
+    wildcard = "IGOR/DAT 2D file in Q_map (*.dat);;"\
+                "NXcanSAS files (*.h5)"
     kwargs = {
         'caption'   : 'Save As',
@@ -844 +852 @@
     if os.path.splitext(filename)[1].lower() == ext_format:
         loader.save(filename, data, ext_format)
+    elif os.path.splitext(filename)[1].lower() == ".h5":
+        nxcansaswriter = NXcanSASWriter()
+        nxcansaswriter.write([data], filename)
+
 
 class FormulaValidator(QtGui.QValidator):
@@ -1211 +1223 @@
             return add_type(content, type(o))
 
+        if isinstance(o, types.FunctionType):
+            # we have a pure function
+            content = o.__dict__.copy()
+            return add_type(content, type(o))
+
         # not supported
         logging.info("data cannot be serialized to json: %s" % type(o))
@@ -1223 +1240 @@
     '''
     supported = [
-        tuple, set,
+        tuple, set, types.FunctionType,
         Sample, Source, Vector,
         Plottable, Data1D, Data2D, PlottableTheory1D, PlottableFit1D, Text, Chisq, View,
@@ -1278 +1295 @@
             buffer.seek(0)
             return np.load(buffer)
+
+        # function
+        if cls == types.FunctionType:
+            return cls
 
         logging.info('not implemented: %s, %s' % (type, cls))