Author: bugman
Date: Thu Nov 21 17:01:49 2013
New Revision: 21583
URL: http://svn.gna.org/viewcvs/relax?rev=21583&view=rev
Log:
Merged revisions 21582 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r21582 | bugman | 2013-11-21 16:59:20 +0100 (Thu, 21 Nov 2013) | 6 lines
Improvements to the lib.software.grace module.
The set colours are now applied to all set objects. And the axis label and
tick sizes are now much
smaller.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/lib/software/grace.py
branches/relax_disp/test_suite/system_tests/noe.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 21 17:01:49 2013
@@ -1,1 +1,1 @@
-/trunk:1-21580
+/trunk:1-21582
Modified: branches/relax_disp/lib/software/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/software/grace.py?rev=21583&r1=21582&r2=21583&view=diff
==============================================================================
--- branches/relax_disp/lib/software/grace.py (original)
+++ branches/relax_disp/lib/software/grace.py Thu Nov 21 17:01:49 2013
@@ -222,7 +222,7 @@
file.write("@arrange(%i, %i, .1, .1, .1, OFF, OFF, OFF)\n" %
(row_num, col_num))
-def write_xy_header(file=None, paper_size='A4', title=None, subtitle=None,
view=None, graph_num=1, sets=1, set_names=None, set_colours=None,
symbols=None, symbol_sizes=None, symbol_fill=None, linestyle=None,
linetype=None, linewidth=None, data_type=None, seq_type=None,
axis_labels=None, legend=True, legend_pos=None, legend_box_fill_pattern=None,
legend_char_size=None, norm=False):
+def write_xy_header(file=None, paper_size='A4', title=None, subtitle=None,
view=None, graph_num=1, sets=1, set_names=None, set_colours=None,
symbols=None, symbol_sizes=None, symbol_fill=None, linestyle=None,
linetype=None, linewidth=None, data_type=None, seq_type=None,
axis_labels=None, legend=None, legend_pos=None, legend_box_fill_pattern=None,
legend_char_size=None, norm=None):
"""Write the grace header for xy-scatter plots.
Many of these keyword arguments should be supplied in a [X, Y] list
format, where the first element corresponds to the X data, and the second the
Y data. Defaults will be used for any non-supplied args (or lists with
elements set to None).
@@ -277,15 +277,15 @@
"""
# Defaults.
- if not sets:
+ if sets == None:
sets = []
for gi in range(graph_num):
sets.append(1)
- if not linewidth:
+ if linewidth == None:
linewidth = []
for gi in range(graph_num):
linewidth.append(0.5)
- if not norm:
+ if norm == None:
norm = []
for gi in range(graph_num):
norm.append(False)
@@ -390,19 +390,19 @@
# Write out the data.
if axis_labels[gi][i]:
file.write("@ %saxis label \"%s\"\n" % (axes[i],
axis_labels[gi][i]))
- file.write("@ %saxis label char size 1.48\n" % axes[i])
- file.write("@ %saxis tick major size 0.75\n" % axes[i])
+ file.write("@ %saxis label char size 1.00\n" % axes[i])
+ file.write("@ %saxis tick major size 0.50\n" % axes[i])
file.write("@ %saxis tick major linewidth %s\n" % (axes[i],
linewidth[gi]))
file.write("@ %saxis tick minor linewidth %s\n" % (axes[i],
linewidth[gi]))
- file.write("@ %saxis tick minor size 0.45\n" % axes[i])
- file.write("@ %saxis ticklabel char size 1.00\n" % axes[i])
+ file.write("@ %saxis tick minor size 0.25\n" % axes[i])
+ file.write("@ %saxis ticklabel char size 0.70\n" % axes[i])
# Legend box.
- if legend:
+ if legend != None and legend[gi]:
file.write("@ legend on\n")
else:
file.write("@ legend off\n")
- if legend_pos:
+ if legend_pos != None:
file.write("@ legend %s, %s\n" % (legend_pos[gi][0],
legend_pos[gi][1]))
file.write("@ legend box fill pattern %s\n" %
legend_box_fill_pattern[gi])
file.write("@ legend char size %s\n" % legend_char_size[gi])
@@ -438,6 +438,7 @@
# Symbol colour (default to nothing).
if set_colours:
file.write("@ s%i symbol color %s\n" % (i,
set_colours[gi][i]))
+ file.write("@ s%i symbol fill color %s\n" % (i,
set_colours[gi][i]))
# Error bars.
file.write("@ s%i errorbar size 0.5\n" % i)
@@ -452,9 +453,12 @@
if linetype:
file.write("@ s%i line type %s\n" % (i, linetype[gi][i]))
- # Line colours (default to nothing).
+ # Line and all other colours (default to nothing).
if set_colours:
file.write("@ s%i line color %s\n" % (i,
set_colours[gi][i]))
+ file.write("@ s%i fill color %s\n" % (i,
set_colours[gi][i]))
+ file.write("@ s%i avalue color %s\n" % (i,
set_colours[gi][i]))
+ file.write("@ s%i errorbar color %s\n" % (i,
set_colours[gi][i]))
# Legend.
if set_names and len(set_names) and len(set_names[gi]) and
set_names[gi][i]:
Modified: branches/relax_disp/test_suite/system_tests/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/noe.py?rev=21583&r1=21582&r2=21583&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/noe.py (original)
+++ branches/relax_disp/test_suite/system_tests/noe.py Thu Nov 21 17:01:49
2013
@@ -80,19 +80,20 @@
'@with g0\n',
'@ view 0.15, 0.15, 1.28, 0.85\n',
'@ xaxis label "Residue number"\n',
- '@ xaxis label char size 1.48\n',
- '@ xaxis tick major size 0.75\n',
+ '@ xaxis label char size 1.00\n',
+ '@ xaxis tick major size 0.50\n',
'@ xaxis tick major linewidth 0.5\n',
'@ xaxis tick minor linewidth 0.5\n',
- '@ xaxis tick minor size 0.45\n',
- '@ xaxis ticklabel char size 1.00\n',
+ '@ xaxis tick minor size 0.25\n',
+ '@ xaxis ticklabel char size 0.70\n',
'@ yaxis label "\\qNOE\\Q"\n',
- '@ yaxis label char size 1.48\n',
- '@ yaxis tick major size 0.75\n',
+ '@ yaxis label char size 1.00\n',
+ '@ yaxis tick major size 0.50\n',
'@ yaxis tick major linewidth 0.5\n',
'@ yaxis tick minor linewidth 0.5\n',
- '@ yaxis tick minor size 0.45\n',
- '@ yaxis ticklabel char size 1.00\n',
+ '@ yaxis tick minor size 0.25\n',
+ '@ yaxis ticklabel char size 0.70\n',
+ '@ legend off\n',
'@ legend on\n',
'@ legend box fill pattern 1\n',
'@ legend char size 1.0\n',
r21583 - in /branches/relax_disp: ./ lib/software/grace.py test_suite/system_tests/noe.py