Mercurial > hg > octave-nkf
changeset 18993:0dae39867b2b
cleanup of tic and ticlabel code
* scripts/plot/util/private/__go_draw_axes__.m (do_tics_1):
Reorder manual and automatic tic mode and save two string
comparisons.
author | Stefan Mahr <dac922@gmx.de> |
---|---|
date | Tue, 18 Mar 2014 20:59:04 +0100 |
parents | 6a8cd989c69a |
children | 3af93835be56 |
files | scripts/plot/util/private/__go_draw_axes__.m |
diffstat | 1 files changed, 24 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/private/__go_draw_axes__.m +++ b/scripts/plot/util/private/__go_draw_axes__.m @@ -2145,41 +2145,38 @@ num_mtics = 5; endif colorspec = get_text_colorspec (color, mono); - if (strcmpi (ticmode, "manual") || strcmpi (labelmode, "manual")) + fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); + if (strcmpi (ticmode, "manual")) if (isempty (tics)) fprintf (plot_stream, "unset %stics;\nunset m%stics;\n", ax, ax); return endif - if (strcmpi (ticmode, "manual")) - fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); - fprintf (plot_stream, "set %stics %s %s %s %s (", ax, tickdir, - ticklength, axispos, mirror); - fprintf (plot_stream, " %.15g,", tics(1:end-1)); - fprintf (plot_stream, " %.15g) %s;\n", tics(end), fontspec); - endif - if (strcmpi (labelmode, "manual")) - k = 1; - ntics = numel (tics); - nlabels = numel (labels); - fprintf (plot_stream, "set %stics add %s %s %s %s (", ax, - tickdir, ticklength, axispos, mirror); - labels = strrep (labels, "%", "%%"); - for i = 1:ntics - fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i)); - if (i < ntics) - fputs (plot_stream, ", "); - endif - if (k > nlabels) - k = 1; - endif - endfor - fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec); - endif + fprintf (plot_stream, "set %stics %s %s %s %s (", ax, tickdir, + ticklength, axispos, mirror); + fprintf (plot_stream, " %.15g,", tics(1:end-1)); + fprintf (plot_stream, " %.15g) %s;\n", tics(end), fontspec); else - fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); fprintf (plot_stream, "set %stics %s %s %s %s %s %s;\n", ax, tickdir, ticklength, axispos, mirror, colorspec, fontspec); endif + if (strcmpi (labelmode, "manual")) + k = 1; + ntics = numel (tics); + nlabels = numel (labels); + fprintf (plot_stream, "set %stics add %s %s %s %s (", ax, + tickdir, ticklength, axispos, mirror); + labels = strrep (labels, "%", "%%"); + for i = 1:ntics + fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i)); + if (i < ntics) + fputs (plot_stream, ", "); + endif + if (k > nlabels) + k = 1; + endif + endfor + fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec); + endif if (strcmp (mtics, "on")) fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); else