Changeset 8db20a9 in sasview for src/sas/qtgui

Timestamp:

Jan 21, 2019 8:15:40 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:

d541324e

Parents:

3ca645bb

git-author:

Piotr Rozyczko <piotr.rozyczko@…> (01/21/19 08:12:08)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (01/21/19 08:15:40)

Message:

Updated cansas read (cherrypicked and fixed from master).
Fixes: hdf5 returns byte strings so these need to be recasted properly.
​https://github.com/h5py/h5py/issues/379

Location:

src/sas/qtgui

Files:

• Plotting/Plotter2D.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (5 diffs)

src/sas/qtgui/Plotting/Plotter2D.py

@@ -468 +468 @@
         # check scale
         if self.scale == 'log_{10}':
-            try:
-                if  self.zmin is None  and len(output[output > 0]) > 0:
-                    zmin_temp = self.zmin
-                    output[output > 0] = numpy.log10(output[output > 0])
-                elif self.zmin <= 0:
-                    zmin_temp = self.zmin
-                    output[output > 0] = numpy.zeros(len(output))
-                    output[output <= 0] = MIN_Z
-                else:
-                    zmin_temp = self.zmin
-                    output[output > 0] = numpy.log10(output[output > 0])
-            except:
-                #Too many problems in 2D plot with scale
-                pass
+            with numpy.errstate(all='ignore'):
+                output = numpy.log10(output)
+            index = numpy.isfinite(output)
+            if not index.all():
+                cutoff = (numpy.quantile(output[index], 0.05) - numpy.log10(2) if index.any() else 0.)
+                output[output < cutoff] = cutoff
+                output[~index] = cutoff
+        vmin, vmax = None, None
 
         self.cmap = cmap

src/sas/qtgui/Utilities/GuiUtils.py

@@ -44 +44 @@
 
 from sas.sascalc.dataloader.loader import Loader
+from sas.sascalc.file_converter.nxcansas_writer import NXcanSASWriter
+
 from sas.qtgui.Utilities import CustomDir
 
@@ -793 +795 @@
 
     wildcard = "Text files (*.txt);;"\
-                "CanSAS 1D files(*.xml)"
+                "CanSAS 1D files(*.xml);;"\
+                "NXcanSAS files (*.h5)"
     kwargs = {
         'caption'   : 'Save As',
@@ -812 +815 @@
     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 +830 @@
     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 +851 @@
     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):