Changeset 8976865 in sasview


Ignore:
Timestamp:
Jul 21, 2016 6:41:46 AM (3 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:
eb8da5f
Parents:
ea2a7348
Message:

Create own CansasReader? subcless in preparation for writing multiple frames

Location:
src/sas
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/readers/cansas_reader.py

    rd112c30 r8976865  
    10131013        return doc, entry_node 
    10141014 
    1015     def _to_xml_doc(self, datainfo, sasentry_attrs=None): 
     1015    def _to_xml_doc(self, datainfo): 
    10161016        """ 
    10171017        Create an XML document to contain the content of a Data1D 
     
    10311031        doc = self.create_tree(base_element) 
    10321032        # Create SASentry Element 
    1033         entry_node = self.create_element("SASentry", sasentry_attrs) 
     1033        entry_node = self.create_element("SASentry") 
    10341034        root = doc.getroot() 
    10351035        root.append(entry_node) 
     
    10801080        return False 
    10811081 
    1082     def write(self, filename, datainfo, sasentry_attrs=None): 
     1082    def write(self, filename, datainfo): 
    10831083        """ 
    10841084        Write the content of a Data1D as a CanSAS XML file 
     
    10881088        """ 
    10891089        # Create XML document 
    1090         doc, _ = self._to_xml_doc(datainfo, sasentry_attrs) 
     1090        doc, _ = self._to_xml_doc(datainfo) 
    10911091        # Write the file 
    10921092        file_ref = open(filename, 'w') 
  • src/sas/sasgui/perspectives/file_converter/converter_panel.py

    rea2a7348 r8976865  
    1818from sas.sasgui.guiframe.dataFitting import Data1D 
    1919from sas.sasgui.guiframe.utils import check_float 
    20 from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader 
     20from sas.sasgui.perspectives.file_converter.cansas_writer import CansasWriter 
    2121from sas.sasgui.perspectives.file_converter.bsl_loader import BSLLoader 
    2222from sas.sascalc.dataloader.data_info import Detector 
     
    7272        self.Layout() 
    7373 
    74     def convert_to_cansas(self, data, filename): 
    75         reader = CansasReader() 
     74    def convert_to_cansas(self, frame_data, filename): 
     75        reader = CansasWriter() 
    7676        entry_attrs = None 
    7777        if self.run_name is not None: 
    7878            entry_attrs = { 'name': self.run_name } 
    79         reader.write(filename, data, 
     79        reader.write(filename, frame_data, 
    8080            sasentry_attrs=entry_attrs) 
    8181 
Note: See TracChangeset for help on using the changeset viewer.