r27600 - /trunk/pipe_control/rdc.py -- February 06, 2015 - 15:14

Author: bugman
Date: Fri Feb  6 15:14:15 2015
New Revision: 27600

URL: http://svn.gna.org/viewcvs/relax?rev=27600&view=rev
Log:
The rdc.corr_plot user function backend now uses the relax library plotting 
API.

The write_xy_data() and write_xy_header() functions from lib.plotting.api are 
now uses instead of
the equivalent pipe_control.grace functions which no longer exist.


Modified:
    trunk/pipe_control/rdc.py

Modified: trunk/pipe_control/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/rdc.py?rev=27600&r1=27599&r2=27600&view=diff
==============================================================================
--- trunk/pipe_control/rdc.py   (original)
+++ trunk/pipe_control/rdc.py   Fri Feb  6 15:14:15 2015
@@ -38,8 +38,9 @@
 from lib.io import extract_data, open_write_file, strip, write_data
 from lib.periodic_table import periodic_table
 from lib.physical_constants import dipolar_constant
+from lib.plotting.api import write_xy_data, write_xy_header
 from lib.warnings import RelaxWarning, RelaxSpinTypeWarning
-from pipe_control import grace, pipes
+from pipe_control import pipes
 from pipe_control.align_tensor import get_tensor_index, get_tensor_object, 
opt_uses_align_data, opt_uses_tensor
 from pipe_control.interatomic import consistent_interatomic_data, 
create_interatom, interatomic_loop, return_interatom
 from pipe_control.mol_res_spin import exists_mol_res_spin_data, 
is_pseudoatom, pseudoatom_loop, return_spin
@@ -496,13 +497,11 @@
     else:
         graph_type = 'xy'
 
-    # Grace file.
-    if format == 'grace':
-        # The header.
-        grace.write_xy_header(file=file, title=title, subtitle=subtitle, 
world=[[min_rdc, min_rdc, max_rdc, max_rdc]], sets=[size], 
set_names=[[None]+cdp.rdc_ids], linestyle=[[2]+[0]*size], data_type=['rdc', 
'rdc_bc'], axis_labels=[axis_labels], tick_major_spacing=[[10, 10]], 
tick_minor_count=[[9, 9]], legend_pos=[[1, 0.5]])
-
-        # The main data.
-        grace.write_xy_data(data=data, file=file, graph_type=graph_type, 
autoscale=False)
+    # The header.
+    write_xy_header(format=format, file=file, title=title, 
subtitle=subtitle, world=[[min_rdc, min_rdc, max_rdc, max_rdc]], sets=[size], 
set_names=[[None]+cdp.rdc_ids], linestyle=[[2]+[0]*size], data_type=['rdc', 
'rdc_bc'], axis_labels=[axis_labels], tick_major_spacing=[[10, 10]], 
tick_minor_count=[[9, 9]], legend_pos=[[1, 0.5]])
+
+    # The main data.
+    write_xy_data(format=format, data=data, file=file, 
graph_type=graph_type, autoscale=False)
 
 
 def delete(align_id=None):