r13409 - /branches/gui_testing/gui/analyses/__init__.py -- July 01, 2011 - 22:48

Author: bugman
Date: Fri Jul  1 22:48:17 2011
New Revision: 13409

URL: http://svn.gna.org/viewcvs/relax?rev=13409&view=rev
Log:
All data pipes associated with an analysis are deleted when that analysis is 
closed.


Modified:
    branches/gui_testing/gui/analyses/__init__.py

Modified: branches/gui_testing/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/__init__.py?rev=13409&r1=13408&r2=13409&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/__init__.py (original)
+++ branches/gui_testing/gui/analyses/__init__.py Fri Jul  1 22:48:17 2011
@@ -30,6 +30,7 @@
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()
+from generic_fns import pipes
 from status import Status; status = Status()
 
 # relax GUI module imports.
@@ -135,15 +136,18 @@
         @type index:    int
         """
 
-        # Delete the data store object.
-        ds.relax_gui.analyses.pop(index)
-
-        # Delete the tab.
-        self.notebook.DeletePage(index)
-
         # Execute the analysis delete method, if it exists.
         if hasattr(self._analyses[index], 'delete'):
             self._analyses[index].delete()
+
+        # Delete all data pipes associated with the analysis.
+        pipes.delete(ds.relax_gui.analyses[index].pipe_name)
+
+        # Delete the data store object.
+        ds.relax_gui.analyses.pop(index)
+
+        # Delete the tab.
+        self.notebook.DeletePage(index)
 
         # Delete the tab object.
         self._analyses.pop(index)