r19447 - /trunk/pipe_control/plotting.py -- April 11, 2013 - 09:42

Author: bugman
Date: Thu Apr 11 09:42:37 2013
New Revision: 19447

URL: http://svn.gna.org/viewcvs/relax?rev=19447&view=rev
Log:
The spin ID string is now being used by the plotting functions.

The spin ID was not being passed into the assemble_data_*() functions.


Modified:
    trunk/pipe_control/plotting.py

Modified: trunk/pipe_control/plotting.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/plotting.py?rev=19447&r1=19446&r2=19447&view=diff
==============================================================================
--- trunk/pipe_control/plotting.py (original)
+++ trunk/pipe_control/plotting.py Thu Apr 11 09:42:37 2013
@@ -61,13 +61,13 @@
 
     # Assemble the different graph data structures.
     if graph_type == 'seq-value':
-        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_seq_value(x_data_name=x_data_name, y_data_name=y_data_name, 
plot_data=plot_data)
+        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_seq_value(spin_id=spin_id, x_data_name=x_data_name, 
y_data_name=y_data_name, plot_data=plot_data)
     elif graph_type == 'value-value':
-        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_scatter(x_data_name=x_data_name, y_data_name=y_data_name, 
plot_data=plot_data)
+        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_scatter(spin_id=spin_id, x_data_name=x_data_name, 
y_data_name=y_data_name, plot_data=plot_data)
     elif graph_type == 'seq-series':
-        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_seq_series(x_data_name=x_data_name, y_data_name=y_data_name, 
plot_data=plot_data, x_type=x_type, y_type=y_type)
+        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_seq_series(spin_id=spin_id, x_data_name=x_data_name, 
y_data_name=y_data_name, plot_data=plot_data, x_type=x_type, y_type=y_type)
     elif graph_type == 'series-series':
-        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_series_series(x_data_name=x_data_name, y_data_name=y_data_name, 
plot_data=plot_data, x_type=x_type, y_type=y_type)
+        data, set_labels, x_err_flag, y_err_flag = 
assemble_data_series_series(spin_id=spin_id, x_data_name=x_data_name, 
y_data_name=y_data_name, plot_data=plot_data, x_type=x_type, y_type=y_type)
     else:
         raise RelaxError("Unknown graph type '%s'." % graph_type)
 
@@ -257,7 +257,7 @@
     # The number of data sets.
     set_count = 1
     if x_data_name == 'res_num' or y_data_name == 'res_num':
-        set_count = count_max_spins_per_residue()
+        set_count = count_max_spins_per_residue(spin_id=spin_id)
 
     # Expand the data structures for the number of sets.
     if set_count > 1: