r14046 - in /branches/gui_testing/gui/analyses: __init__.py execute.py results.py -- August 01, 2011 - 22:24

Author: bugman
Date: Mon Aug  1 22:24:30 2011
New Revision: 14046

URL: http://svn.gna.org/viewcvs/relax?rev=14046&view=rev
Log:
Fixes for the results viewer window updating on Mac OS X.

The EVT_SHOW event was not being triggered by the frame's Show() method?!?!


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

Modified: branches/gui_testing/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/__init__.py?rev=14046&r1=14045&r2=14046&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/__init__.py (original)
+++ branches/gui_testing/gui/analyses/__init__.py Mon Aug  1 22:24:30 2011
@@ -81,6 +81,9 @@
         # Create a container in the status singleton for the analyses.
         status.analyses = Status_container()
 
+        # Create the results viewer window.
+        self.results_viewer = Results_viewer(gui=self.gui)
+
         # Register the page switch method for pipe switches.
         self.name = 'notebook page switcher'
         status.observers.pipe_alteration.register(self.name, 
self.pipe_switch)
@@ -565,10 +568,6 @@
         @type event:    wx event
         """
 
-        # Build the results viewer window.
-        if not hasattr(self, 'results_viewer'):
-            self.results_viewer = Results_viewer(gui=self.gui)
-
         # Open the window.
         if status.show_gui:
             self.results_viewer.Show()

Modified: branches/gui_testing/gui/analyses/execute.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/execute.py?rev=14046&r1=14045&r2=14046&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/execute.py (original)
+++ branches/gui_testing/gui/analyses/execute.py Mon Aug  1 22:24:30 2011
@@ -104,6 +104,7 @@
 
         # Display the results viewer.
         if self.results_display:
+            wx.CallAfter(self.gui.analysis.results_viewer.update_window, 
None)
             wx.CallAfter(self.gui.analysis.show_results_viewer, None)
 
 

Modified: branches/gui_testing/gui/analyses/results.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/results.py?rev=14046&r1=14045&r2=14046&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/results.py (original)
+++ branches/gui_testing/gui/analyses/results.py Mon Aug  1 22:24:30 2011
@@ -38,7 +38,7 @@
 
 
 class Results_viewer(wx.Frame):
-    """The base class for the noe frames."""
+    """The results viewer frame."""
 
     # Some class variables.
     border = 10
@@ -90,7 +90,6 @@
         box_centre.Add(self.button_open, 0, wx.ALIGN_RIGHT, 5)
 
         # Bind some events.
-        self.Bind(wx.EVT_SHOW, self.update_window)
         self.Bind(wx.EVT_LEFT_DOWN, self.update_choices, self.analysis_list)
         self.Bind(wx.EVT_COMBOBOX, self.on_choice, self.analysis_list)
         self.Bind(wx.EVT_CLOSE, self.handler_close)
@@ -229,7 +228,7 @@
         
self.analysis_list.SetValue(str_to_gui(self.gui.analysis.current_analysis_name()))
 
 
-    def update_window(self, event):
+    def update_window(self, event=None):
         """Update the window.
 
         @param event:   The wx event.