Changeset 92a2ecd in sasview for src/sans/perspectives/invariant/invariant_state.py

Timestamp:

May 8, 2014 12:55:23 PM (11 years ago)

Author:

Jeff Krzywon <jeffery.krzywon@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6b20c4e

Parents:

17c62b6

Message:

Save and load project files seems fixed now. I haven't tested individual analysis windows yet.

File:

• src/sans/perspectives/invariant/invariant_state.py (modified) (5 diffs)

src/sans/perspectives/invariant/invariant_state.py

@@ -254 +254 @@
         : param entry_node: XML node within the XML document at which we will append the data [optional]
         """
+        # TODO: Get this to work
         from xml.dom.minidom import getDOMImplementation
         import time
@@ -273 +274 @@
             else:
                 entry_node.appendChild(top_element)
-            
+                
         attr = newdoc.createAttribute("version")
         attr.nodeValue = '1.0'
@@ -352 +353 @@
             return None
         else:
-            return newdoc.toprettyxml()
+            return newdoc
         
     def fromXML(self, file=None, node=None):
@@ -742 +743 @@
                 for entry in entry_list:
                     
-                    sas_entry = self._parse_entry(entry)
+                    sas_entry, _ = self._parse_entry(entry)
                     invstate = self._parse_state(entry)
                     
@@ -809 +810 @@
         # Add the invariant information to the XML document
         if state is not None:
-            state.toXML(datainfo.name,doc=doc, entry_node=sasentry)
+            doc = state.toXML(datainfo.name,doc=doc, entry_node=sasentry)
         return doc