Changeset 8976865 in sasview for src/sas

Timestamp:

Jul 21, 2016 6:41:46 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:

eb8da5f

Parents:

ea2a7348

Message:

Create own CansasReader? subcless in preparation for writing multiple frames

Location:

src/sas

Files:

• sascalc/dataloader/readers/cansas_reader.py (modified) (4 diffs)
• sasgui/perspectives/file_converter/cansas_writer.py (added)
• sasgui/perspectives/file_converter/converter_panel.py (modified) (2 diffs)

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -1013 +1013 @@
         return doc, entry_node
 
-    def _to_xml_doc(self, datainfo, sasentry_attrs=None):
+    def _to_xml_doc(self, datainfo):
         """
         Create an XML document to contain the content of a Data1D
@@ -1031 +1031 @@
         doc = self.create_tree(base_element)
         # Create SASentry Element
-        entry_node = self.create_element("SASentry", sasentry_attrs)
+        entry_node = self.create_element("SASentry")
         root = doc.getroot()
         root.append(entry_node)
@@ -1080 +1080 @@
         return False
 
-    def write(self, filename, datainfo, sasentry_attrs=None):
+    def write(self, filename, datainfo):
         """
         Write the content of a Data1D as a CanSAS XML file
@@ -1088 +1088 @@
         """
         # Create XML document
-        doc, _ = self._to_xml_doc(datainfo, sasentry_attrs)
+        doc, _ = self._to_xml_doc(datainfo)
         # Write the file
         file_ref = open(filename, 'w')

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -18 +18 @@
 from sas.sasgui.guiframe.dataFitting import Data1D
 from sas.sasgui.guiframe.utils import check_float
-from sas.sascalc.dataloader.readers.cansas_reader import Reader as CansasReader
+from sas.sasgui.perspectives.file_converter.cansas_writer import CansasWriter
 from sas.sasgui.perspectives.file_converter.bsl_loader import BSLLoader
 from sas.sascalc.dataloader.data_info import Detector
@@ -72 +72 @@
         self.Layout()
 
-    def convert_to_cansas(self, data, filename):
-        reader = CansasReader()
+    def convert_to_cansas(self, frame_data, filename):
+        reader = CansasWriter()
         entry_attrs = None
         if self.run_name is not None:
             entry_attrs = { 'name': self.run_name }
-        reader.write(filename, data,
+        reader.write(filename, frame_data,
             sasentry_attrs=entry_attrs)