r14463 - in /1.3/gui: analyses/__init__.py spin_viewer/frame.py spin_viewer/tree.py -- August 26, 2011 - 09:03

Author: bugman
Date: Fri Aug 26 09:03:30 2011
New Revision: 14463

URL: http://svn.gna.org/viewcvs/relax?rev=14463&view=rev
Log:
Fixes for all the calls to the GUI interpreter instance.

This is now a special thread object, and user function calls are now queued.


Modified:
    1.3/gui/analyses/__init__.py
    1.3/gui/spin_viewer/frame.py
    1.3/gui/spin_viewer/tree.py

Modified: 1.3/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/analyses/__init__.py?rev=14463&r1=14462&r2=14463&view=diff
==============================================================================
--- 1.3/gui/analyses/__init__.py (original)
+++ 1.3/gui/analyses/__init__.py Fri Aug 26 09:03:30 2011
@@ -452,7 +452,7 @@
 
         # Switch to the major data pipe of that page if not the current one.
         if self._switch_flag and pipes.cdp_name() != 
ds.relax_gui.analyses[self._current].pipe_name:
-            
self.gui.interpreter.pipe.switch(ds.relax_gui.analyses[self._current].pipe_name)
+            self.gui.interpreter.queue('pipe.switch', 
ds.relax_gui.analyses[self._current].pipe_name)
 
         # Normal operation.
         event.Skip()

Modified: 1.3/gui/spin_viewer/frame.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/spin_viewer/frame.py?rev=14463&r1=14462&r2=14463&view=diff
==============================================================================
--- 1.3/gui/spin_viewer/frame.py (original)
+++ 1.3/gui/spin_viewer/frame.py Fri Aug 26 09:03:30 2011
@@ -375,7 +375,7 @@
         # Switch.
         if pipe_switch:
             # Switch data pipes.
-            self.gui.interpreter.pipe.switch(pipe)
+            self.gui.interpreter.queue('pipe.switch', pipe)
 
             # Update the tree view.
             self.tree_panel.update()

Modified: 1.3/gui/spin_viewer/tree.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/gui/spin_viewer/tree.py?rev=14463&r1=14462&r2=14463&view=diff
==============================================================================
--- 1.3/gui/spin_viewer/tree.py (original)
+++ 1.3/gui/spin_viewer/tree.py Fri Aug 26 09:03:30 2011
@@ -218,7 +218,7 @@
             return
 
         # Delete the molecule.
-        self.gui.interpreter.molecule.delete(gui_to_str(self.info['id']))
+        self.gui.interpreter.queue('molecule.delete', 
gui_to_str(self.info['id']))
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -237,7 +237,7 @@
             return
 
         # Delete the residue.
-        self.gui.interpreter.residue.delete(gui_to_str(self.info['id']))
+        self.gui.interpreter.queue('residue.delete', 
gui_to_str(self.info['id']))
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -256,7 +256,7 @@
             return
 
         # Delete the spin.
-        self.gui.interpreter.spin.delete(gui_to_str(self.info['id']))
+        self.gui.interpreter.queue('spin.delete', 
gui_to_str(self.info['id']))
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -275,7 +275,7 @@
             return
 
         # Deselect the molecule.
-        
self.gui.interpreter.deselect.spin(spin_id=gui_to_str(self.info['id']), 
change_all=False)
+        self.gui.interpreter.queue('deselect.spin', 
spin_id=gui_to_str(self.info['id']), change_all=False)
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -294,7 +294,7 @@
             return
 
         # Deselect the residue.
-        
self.gui.interpreter.deselect.spin(spin_id=gui_to_str(self.info['id']), 
change_all=False)
+        self.gui.interpreter.queue('deselect.spin', 
spin_id=gui_to_str(self.info['id']), change_all=False)
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -308,7 +308,7 @@
         """
 
         # Deselect the spin.
-        
self.gui.interpreter.deselect.spin(spin_id=gui_to_str(self.info['id']), 
change_all=False)
+        self.gui.interpreter.queue('deselect.spin', 
spin_id=gui_to_str(self.info['id']), change_all=False)
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -539,7 +539,7 @@
             return
 
         # Select the molecule.
-        
self.gui.interpreter.select.spin(spin_id=gui_to_str(self.info['id']), 
change_all=False)
+        self.gui.interpreter.queue('select.spin', 
spin_id=gui_to_str(self.info['id']), change_all=False)
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -558,7 +558,7 @@
             return
 
         # Select the residue.
-        
self.gui.interpreter.select.spin(spin_id=gui_to_str(self.info['id']), 
change_all=False)
+        self.gui.interpreter.queue('select.spin', 
spin_id=gui_to_str(self.info['id']), change_all=False)
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()
@@ -572,7 +572,7 @@
         """
 
         # Select the spin.
-        
self.gui.interpreter.select.spin(spin_id=gui_to_str(self.info['id']), 
change_all=False)
+        self.gui.interpreter.queue('select.spin', 
spin_id=gui_to_str(self.info['id']), change_all=False)
 
         # Notify all observers that a user function has completed.
         status.observers.gui_uf.notify()