r27398 - /trunk/data_store/__init__.py -- January 30, 2015 - 17:34

Author: bugman
Date: Fri Jan 30 17:34:36 2015
New Revision: 27398

URL: http://svn.gna.org/viewcvs/relax?rev=27398&view=rev
Log:
The data store ds.sequence_alignment object is now being treated as special 
and is blacklisted.

The object is now explicitly recreated in the data store from_xml() method.


Modified:
    trunk/data_store/__init__.py

Modified: trunk/data_store/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data_store/__init__.py?rev=27398&r1=27397&r2=27398&view=diff
==============================================================================
--- trunk/data_store/__init__.py        (original)
+++ trunk/data_store/__init__.py        Fri Jan 30 17:34:36 2015
@@ -32,6 +32,7 @@
 # relax module imports.
 from data_store.gui import Gui
 from data_store.pipe_container import PipeContainer
+from data_store.seq_align import Sequence_alignments
 import pipe_control
 from lib.compat import builtins
 from lib.errors import RelaxError, RelaxPipeError, RelaxNoPipeError
@@ -405,8 +406,8 @@
 
         # Objects which should be in here.
         blacklist = [
-                'pipe_bundles',
-                'relax_gui'
+            'pipe_bundles',
+            'relax_gui'
         ]
 
         # An object has been added to the data store.
@@ -479,8 +480,17 @@
         if gui_nodes:
             self.relax_gui.from_xml(gui_nodes[0], file_version=file_version)
 
+        # Get the sequence alignment nodes.
+        seq_align_nodes = 
relax_node.getElementsByTagName('sequence_alignment')
+        if seq_align_nodes:
+            # Initialise the object.
+            self.sequence_alignment = Sequence_alignments()
+
+            # Populate it.
+            self.sequence_alignment.from_xml(seq_align_nodes[0], 
file_version=file_version)
+
         # Recreate all the data store data structures.
-        xml_to_object(relax_node, self, file_version=file_version, 
blacklist=['pipe', 'relax_gui'])
+        xml_to_object(relax_node, self, file_version=file_version, 
blacklist=['pipe', 'relax_gui, sequence_alignment'])
 
         # Get the pipe nodes.
         pipe_nodes = relax_node.getElementsByTagName('pipe')