Mercurial > octave
changeset 22433:4c7a66badaa1
Use 'linetype' line style qualifier for gnuplot versions prior to 4.6 (bug #48982)
* __gnuplot_draw_axes__.m (gnuplot_linetype): Clear up confusion about what
'linetype' refers to with regard to gnuplot syntax by renaming to
gnuplot_linestyletype(). Do not condition on __gnuplot_has_feature__()
for 'linetype' since that refers to a different use of the word.
(__gnuplot_draw_axes__): Replace call to gnuplot_linetype() with call
to gnuplot_linestyletype().
(do_linestyle_command): Ditto.
| author | Daniel J Sebald <daniel.sebald@ieee.org> |
|---|---|
| date | Fri, 02 Sep 2016 19:24:03 -0500 |
| parents | 1e88747417e6 |
| children | 9bc40d4bfe88 |
| files | scripts/plot/util/private/__gnuplot_draw_axes__.m |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m Fri Sep 02 12:44:17 2016 -0700 +++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m Fri Sep 02 19:24:03 2016 -0500 @@ -986,7 +986,7 @@ color = [0, 0, 0]; endif - lt = gnuplot_linetype (obj); + lt = gnuplot_linestyletype (obj); if (isfield (obj, "linewidth")) lw = sprintf ("linewidth %f", obj.linewidth); @@ -1957,7 +1957,7 @@ color = [0, 0, 0]; endif - lt = gnuplot_linetype (obj); + lt = gnuplot_linestyletype (obj); if (! isempty (lt)) fprintf (plot_stream, " %s", lt); endif @@ -2088,7 +2088,7 @@ endfunction -function [lt] = gnuplot_linetype (obj) +function lt = gnuplot_linestyletype (obj) if (isfield (obj, "linestyle")) if (__gnuplot_has_feature__ ("dashtype")) @@ -2107,7 +2107,7 @@ otherwise lt = ""; endswitch - elseif (__gnuplot_has_feature__ ("linetype")) + else opt = "linetype"; switch (obj.linestyle) case "-" @@ -2123,8 +2123,6 @@ otherwise lt = ""; endswitch - else - lt = ""; endif if (! isempty (lt)) lt = sprintf ("%s %s", opt, lt);