r14250 - in /branches/gui_testing: ./ data/__init__.py -- August 08, 2011 - 11:14

Author: bugman
Date: Mon Aug  8 11:14:56 2011
New Revision: 14250

URL: http://svn.gna.org/viewcvs/relax?rev=14250&view=rev
Log:
Merged revisions 14249 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r14249 | bugman | 2011-08-08 11:12:46 +0200 (Mon, 08 Aug 2011) | 6 lines
  
  Bug fix for the saving/loading of a results file in GUI mode.
  
  The save files were containing the ds.relax_gui object and restoring it on 
loading.  This caused
  the data storage of the GUI to change underneath the GUI resulting in a 
crash or race conditions.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/data/__init__.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug  8 11:14:56 2011
@@ -1,1 +1,1 @@
-/1.3:1-14185
+/1.3:1-14249

Modified: branches/gui_testing/data/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/data/__init__.py?rev=14250&r1=14249&r2=14250&view=diff
==============================================================================
--- branches/gui_testing/data/__init__.py (original)
+++ branches/gui_testing/data/__init__.py Mon Aug  8 11:14:56 2011
@@ -368,27 +368,27 @@
         top_element.setAttribute('time', asctime())
 
         # Add all objects in the data store base object to the XML element.
-        blacklist = list(self.__class__.__dict__.keys() + 
dict.__dict__.keys())
-        for name in dir(self):
-            # Skip blacklisted objects.
-            if name in blacklist:
-                continue
-
-            # Skip special objects.
-            if search('^_', name):
-                continue
-
-            # Execute any to_xml() methods, and add that object to the 
blacklist.
-            obj = getattr(self, name)
-            if hasattr(obj, 'to_xml'):
-                obj.to_xml(xmldoc, top_element)
-                blacklist = blacklist + [name]
-
-        # Remove the current data pipe from the blacklist!
-        blacklist.remove('current_pipe')
-
-        # Add all simple python objects within the PipeContainer to the pipe 
element.
         if all:
+            blacklist = list(self.__class__.__dict__.keys() + 
dict.__dict__.keys())
+            for name in dir(self):
+                # Skip blacklisted objects.
+                if name in blacklist:
+                    continue
+
+                # Skip special objects.
+                if search('^_', name):
+                    continue
+
+                # Execute any to_xml() methods, and add that object to the 
blacklist.
+                obj = getattr(self, name)
+                if hasattr(obj, 'to_xml'):
+                    obj.to_xml(xmldoc, top_element)
+                    blacklist = blacklist + [name]
+
+            # Remove the current data pipe from the blacklist!
+            blacklist.remove('current_pipe')
+
+            # Add all simple python objects within the store.
             fill_object_contents(xmldoc, top_element, object=self, 
blacklist=blacklist)
 
         # Loop over the pipes.