r13703 - in /branches/gui_testing/gui/analyses: __init__.py auto_noe.py auto_rx_base.py -- July 18, 2011 - 18:36

Author: bugman
Date: Mon Jul 18 18:36:18 2011
New Revision: 13703

URL: http://svn.gna.org/viewcvs/relax?rev=13703&view=rev
Log:
The analysis specific GUI methods registered as observers in the status 
object are now removed on reset.

This is a much better solution than resetting the entire status object.


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

Modified: branches/gui_testing/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/__init__.py?rev=13703&r1=13702&r2=13703&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/__init__.py (original)
+++ branches/gui_testing/gui/analyses/__init__.py Mon Jul 18 18:36:18 2011
@@ -84,6 +84,9 @@
         # Register the page switch method for pipe switches.
         self.name = 'notebook page switcher'
         status.observers.pipe_switch.register(self.name, self.pipe_switch)
+
+        # Register the deletion of all analyses for the reset status 
observer.
+        status.observers.reset.register('gui analyses', self.delete_all)
 
 
     def analysis_data_loop(self):

Modified: branches/gui_testing/gui/analyses/auto_noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_noe.py?rev=13703&r1=13702&r2=13703&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_noe.py (original)
+++ branches/gui_testing/gui/analyses/auto_noe.py Mon Jul 18 18:36:18 2011
@@ -198,6 +198,9 @@
     def delete(self):
         """Unregister the spin count from the user functions."""
 
+        # Clean up the peak intensity object.
+        self.peak_intensity.delete()
+
         # Remove.
         status.observers.uf_gui.unregister(self.data.pipe_name)
 

Modified: branches/gui_testing/gui/analyses/auto_rx_base.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_rx_base.py?rev=13703&r1=13702&r2=13703&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_rx_base.py (original)
+++ branches/gui_testing/gui/analyses/auto_rx_base.py Mon Jul 18 18:36:18 2011
@@ -253,6 +253,9 @@
     def delete(self):
         """Unregister the spin count from the user functions."""
 
+        # Clean up the peak intensity object.
+        self.peak_intensity.delete()
+
         # Remove.
         status.observers.uf_gui.unregister(self.data.pipe_name)