r11232 - /1.3/generic_fns/pymol_control.py -- June 11, 2010 - 14:56

Author: bugman
Date: Fri Jun 11 14:56:04 2010
New Revision: 11232

URL: http://svn.gna.org/viewcvs/relax?rev=11232&view=rev
Log:
Reverted r11231 as this is not the best way to control pymol.

The command used was:
svn merge -r11231:11230 .


Modified:
    1.3/generic_fns/pymol_control.py

Modified: 1.3/generic_fns/pymol_control.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pymol_control.py?rev=11232&r1=11231&r2=11232&view=diff
==============================================================================
--- 1.3/generic_fns/pymol_control.py (original)
+++ 1.3/generic_fns/pymol_control.py Fri Jun 11 14:56:04 2010
@@ -78,31 +78,13 @@
 
         # Execute the command.
         if self.exec_mode == 'module':
-            self.translate_cmd(command)
+            pymol.cmd.do(command)
         else:
             self.pymol.write(command + '\n')
 
         # Place the command in the command history.
         if store_command:
             self.command_history = self.command_history + command + "\n"
-
-
-    def translate_cmd(self, command):
-        """Translate the command to appropriate pymol.cmd calls.
-
-        The translation is to prevent problems caused by pymol.cmd.do() not 
waiting for the command to complete.
-
-        @param command:     The PyMOL command.
-        @type command:      str
-        """
-
-        # Ray-tracing (this totally dies in pymol.cmd.do()).
-        if command == 'ray':
-            pymol.cmd.ray()
-
-        # Use pymol.cmd.do() for all other commands.
-        else:
-            pymol.cmd.do(command)
 
 
     def open_gui(self):