Mercurial > octave
changeset 22492:8c920950b7cc
Add new __gnuplot_has_feature__ for "qt_terminal".
* __gnuplot_has_feature__.m: Add feature "qt_terminal" for versions >= 4.6.
* __gnuplot_drawnow__.m: If qt_terminal is available, add it to the list of
terminals_with_size.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 14 Sep 2016 18:35:45 -0700 |
| parents | 112292a9b837 |
| children | 09c0ee94b7ee |
| files | scripts/plot/util/__gnuplot_drawnow__.m scripts/plot/util/private/__gnuplot_has_feature__.m |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/__gnuplot_drawnow__.m Wed Sep 14 18:28:33 2016 -0700 +++ b/scripts/plot/util/__gnuplot_drawnow__.m Wed Sep 14 18:35:45 2016 -0700 @@ -193,8 +193,11 @@ "epscairo", "epslatex", "fig", "gif", ... "jpeg", "latex", "pbm", "pdf", "pdfcairo", ... "png", "pngcairo", "postscript", ... - "pslatex","pstex", "qt", "svg", "tikz", ... + "pslatex","pstex", "svg", "tikz", ... "windows", "wxt", "x11"}; + if (__gnuplot_has_feature__ ("qt_terminal")) + terminals_with_size{end+1} = "qt"; + endif switch (term) case terminals_with_size size_str = sprintf ("size %.12g,%.12g", gnuplot_size);
--- a/scripts/plot/util/private/__gnuplot_has_feature__.m Wed Sep 14 18:28:33 2016 -0700 +++ b/scripts/plot/util/private/__gnuplot_has_feature__.m Wed Sep 14 18:35:45 2016 -0700 @@ -30,6 +30,8 @@ "linetype", "dashtype", "alphablend_linecolor"}; + "qt_terminal"}; + persistent has_features; if (isempty (has_features)) @@ -39,8 +41,8 @@ ## Don't throw an error if gnuplot isn't installed gnuplot_version = "0.0.0"; end_try_catch - versions = {"4.4", "4.6", "4.6", "5.0", "4.6"}; - operators = {">=", ">=", ">=", ">=", ">="}; + versions = {"4.4", "4.6", "4.6", "5.0", "4.6", "4.6"}; + operators = {">=" , ">=" , ">=" , ">=" , ">=" , ">=" }; have_features = false (size (features)); for n = 1 : numel (have_features) has_features(n) = compare_versions (gnuplot_version, versions{n}, operators{n});