r14482 - /1.3/generic_fns/pymol_control.py -- August 26, 2011 - 12:36

Author: bugman
Date: Fri Aug 26 12:36:18 2011
New Revision: 14482

URL: http://svn.gna.org/viewcvs/relax?rev=14482&view=rev
Log:
Built the back end of the pymol.macro_run user function.


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=14482&r1=14481&r2=14482&view=diff
==============================================================================
--- 1.3/generic_fns/pymol_control.py (original)
+++ 1.3/generic_fns/pymol_control.py Fri Aug 26 12:36:18 2011
@@ -39,7 +39,7 @@
 from generic_fns import pipes
 from maths_fns.rotation_matrix import euler_to_R_zyz, R_to_axis_angle
 from relax_errors import RelaxError, RelaxNoPdbError, RelaxNoSequenceError
-from relax_io import file_root, get_file_path, open_write_file, test_binary
+from relax_io import file_root, get_file_path, open_read_file, 
open_write_file, test_binary
 from specific_fns.setup import get_specific_fn
 from status import Status; status = Status()
 
@@ -375,6 +375,24 @@
 
     # Loop over the commands and execute them.
     for command in commands:
+        pymol_obj.exec_cmd(command)
+
+
+def macro_run(file=None, dir=None):
+    """Execute the PyMOL macro from the given text file.
+
+    @keyword file:          The name of the macro file to execute.
+    @type file:             str
+    @keyword dir:           The name of the directory where the macro file 
is located.
+    @type dir:              str
+    """
+
+    # Open the file for reading.
+    file_path = get_file_path(file, dir)
+    file = open_read_file(file, dir, force)
+
+    # Loop over the commands and apply them.
+    for command in file.readlines():
         pymol_obj.exec_cmd(command)