r27475 - in /trunk: gui/pipe_editor.py gui/results_viewer.py test_suite/gui_tests/base_classes.py -- February 03, 2015 - 15:54

Author: bugman
Date: Tue Feb  3 15:54:42 2015
New Revision: 27475

URL: http://svn.gna.org/viewcvs/relax?rev=27475&view=rev
Log:
Created custom Destroy() methods for the pipe editor and results viewer GUI 
windows.


Modified:
    trunk/gui/pipe_editor.py
    trunk/gui/results_viewer.py
    trunk/test_suite/gui_tests/base_classes.py

Modified: trunk/gui/pipe_editor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/pipe_editor.py?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/gui/pipe_editor.py    (original)
+++ trunk/gui/pipe_editor.py    Tue Feb  3 15:54:42 2015
@@ -104,6 +104,20 @@
         self.update_grid()
 
 
+    def Destroy(self, event):
+        """Cleanly destroy the window.
+
+        @param event:   The wx event.
+        @type event:    wx event
+        """
+
+        # Unregister the methods from the observers to avoid unnecessary 
updating.
+        self.observer_setup(register=False)
+
+        # Call the parent Destroy() method.
+        super(Pipe_editor, self).Destroy()
+
+
     def activate(self):
         """Activate or deactivate certain elements in response to the 
execution lock."""
 

Modified: trunk/gui/results_viewer.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/results_viewer.py?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/gui/results_viewer.py (original)
+++ trunk/gui/results_viewer.py Tue Feb  3 15:54:42 2015
@@ -106,6 +106,23 @@
         self.name = 'results viewer'
 
 
+    def Destroy(self, event):
+        """Cleanly destroy the window.
+
+        @param event:   The wx event.
+        @type event:    wx event
+        """
+
+        # Unregister the methods from the observers to avoid unnecessary 
updating.
+        status.observers.gui_uf.unregister(self.name)
+        status.observers.pipe_alteration.unregister(self.name)
+        status.observers.result_file.unregister(self.name)
+        status.observers.exec_lock.unregister(self.name)
+
+        # Call the parent Destroy() method.
+        super(Results_viewer, self).Destroy()
+
+
     def Show(self, show=True):
         """Change the behaviour of showing the window to update the content.
 

Modified: trunk/test_suite/gui_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/base_classes.py?rev=27475&r1=27474&r2=27475&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/base_classes.py  (original)
+++ trunk/test_suite/gui_tests/base_classes.py  Tue Feb  3 15:54:42 2015
@@ -169,15 +169,11 @@
 
         # Kill the pipe editor window.
         if hasattr(self.app.gui, 'pipe_editor'):
-            self.app.gui.pipe_editor.handler_close()
-            wx.Yield()
             self.app.gui.pipe_editor.Destroy()
             del self.app.gui.pipe_editor
 
         # Kill the results viewer window.
         if hasattr(self.app.gui, 'results_viewer'):
-            self.app.gui.results_viewer.handler_close()
-            wx.Yield()
             self.app.gui.results_viewer.Destroy()
             del self.app.gui.results_viewer