Changeset 92a2ecd in sasview

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.

Location:

src/sans

Files:

• dataloader/readers/cansas_reader.py (modified) (2 diffs)
• perspectives/invariant/invariant_panel.py (modified) (1 diff)
• perspectives/invariant/invariant_state.py (modified) (5 diffs)
• perspectives/pr/inversion_panel.py (modified) (1 diff)
• perspectives/pr/inversion_state.py (modified) (5 diffs)

src/sans/dataloader/readers/cansas_reader.py

@@ -372 +372 @@
                 tagname = node.tag.replace(base_ns, "")
                 tagname_original = tagname
-                if tagname == "fitting_plug_in":
+                if tagname == "fitting_plug_in" or tagname == "pr_inversion" or\
+                    tagname == "invariant":
                     continue
                 names.append(tagname)
@@ -517 +518 @@
                 else:
                     save_data1d = data1d
-                if tagname_original != "fitting_plug_in":
+                if tagname_original == "fitting_plug_in" or \
+                    tagname_original == "invariant" or \
+                    tagname_original == "pr_inversion":
+                    pass
+                else:
                     data1d = save_data1d
                     # Remove tagname from names to restore original base

src/sans/perspectives/invariant/invariant_panel.py

@@ -218 +218 @@
             if new_doc is not None:
                 if doc is not None and hasattr(doc, "firstChild"):
-                    child = new_doc.firstChild.firstChild
-                    doc.firstChild.appendChild(child)  
+                    child = new_doc.getElementsByTagName("SASentry")
+                    for item in child:
+                        doc.firstChild.appendChild(item)
                 else:
                     doc = new_doc

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
 

src/sans/perspectives/pr/inversion_panel.py

@@ -255 +255 @@
             if new_doc is not None:
                 if doc is not None and hasattr(doc, "firstChild"):
-                    child = new_doc.firstChild.firstChild
-                    doc.firstChild.appendChild(child)  
+                    child = new_doc.getElementsByTagName("SASentry")
+                    for item in child:
+                        doc.firstChild.appendChild(item)
                 else:
                     doc = new_doc

src/sans/perspectives/pr/inversion_state.py

@@ -148 +148 @@
         
         """
+        #TODO: Get this to work
         from xml.dom.minidom import getDOMImplementation
 
@@ -221 +222 @@
             return None
         else:
-            return newdoc.toprettyxml()
+            return newdoc
 
     def fromXML(self, file=None, node=None):
@@ -470 +471 @@
 
                 for entry in entry_list:
-                    sas_entry = self._parse_entry(entry)
+                    sas_entry, _ = self._parse_entry(entry)
                     prstate = self._parse_prstate(entry)
                     #prstate could be None when .svs file is loaded
@@ -504 +505 @@
         # Sanity check
         if self.cansas == True:
-            doc =self.write_toXML(datainfo, prstate)        
+            doc = self.write_toXML(datainfo, prstate)        
             # Write the XML document
             fd = open(filename, 'w')
@@ -527 +528 @@
         # Create basic XML document
         doc, sasentry = self._to_xml_doc(datainfo)
-    
+        
         # Add the invariant information to the XML document
         if state is not None:
-            state.toXML(doc=doc, entry_node=sasentry)
+            doc = state.toXML(doc=doc, entry_node=sasentry)
             
         return doc