r27235 - in /branches/frame_order_cleanup: ./ gui/relax_gui.py -- January 20, 2015 - 14:03

Author: bugman
Date: Tue Jan 20 14:03:04 2015
New Revision: 27235

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

........
  r27164 | bugman | 2015-01-14 15:35:01 +0100 (Wed, 14 Jan 2015) | 8 lines
  
  Fix for the showing of the spin viewer window in the GUI tests.
  
  The show_tree() method of the main GUI window class was not calling the 
custom
  self.spin_viewer.Show() method, as required to set up the observer objects 
required to keep the spin
  viewer window updated.  The value of status.show_gui was blocking this.  
Instead the show argument
  of this Show() method is being set to status.show_gui to allow the method 
to always be executed.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/gui/relax_gui.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 20 14:03:04 2015
@@ -1 +1 @@
-/trunk:1-27116,27119-27163
+/trunk:1-27116,27119-27164

Modified: branches/frame_order_cleanup/gui/relax_gui.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/relax_gui.py?rev=27235&r1=27234&r2=27235&view=diff
==============================================================================
--- branches/frame_order_cleanup/gui/relax_gui.py       (original)
+++ branches/frame_order_cleanup/gui/relax_gui.py       Tue Jan 20 14:03:04 
2015
@@ -779,8 +779,8 @@
             return
 
         # Open the window (the GUI flag check is inside the Show method).
-        if status.show_gui and not self.spin_viewer.IsShown():
-            self.spin_viewer.Show()
+        if not self.spin_viewer.IsShown():
+            self.spin_viewer.Show(show=status.show_gui)
 
 
     def state_load(self, event=None, file_name=None):