Author: bugman Date: Thu Nov 21 16:59:20 2013 New Revision: 21582 URL: http://svn.gna.org/viewcvs/relax?rev=21582&view=rev Log: 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: trunk/lib/software/grace.py trunk/test_suite/system_tests/noe.py Modified: trunk/lib/software/grace.py URL: http://svn.gna.org/viewcvs/relax/trunk/lib/software/grace.py?rev=21582&r1=21581&r2=21582&view=diff ============================================================================== --- trunk/lib/software/grace.py (original) +++ trunk/lib/software/grace.py Thu Nov 21 16:59:20 2013 @@ -129,7 +129,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=None, 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_pos=None, legend=False, norm=False): +def write_xy_header(file=None, paper_size='A4', title=None, subtitle=None, view=None, graph_num=1, sets=None, 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_pos=None, legend=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). @@ -180,15 +180,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) @@ -285,18 +285,20 @@ # 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_pos: + if legend != None and legend[gi]: + file.write("@ legend on\n") + else: + file.write("@ legend off\n") + if legend_pos != None: file.write("@ legend %s, %s\n" % (legend_pos[gi][0], legend_pos[gi][1])) - if legend and not legend[gi]: - file.write("@ legend off\n") # Frame. file.write("@ frame linewidth %s\n" % linewidth[gi]) @@ -329,6 +331,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) @@ -343,9 +346,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: trunk/test_suite/system_tests/noe.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/noe.py?rev=21582&r1=21581&r2=21582&view=diff ============================================================================== --- trunk/test_suite/system_tests/noe.py (original) +++ trunk/test_suite/system_tests/noe.py Thu Nov 21 16:59:20 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', '@ frame linewidth 0.5\n', '@ s0 symbol 1\n', '@ s0 symbol size 0.45\n',