r14111 - in /branches/gui_testing: ./ generic_fns/grace.py generic_fns/value.py -- August 04, 2011 - 11:43

Author: bugman
Date: Thu Aug  4 11:43:14 2011
New Revision: 14111

URL: http://svn.gna.org/viewcvs/relax?rev=14111&view=rev
Log:
Merged revisions 14107-14110 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r14107 | bugman | 2011-08-04 11:37:57 +0200 (Thu, 04 Aug 2011) | 6 lines
  
  Files created by the grace.write user function are now put into a new list 
cdp.results_files.
  
  This is a list of lists, with the sublist composed of two elements.  The 
first is an identifier
  string such as 'grace'.  The second is the file name.
........
  r14108 | bugman | 2011-08-04 11:39:43 +0200 (Thu, 04 Aug 2011) | 3 lines
  
  Fix for the addition of grace files to cdp.result_files - the file path is 
now used.
........
  r14109 | bugman | 2011-08-04 11:41:13 +0200 (Thu, 04 Aug 2011) | 5 lines
  
  Another fix for the grace.write user function addition to the 
cdp.result_files list.
  
  The proper variable name is now used.
........
  r14110 | bugman | 2011-08-04 11:41:31 +0200 (Thu, 04 Aug 2011) | 3 lines
  
  The value.write user function now also adds to the cdp.result_files 
structure.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/generic_fns/grace.py
    branches/gui_testing/generic_fns/value.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug  4 11:43:14 2011
@@ -1,1 +1,1 @@
-/1.3:1-14104
+/1.3:1-14110

Modified: branches/gui_testing/generic_fns/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/grace.py?rev=14111&r1=14110&r2=14111&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/grace.py (original)
+++ branches/gui_testing/generic_fns/grace.py Thu Aug  4 11:43:14 2011
@@ -342,6 +342,7 @@
         raise RelaxNoSimError
 
     # Open the file for writing.
+    file_path = get_file_path(file, dir)
     file = open_write_file(file, dir, force)
 
     # Get the data.
@@ -368,6 +369,12 @@
 
     # 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', file_path])
+
 
 
 def write_xy_data(data, file=None, graph_type=None, norm=False):

Modified: branches/gui_testing/generic_fns/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/value.py?rev=14111&r1=14110&r2=14111&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/value.py (original)
+++ branches/gui_testing/generic_fns/value.py Thu Aug  4 11:43:14 2011
@@ -31,7 +31,7 @@
 from generic_fns import minimise, pipes
 from generic_fns.mol_res_spin import exists_mol_res_spin_data, 
generate_spin_id_data_array, return_spin, spin_loop
 from relax_errors import RelaxError, RelaxNoSequenceError, RelaxNoSpinError, 
RelaxParamSetError, RelaxValueError
-from relax_io import open_write_file, read_spin_data, write_spin_data
+from relax_io import get_file_path, open_write_file, read_spin_data, 
write_spin_data
 import specific_fns
 
 
@@ -400,6 +400,7 @@
         raise RelaxNoSequenceError
 
     # Open the file for writing.
+    file_path = get_file_path(file, dir)
     file = open_write_file(file, dir, force)
 
     # Write the data.
@@ -407,6 +408,11 @@
 
     # 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(['text', file_path])
 
 
 def write_data(param=None, file=None, bc=False, return_value=None):