r14345 - in /branches/gui_testing/generic_fns: molmol.py pymol_control.py -- August 11, 2011 - 11:15

Author: bugman
Date: Thu Aug 11 11:15:01 2011
New Revision: 14345

URL: http://svn.gna.org/viewcvs/relax?rev=14345&view=rev
Log:
The molmol.write and pymol.write now add the macro files to the result files 
list.


Modified:
    branches/gui_testing/generic_fns/molmol.py
    branches/gui_testing/generic_fns/pymol_control.py

Modified: branches/gui_testing/generic_fns/molmol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/molmol.py?rev=14345&r1=14344&r2=14345&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/molmol.py (original)
+++ branches/gui_testing/generic_fns/molmol.py Thu Aug 11 11:15:01 2011
@@ -33,8 +33,9 @@
 from generic_fns.mol_res_spin import exists_mol_res_spin_data
 from generic_fns import pipes
 from relax_errors import RelaxError, RelaxNoSequenceError
-from relax_io import open_write_file, test_binary
+from relax_io import get_file_path, open_write_file, test_binary
 from specific_fns.setup import get_specific_fn
+from status import Status; status = Status()
 
 
 class Molmol:
@@ -331,6 +332,7 @@
         file = data_type + '.mac'
 
     # Open the file for writing.
+    file_path = get_file_path(file, dir)
     file = open_write_file(file, dir, force)
 
     # Loop over the commands and write them.
@@ -339,3 +341,9 @@
 
     # Close the file.
     file.close()
+
+    # Add the file to the results file list.
+    if not hasattr(cdp, 'result_files'):
+        cdp.result_files = []
+    cdp.result_files.append(['grace', 'Grace', file_path])
+    status.observers.result_file.notify()

Modified: branches/gui_testing/generic_fns/pymol_control.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/pymol_control.py?rev=14345&r1=14344&r2=14345&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/pymol_control.py (original)
+++ branches/gui_testing/generic_fns/pymol_control.py Thu Aug 11 11:15:01 2011
@@ -39,8 +39,9 @@
 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, open_write_file, test_binary
+from relax_io import file_root, get_file_path, open_write_file, test_binary
 from specific_fns.setup import get_specific_fn
+from status import Status; status = Status()
 
 
 class Pymol:
@@ -527,6 +528,7 @@
         file = data_type + '.mac'
 
     # Open the file for writing.
+    file_path = get_file_path(file, dir)
     file = open_write_file(file, dir, force)
 
     # Loop over the commands and write them.
@@ -535,3 +537,9 @@
 
     # Close the file.
     file.close()
+
+    # Add the file to the results file list.
+    if not hasattr(cdp, 'result_files'):
+        cdp.result_files = []
+    cdp.result_files.append(['grace', 'Grace', file_path])
+    status.observers.result_file.notify()