Changeset 8db20a9 in sasview for src/sas/qtgui/Utilities


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/Utilities/GuiUtils.py

    r10786bc2 r8db20a9  
    4444 
    4545from sas.sascalc.dataloader.loader import Loader 
     46from sas.sascalc.file_converter.nxcansas_writer import NXcanSASWriter 
     47 
    4648from sas.qtgui.Utilities import CustomDir 
    4749 
    … …  
    793795 
    794796    wildcard = "Text files (*.txt);;"\ 
    795                 "CanSAS 1D files(*.xml)" 
     797                "CanSAS 1D files(*.xml);;"\ 
     798                "NXcanSAS files (*.h5)" 
    796799    kwargs = { 
    797800        'caption'   : 'Save As', 
    … …  
    812815    if os.path.splitext(filename)[1].lower() == ".txt": 
    813816        onTXTSave(data, filename) 
    814     if os.path.splitext(filename)[1].lower() == ".xml": 
     817    elif os.path.splitext(filename)[1].lower() == ".xml": 
    815818        loader.save(filename, data, ".xml") 
     819    elif os.path.splitext(filename)[1].lower() == ".h5": 
     820        nxcansaswriter = NXcanSASWriter() 
     821        nxcansaswriter.write([data], filename) 
    816822 
    817823def saveData2D(data): 
    … …  
    824830    default_name += "_out" + ext_format 
    825831 
    826     wildcard = "IGOR/DAT 2D file in Q_map (*.dat)" 
     832    wildcard = "IGOR/DAT 2D file in Q_map (*.dat);;"\ 
     833                "NXcanSAS files (*.h5)" 
    827834    kwargs = { 
    828835        'caption'   : 'Save As', 
    … …  
    844851    if os.path.splitext(filename)[1].lower() == ext_format: 
    845852        loader.save(filename, data, ext_format) 
     853    elif os.path.splitext(filename)[1].lower() == ".h5": 
     854        nxcansaswriter = NXcanSASWriter() 
     855        nxcansaswriter.write([data], filename) 
     856 
    846857 
    847858class FormulaValidator(QtGui.QValidator): 
Note: See TracChangeset for help on using the changeset viewer.