r11600 - /branches/bieri_gui/data/__init__.py -- September 17, 2010 - 11:14

Author: bugman
Date: Fri Sep 17 11:14:50 2010
New Revision: 11600

URL: http://svn.gna.org/viewcvs/relax?rev=11600&view=rev
Log:
The relax GUI info in the relax data store is now being properly converted to 
and from XML.

The save state now is functional again.


Modified:
    branches/bieri_gui/data/__init__.py

Modified: branches/bieri_gui/data/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/data/__init__.py?rev=11600&r1=11599&r2=11600&view=diff
==============================================================================
--- branches/bieri_gui/data/__init__.py (original)
+++ branches/bieri_gui/data/__init__.py Fri Sep 17 11:14:50 2010
@@ -251,7 +251,7 @@
             self.relax_gui.from_xml(gui_nodes[0])
 
         # Recreate all the data store data structures.
-        xml_to_object(relax_node, self, blacklist=['pipe'])
+        xml_to_object(relax_node, self, blacklist=['pipe', 'relax_gui'])
 
         # Get the pipe nodes.
         pipe_nodes = relax_node.getElementsByTagName('pipe')
@@ -365,7 +365,7 @@
 
         # Add all simple python objects within the PipeContainer to the pipe 
element.
         if all:
-            fill_object_contents(xmldoc, top_element, object=self, 
blacklist=list(self.__class__.__dict__.keys() + dict.__dict__.keys()))
+            fill_object_contents(xmldoc, top_element, object=self, 
blacklist=blacklist)
 
         # Loop over the pipes.
         for pipe in pipes: