r27601 - in /trunk/pipe_control: grace.py plotting.py -- February 06, 2015 - 15:16

Author: bugman
Date: Fri Feb  6 15:16:05 2015
New Revision: 27601

URL: http://svn.gna.org/viewcvs/relax?rev=27601&view=rev
Log:
More import fixes for the new pipe_control.plotting.write_xy() function.


Modified:
    trunk/pipe_control/grace.py
    trunk/pipe_control/plotting.py

Modified: trunk/pipe_control/grace.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/grace.py?rev=27601&r1=27600&r2=27601&view=diff
==============================================================================
--- trunk/pipe_control/grace.py (original)
+++ trunk/pipe_control/grace.py Fri Feb  6 15:16:05 2015
@@ -24,12 +24,10 @@
 
 # Python module imports.
 from os import system
-from warnings import warn
 
 # relax module imports.
 from lib.errors import RelaxError, RelaxNoSequenceError, RelaxNoSimError
 from lib.io import get_file_path, open_write_file, test_binary
-from lib.warnings import RelaxWarning
 from pipe_control.mol_res_spin import count_molecules, count_residues, 
count_spins, exists_mol_res_spin_data
 from pipe_control import pipes
 from pipe_control.plotting import assemble_data

Modified: trunk/pipe_control/plotting.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/plotting.py?rev=27601&r1=27600&r2=27601&view=diff
==============================================================================
--- trunk/pipe_control/plotting.py      (original)
+++ trunk/pipe_control/plotting.py      Fri Feb  6 15:16:05 2015
@@ -25,11 +25,14 @@
 The numerical graph data handled in these functions consists of a 4 
dimensional list or array object.  The first dimension corresponds to 
different graphs.  The second corresponds the different data sets within a 
single each graph.  The third corresponds to the data series (i.e. each data 
point).  The forth is a list of the information about each point, it is a 
list where the first element is the X value, the second is the Y value, the 
third is the optional dX or dY error, and the forth is the optional dY error 
when X errors are present (the third position is then dx).
 """
 
+# Python module imports.
+from warnings import warn
 
 # relax module imports.
 from lib.errors import RelaxError
 from lib.io import get_file_path, open_write_file
 from lib.plotting.api import write_xy_data, write_xy_header
+from lib.warnings import RelaxWarning
 from pipe_control.mol_res_spin import check_mol_res_spin_data, spin_loop
 from pipe_control.pipes import cdp_name, check_pipe
 from pipe_control.result_files import add_result_file