Mercurial > octave
annotate scripts/plot/util/private/__gnuplot_draw_axes__.m @ 21524:aac8b2ca9280
Include curly braces when adding weight to strings for gnuplot (bug #46037).
* __gnuplot_draw_axes__.m: Gnuplot 5 requires curly braces when indicating
bold-face, italics and such. For earlier versions both '{\bf foobar}' and
'\bf foobar' produce the same results. Thus, the gnuplot 5 syntax may be always
used without creating problems for earlier versions.
author | bpabbott |
---|---|
date | Sat, 19 Mar 2016 14:29:55 -0400 |
parents | 067662ac6bfe |
children | e6fcaea7d433 |
rev | line source |
---|---|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19597
diff
changeset
|
1 ## Copyright (C) 2005-2015 John W. Eaton |
6405 | 2 ## |
3 ## This file is part of Octave. | |
4 ## | |
5 ## Octave is free software; you can redistribute it and/or modify it | |
6 ## under the terms of the GNU General Public License as published by | |
7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
8 ## your option) any later version. | |
6405 | 9 ## |
10 ## Octave is distributed in the hope that it will be useful, but | |
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 ## General Public License for more details. | |
14 ## | |
15 ## You should have received a copy of the GNU General Public License | |
7016 | 16 ## along with Octave; see the file COPYING. If not, see |
17 ## <http://www.gnu.org/licenses/>. | |
6405 | 18 |
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8740
diff
changeset
|
19 ## -*- texinfo -*- |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
20 ## @deftypefn {} {} __gnuplot_draw_axes__ (@var{h}, @var{plot_stream}, @var{enhanced}, @var{bg_is_set}, @var{fg_is_set}, @var{hlgnd}) |
6895 | 21 ## Undocumented internal function. |
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8740
diff
changeset
|
22 ## @end deftypefn |
6405 | 23 |
24 ## Author: jwe | |
25 | |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
26 function __gnuplot_draw_axes__ (h, plot_stream, enhanced, bg_is_set, |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
27 fg_is_set, hlgnd) |
6405 | 28 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
29 showhiddenhandles = get (0, "showhiddenhandles"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
30 unwind_protect |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
31 set (0, "showhiddenhandles", "on"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
32 axis_obj = __get__ (h); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
33 unwind_protect_cleanup |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
34 set (0, "showhiddenhandles", showhiddenhandles); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
35 end_unwind_protect |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
36 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
37 parent_figure_obj = get (axis_obj.parent); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
38 gnuplot_term = __gnuplot_get_var__ (axis_obj.parent, "GPVAL_TERM"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
39 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
40 ## Set to false for plotyy axes. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
41 ymirror = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
42 if (isfield (axis_obj, "__plotyy_axes__")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
43 if (all (ishandle (axis_obj.__plotyy_axes__))) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
44 ymirror = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
45 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
46 h = axis_obj.__plotyy_axes__; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
47 h = h(ishandle (h)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
48 h = h(isprop (h, "__plotyy_axes__")); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
49 rmappdata (h, "__plotyy_axes__"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
50 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
51 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
52 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
53 nd = __calc_dimensions__ (h); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
54 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
55 if (strcmp (axis_obj.dataaspectratiomode, "manual") |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
56 && strcmp (axis_obj.xlimmode, "manual") |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
57 && strcmp (axis_obj.ylimmode, "manual")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
58 ## All can't be "manual" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
59 axis_obj.plotboxaspectratiomode = "auto"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
60 endif |
6405 | 61 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
62 if (strcmp (axis_obj.dataaspectratiomode, "manual") |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
63 && strcmp (axis_obj.xlimmode, "manual") |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
64 && strcmp (axis_obj.ylimmode, "manual") |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
65 && (nd == 2 || all (mod (axis_obj.view, 90) == 0))) |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
66 ## FIXME: adjust plotboxaspectratio to respect other |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
67 fpos = get (axis_obj.parent, "position"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
68 apos = axis_obj.position; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
69 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
70 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
71 pos = __actual_axis_position__ (h); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
72 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
73 if (strcmpi (axis_obj.dataaspectratiomode, "manual")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
74 dr = axis_obj.dataaspectratio; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
75 if (nd == 2 || all (mod (axis_obj.view, 90) == 0)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
76 dr = dr(1) / dr(2); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
77 else |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
78 ## FIXME: need to properly implement 3D |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
79 dr = mean (dr(1:2)) / dr(3); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
80 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
81 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
82 dr = 1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
83 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
84 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
85 if (strcmp (axis_obj.activepositionproperty, "position")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
86 if (__gnuplot_has_feature__ ("screen_coordinates_for_{lrtb}margin")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
87 if (nd == 2 || all (mod (axis_obj.view, 90) == 0)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
88 x = [1, 1]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
89 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
90 ## 3D plots need to be sized down to fit in the window. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
91 x = 1.0 ./ sqrt ([2, 2.5]); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
92 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
93 fprintf (plot_stream, "set tmargin screen %.15g;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
94 pos(2)+pos(4)/2+x(2)*pos(4)/2); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
95 fprintf (plot_stream, "set bmargin screen %.15g;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
96 pos(2)+pos(4)/2-x(2)*pos(4)/2); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
97 fprintf (plot_stream, "set lmargin screen %.15g;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
98 pos(1)+pos(3)/2-x(1)*pos(3)/2); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
99 fprintf (plot_stream, "set rmargin screen %.15g;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
100 pos(1)+pos(3)/2+x(1)*pos(3)/2); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
101 sz_str = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
102 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
103 fprintf (plot_stream, "set tmargin 0;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
104 fprintf (plot_stream, "set bmargin 0;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
105 fprintf (plot_stream, "set lmargin 0;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
106 fprintf (plot_stream, "set rmargin 0;\n"); |
6405 | 107 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
108 if (nd == 3 && all (axis_obj.view == [0, 90])) |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
109 ## FIXME: Kludge to allow colorbar to be added to a pcolor() plot |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
110 pos(3:4) = pos(3:4) * 1.4; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
111 pos(1:2) = pos(1:2) - pos(3:4) * 0.125; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
112 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
113 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
114 fprintf (plot_stream, "set origin %.15g, %.15g;\n", pos(1), pos(2)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
115 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
116 if (strcmpi (axis_obj.dataaspectratiomode, "manual")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
117 sz_str = sprintf ("set size ratio %.15g", -dr); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
118 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
119 sz_str = "set size noratio"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
120 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
121 sz_str = sprintf ("%s %.15g, %.15g;\n", sz_str, pos(3), pos(4)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
122 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
123 else ## activepositionproperty == outerposition |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
124 fprintf (plot_stream, "unset tmargin;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
125 fprintf (plot_stream, "unset bmargin;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
126 fprintf (plot_stream, "unset lmargin;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
127 fprintf (plot_stream, "unset rmargin;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
128 fprintf (plot_stream, "set origin %g, %g;\n", pos(1:2)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
129 sz_str = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
130 if (strcmpi (axis_obj.dataaspectratiomode, "manual")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
131 sz_str = sprintf ("ratio %g", -dr); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
132 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
133 sz_str = "noratio"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
134 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
135 sz_str = sprintf ("set size %s %g, %g;\n", sz_str, pos(3:4)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
136 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
137 if (! isempty (sz_str)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
138 fputs (plot_stream, sz_str); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
139 endif |
6405 | 140 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
141 ## Reset all labels, axis-labels, tick-labels, and title |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
142 ## FIXME: We should have an function to initialize the axis. |
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
143 ## Presently, this is dispersed in this function. |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
144 fputs (plot_stream, "unset label;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
145 fputs (plot_stream, "unset xtics;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
146 fputs (plot_stream, "unset ytics;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
147 fputs (plot_stream, "unset ztics;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
148 fputs (plot_stream, "unset x2tics;\n"); |
20637
751b9cc78904
Fix issue with gnuplot, subplot, and 2 y-axes (bug #45822).
Avinoam Kalma <a.kalma@gmail.com>
parents:
20057
diff
changeset
|
149 fputs (plot_stream, "unset y2tics;\n"); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
150 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
151 if (! isempty (axis_obj.title)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
152 t = get (axis_obj.title); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
153 if (isempty (t.string)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
154 fputs (plot_stream, "unset title;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
155 else |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
156 colorspec = get_text_colorspec (t.color); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
157 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
158 fontspec = create_fontspec (f, s, gnuplot_term); |
18996
538f6492f21c
Honour the title.color property when plotting with gnuplot (bug #42927).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18985
diff
changeset
|
159 fprintf (plot_stream, "set title \"%s\" %s %s %s;\n", |
19417
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
160 undo_string_escapes (tt), fontspec, colorspec, |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
161 __do_enhanced_option__ (enhanced, t)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
162 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
163 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
164 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
165 if (! isempty (axis_obj.xlabel)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
166 t = get (axis_obj.xlabel); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
167 angle = t.rotation; |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
168 colorspec = get_text_colorspec (t.color); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
169 if (isempty (t.string)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
170 fprintf (plot_stream, "unset xlabel;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
171 fprintf (plot_stream, "unset x2label;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
172 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
173 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
174 fontspec = create_fontspec (f, s, gnuplot_term); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
175 if (strcmpi (axis_obj.xaxislocation, "top")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
176 fprintf (plot_stream, "set x2label \"%s\" %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
177 undo_string_escapes (tt), colorspec, fontspec, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
178 __do_enhanced_option__ (enhanced, t)); |
13216 | 179 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
180 fprintf (plot_stream, "set xlabel \"%s\" %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
181 undo_string_escapes (tt), colorspec, fontspec, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
182 __do_enhanced_option__ (enhanced, t)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
183 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
184 fprintf (plot_stream, " rotate by %f;\n", angle); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
185 if (strcmpi (axis_obj.xaxislocation, "top")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
186 fprintf (plot_stream, "unset xlabel;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
187 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
188 fprintf (plot_stream, "unset x2label;\n"); |
13216 | 189 endif |
7189 | 190 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
191 endif |
10931
a72d53df4fa6
Treatment of activepositionproperty for gnuplot.
Ben Abbott <bpabbott@mac.com>
parents:
10930
diff
changeset
|
192 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
193 if (! isempty (axis_obj.ylabel)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
194 t = get (axis_obj.ylabel); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
195 angle = t.rotation; |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
196 colorspec = get_text_colorspec (t.color); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
197 if (isempty (t.string)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
198 fprintf (plot_stream, "unset ylabel;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
199 fprintf (plot_stream, "unset y2label;\n"); |
8889
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
200 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
201 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
202 fontspec = create_fontspec (f, s, gnuplot_term); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
203 if (strcmpi (axis_obj.yaxislocation, "right")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
204 fprintf (plot_stream, "set y2label \"%s\" %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
205 undo_string_escapes (tt), colorspec, fontspec, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
206 __do_enhanced_option__ (enhanced, t)); |
10931
a72d53df4fa6
Treatment of activepositionproperty for gnuplot.
Ben Abbott <bpabbott@mac.com>
parents:
10930
diff
changeset
|
207 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
208 fprintf (plot_stream, "set ylabel \"%s\" %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
209 undo_string_escapes (tt), colorspec, fontspec, |
10549 | 210 __do_enhanced_option__ (enhanced, t)); |
6405 | 211 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
212 fprintf (plot_stream, " rotate by %f;\n", angle); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
213 if (strcmpi (axis_obj.yaxislocation, "right")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
214 fprintf (plot_stream, "unset ylabel;\n"); |
6405 | 215 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
216 fprintf (plot_stream, "unset y2label;\n"); |
6405 | 217 endif |
218 endif | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
219 endif |
6405 | 220 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
221 if (! isempty (axis_obj.zlabel)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
222 t = get (axis_obj.zlabel); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
223 angle = t.rotation; |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
224 colorspec = get_text_colorspec (t.color); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
225 if (isempty (t.string)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
226 fputs (plot_stream, "unset zlabel;\n"); |
6809 | 227 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
228 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
229 fontspec = create_fontspec (f, s, gnuplot_term); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
230 fprintf (plot_stream, "set zlabel \"%s\" %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
231 undo_string_escapes (tt), colorspec, fontspec, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
232 __do_enhanced_option__ (enhanced, t)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
233 fprintf (plot_stream, " rotate by %f;\n", angle); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
234 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
235 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
236 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
237 if (strcmpi (axis_obj.xaxislocation, "top")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
238 xaxisloc = "x2"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
239 xaxisloc_using = "x2"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
240 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
241 xaxisloc = "x"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
242 xaxisloc_using = "x1"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
243 if (strcmpi (axis_obj.xaxislocation, "zero")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
244 fputs (plot_stream, "set xzeroaxis;\n"); |
6809 | 245 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
246 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
247 if (strcmpi (axis_obj.yaxislocation, "right")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
248 yaxisloc = "y2"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
249 yaxisloc_using = "y2"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
250 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
251 yaxisloc = "y"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
252 yaxisloc_using = "y1"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
253 if (strcmpi (axis_obj.yaxislocation, "zero")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
254 fputs (plot_stream, "set yzeroaxis;\n"); |
6809 | 255 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
256 endif |
6809 | 257 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
258 have_grid = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
259 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
260 if (strcmpi (axis_obj.xgrid, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
261 have_grid = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
262 fprintf (plot_stream, "set grid %stics;\n", xaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
263 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
264 fprintf (plot_stream, "set grid no%stics;\n", xaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
265 endif |
7274 | 266 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
267 if (strcmpi (axis_obj.ygrid, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
268 have_grid = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
269 fprintf (plot_stream, "set grid %stics;\n", yaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
270 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
271 fprintf (plot_stream, "set grid no%stics;\n", yaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
272 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
273 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
274 if (strcmpi (axis_obj.zgrid, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
275 have_grid = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
276 fputs (plot_stream, "set grid ztics;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
277 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
278 fputs (plot_stream, "set grid noztics;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
279 endif |
6405 | 280 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
281 if (strcmpi (axis_obj.xminorgrid, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
282 have_grid = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
283 if (strcmp (axis_obj.xscale, "log")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
284 m = 10; |
6405 | 285 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
286 m = 5; |
6405 | 287 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
288 fprintf (plot_stream, "set m%stics %d;\n", xaxisloc, m); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
289 fprintf (plot_stream, "set grid m%stics;\n", xaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
290 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
291 fprintf (plot_stream, "set grid nom%stics;\n", xaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
292 endif |
6405 | 293 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
294 if (strcmpi (axis_obj.yminorgrid, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
295 have_grid = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
296 if (strcmp (axis_obj.yscale, "log")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
297 m = 10; |
6405 | 298 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
299 m = 5; |
6405 | 300 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
301 fprintf (plot_stream, "set m%stics %d;\n", yaxisloc, m); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
302 fprintf (plot_stream, "set grid m%stics;\n", yaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
303 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
304 fprintf (plot_stream, "set grid nom%stics;\n", yaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
305 endif |
6405 | 306 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
307 if (strcmpi (axis_obj.zminorgrid, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
308 have_grid = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
309 if (strcmp (axis_obj.zscale, "log")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
310 m = 10; |
6405 | 311 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
312 m = 5; |
6405 | 313 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
314 fprintf (plot_stream, "set mztics %d;\n", m); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
315 fputs (plot_stream, "set grid mztics;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
316 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
317 fputs (plot_stream, "set grid nomztics;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
318 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
319 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
320 ## The grid front/back/layerdefault option also controls the |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
321 ## appearance of tics, so it is used even if the grid is absent. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
322 if (strcmpi (axis_obj.layer, "top")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
323 fputs (plot_stream, "set grid front;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
324 fputs (plot_stream, "set border front;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
325 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
326 fputs (plot_stream, "set grid layerdefault;\n"); |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
327 ## FIXME: The gnuplot help says that "layerdefault" should work |
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
328 ## for set border too, but it fails for me with gnuplot 4.2.5. |
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
329 ## So, use "back" instead. |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
330 fputs (plot_stream, "set border back;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
331 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
332 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
333 fprintf (plot_stream, "set grid linewidth %f, linewidth %f;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
334 axis_obj.linewidth, axis_obj.linewidth); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
335 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
336 if (! have_grid) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
337 fputs (plot_stream, "unset grid;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
338 endif |
6405 | 339 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
340 xlogscale = strcmpi (axis_obj.xscale, "log"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
341 ylogscale = strcmpi (axis_obj.yscale, "log"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
342 zlogscale = strcmpi (axis_obj.zscale, "log"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
343 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
344 ## Detect logscale and negative lims |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
345 if (xlogscale && all (axis_obj.xlim < 0)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
346 axis_obj.xsgn = -1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
347 if (strcmp (axis_obj.xdir, "reverse")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
348 axis_obj.xdir = "normal"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
349 elseif (strcmp (axis_obj.xdir, "normal")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
350 axis_obj.xdir = "reverse"; |
6405 | 351 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
352 axis_obj.xtick = -flip (axis_obj.xtick); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
353 axis_obj.xticklabel = flip (axis_obj.xticklabel); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
354 axis_obj.xlim = -flip (axis_obj.xlim); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
355 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
356 axis_obj.xsgn = 1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
357 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
358 if (ylogscale && all (axis_obj.ylim < 0)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
359 axis_obj.ysgn = -1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
360 if (strcmp (axis_obj.ydir, "reverse")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
361 axis_obj.ydir = "normal"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
362 elseif (strcmp (axis_obj.ydir, "normal")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
363 axis_obj.ydir = "reverse"; |
6405 | 364 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
365 axis_obj.ytick = -flip (axis_obj.ytick); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
366 axis_obj.yticklabel = flip (axis_obj.yticklabel); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
367 axis_obj.ylim = -flip (axis_obj.ylim); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
368 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
369 axis_obj.ysgn = 1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
370 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
371 if (zlogscale && all (axis_obj.zlim < 0)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
372 axis_obj.zsgn = -1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
373 if (strcmp (axis_obj.zdir, "reverse")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
374 axis_obj.zdir = "normal"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
375 elseif (strcmp (axis_obj.zdir, "normal")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
376 axis_obj.zdir = "reverse"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
377 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
378 axis_obj.ztick = -flip (axis_obj.ztick); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
379 axis_obj.zticklabel = flip (axis_obj.zticklabel); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
380 axis_obj.zlim = -flip (axis_obj.zlim); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
381 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
382 axis_obj.zsgn = 1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
383 endif |
6405 | 384 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
385 xlim = axis_obj.xlim; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
386 ylim = axis_obj.ylim; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
387 zlim = axis_obj.zlim; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
388 clim = axis_obj.clim; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
389 |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
390 do_tics (axis_obj, plot_stream, ymirror, gnuplot_term); |
11334
703f51c2beb7
set grid linewidths from axis linewidth property
John W. Eaton <jwe@octave.org>
parents:
11312
diff
changeset
|
391 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
392 fputs (plot_stream, "unset logscale;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
393 if (xlogscale) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
394 fprintf (plot_stream, "set logscale %s;\n", xaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
395 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
396 if (ylogscale) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
397 fprintf (plot_stream, "set logscale %s;\n", yaxisloc); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
398 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
399 if (zlogscale) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
400 fputs (plot_stream, "set logscale z;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
401 endif |
13143
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
402 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
403 xautoscale = strcmpi (axis_obj.xlimmode, "auto"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
404 yautoscale = strcmpi (axis_obj.ylimmode, "auto"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
405 zautoscale = strcmpi (axis_obj.zlimmode, "auto"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
406 cautoscale = strcmpi (axis_obj.climmode, "auto"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
407 cdatadirect = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
408 truecolor = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
409 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
410 fputs (plot_stream, "set clip two;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
411 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
412 kids = axis_obj.children; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
413 ## Remove the axis labels and title from the children, and |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
414 ## preserved the original order. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
415 [jnk, k] = setdiff (kids, [axis_obj.xlabel; axis_obj.ylabel; ... |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
416 axis_obj.zlabel; axis_obj.title]); |
20231
83792dd9bcc1
Use in-place operators in m-files where possible.
Rik <rik@octave.org>
parents:
20191
diff
changeset
|
417 kids = kids(sort (k)); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
418 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
419 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
420 fputs (plot_stream, "set parametric;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
421 fputs (plot_stream, "set style data lines;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
422 fputs (plot_stream, "set surface;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
423 fputs (plot_stream, "unset contour;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
424 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
425 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
426 data_idx = 0; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
427 data = cell (); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
428 is_image_data = []; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
429 hidden_removal = NaN; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
430 view_map = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
431 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
432 if (! cautoscale && clim(1) == clim(2)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
433 clim(2)++; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
434 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
435 addedcmap = []; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
436 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
437 ximg_data = {}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
438 ximg_data_idx = 0; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
439 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
440 while (! isempty (kids)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
441 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
442 obj = get (kids(end)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
443 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
444 if (isfield (obj, "xdata")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
445 obj.xdata = double (obj.xdata); |
17306
09543e9c8f40
Use explicit form of end (endif, endfor, etc.) in core m-files.
Rik <rik@octave.org>
parents:
17199
diff
changeset
|
446 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
447 if (isfield (obj, "ydata")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
448 obj.ydata = double (obj.ydata); |
17306
09543e9c8f40
Use explicit form of end (endif, endfor, etc.) in core m-files.
Rik <rik@octave.org>
parents:
17199
diff
changeset
|
449 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
450 if (isfield (obj, "zdata")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
451 obj.zdata = double (obj.zdata); |
17306
09543e9c8f40
Use explicit form of end (endif, endfor, etc.) in core m-files.
Rik <rik@octave.org>
parents:
17199
diff
changeset
|
452 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
453 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
454 if (isfield (obj, "units")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
455 units = obj.units; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
456 unwind_protect |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
457 set (kids(end), "units", "data"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
458 obj = get (kids(end)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
459 unwind_protect_cleanup |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
460 set (kids(end), "units", units); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
461 end_unwind_protect |
13143
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
462 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
463 kids = kids(1:(end-1)); |
13143
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
464 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
465 if (strcmp (obj.visible, "off")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
466 continue; |
6405 | 467 endif |
468 | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
469 if (xlogscale && isfield (obj, "xdata")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
470 obj.xdata = axis_obj.xsgn * obj.xdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
471 obj.xdata(obj.xdata<=0) = NaN; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
472 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
473 if (ylogscale && isfield (obj, "ydata")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
474 obj.ydata = axis_obj.ysgn * obj.ydata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
475 obj.ydata(obj.ydata<=0) = NaN; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
476 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
477 if (zlogscale && isfield (obj, "zdata")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
478 obj.zdata = axis_obj.zsgn * obj.zdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
479 obj.zdata(obj.zdata<=0) = NaN; |
7316 | 480 endif |
481 | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
482 ## Check for facecolor interpolation for surfaces. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
483 doing_interp_color = ... |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
484 isfield (obj, "facecolor") && strcmp (obj.facecolor, "interp"); |
6405 | 485 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
486 switch (obj.type) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
487 case "image" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
488 img_data = obj.cdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
489 img_xdata = obj.xdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
490 img_ydata = obj.ydata; |
13979
f35b593688a5
Changing the legend's interpreter property should be inherited by the
Ben Abbott <bpabbott@mac.com>
parents:
13782
diff
changeset
|
491 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
492 if (ndims (img_data) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
493 truecolor = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
494 elseif (strcmpi (obj.cdatamapping, "direct")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
495 cdatadirect = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
496 endif |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
497 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
498 is_image_data(data_idx) = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
499 parametric(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
500 have_cdata(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
501 have_3d_patch(data_idx) = false; |
15433
283cada76dd6
For the gnuplot backend, elevate all plot variables to double to prevent
Ben Abbott <bpabbott@mac.com>
parents:
15331
diff
changeset
|
502 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
503 if (img_xdata(2) < img_xdata(1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
504 img_xdata = img_xdata(2:-1:1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
505 img_data = img_data(:,end:-1:1,:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
506 elseif (img_xdata(1) == img_xdata(2)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
507 img_xdata = img_xdata(1) + [0, columns(img_data)-1]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
508 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
509 if (img_ydata(2) < img_ydata(1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
510 img_ydata = img_ydata(2:-1:1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
511 img_data = img_data(end:-1:1,:,:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
512 elseif (img_ydata(1) == img_ydata(2)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
513 img_ydata = img_ydata(1) + [0, rows(img_data)-1]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
514 endif |
8052
961d4c52ffae
Convert stem and stem3 to use stem series objects
David Bateman <dbateman@free.fr>
parents:
8048
diff
changeset
|
515 |
19417
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
516 x_origin = min (img_xdata); |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
517 y_origin = min (img_ydata); |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
518 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
519 [y_dim, x_dim] = size (img_data(:,:,1)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
520 if (x_dim > 1) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
521 dx = abs (img_xdata(2)-img_xdata(1))/(x_dim-1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
522 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
523 x_dim = 2; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
524 img_data = [img_data, img_data]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
525 dx = abs (img_xdata(2)-img_xdata(1)); |
19417
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
526 if (dx < 1) |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
527 ## Correct gnuplot string for 1-D images |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
528 dx = 0.5; |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
529 x_origin = 0.75; |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
530 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
531 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
532 if (y_dim > 1) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
533 dy = abs (img_ydata(2)-img_ydata(1))/(y_dim-1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
534 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
535 y_dim = 2; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
536 img_data = [img_data; img_data]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
537 dy = abs (img_ydata(2)-img_ydata(1)); |
19417
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
538 if (dy < 1) |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
539 ## Correct gnuplot string for 1-D images |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
540 dy = 0.5; |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
541 y_origin = 0.75; |
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
542 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
543 endif |
11201
6c8791cb35b1
__go_draw_axes__.m: Set proper tight axis limits for log scale.
Ben Abbott <bpabbott@mac.com>
parents:
11198
diff
changeset
|
544 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
545 if (ndims (img_data) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
546 data{data_idx} = permute (img_data, [3, 1, 2])(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
547 format = "1:2:3"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
548 imagetype = "rgbimage"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
549 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
550 data{data_idx} = img_data(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
551 format = "1"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
552 imagetype = "image"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
553 endif |
6405 | 554 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
555 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
556 usingclause{data_idx} = sprintf ("binary array=%dx%d scan=yx origin=(%.15g,%.15g) dx=%.15g dy=%.15g using %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
557 x_dim, y_dim, x_origin, y_origin, dx, dy, format); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
558 withclause{data_idx} = sprintf ("with %s;", imagetype); |
6405 | 559 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
560 case "line" |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
561 if (strcmp (obj.linestyle, "none") |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
562 && (! isfield (obj, "marker") |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
563 || (isfield (obj, "marker") |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
564 && strcmp (obj.marker, "none")))) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
565 continue; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
566 endif |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
567 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
568 is_image_data(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
569 parametric(data_idx) = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
570 have_cdata(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
571 have_3d_patch(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
572 if (isempty (obj.displayname)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
573 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
574 else |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
575 tmp = undo_string_escapes ( |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
576 __maybe_munge_text__ (enhanced, obj, "displayname") |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
577 ); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
578 titlespec{data_idx} = ['title "' tmp '"']; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
579 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
580 usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
581 errbars = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
582 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
583 xdat = obj.xdata(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
584 ydat = obj.ydata(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
585 if (! isempty (obj.zdata)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
586 zdat = obj.zdata(:); |
11109
41d18f6342f9
remove image_viewer function
John W. Eaton <jwe@octave.org>
parents:
11095
diff
changeset
|
587 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
588 zdat = zeros (size (xdat)); |
10549 | 589 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
590 data{data_idx} = [xdat, ydat, zdat]'; |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
591 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
592 numel (xdat)); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
593 ## fputs (plot_stream, "set parametric;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
594 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
595 xdat = obj.xdata(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
596 ydat = obj.ydata(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
597 data{data_idx} = [xdat, ydat]'; |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
598 usingclause{data_idx} = ... |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
599 sprintf ("record=%d using ($1):($2) axes %s%s", |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
600 rows (xdat), xaxisloc_using, yaxisloc_using); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
601 endif |
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
602 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
603 [style, sidx] = do_linestyle_command (obj, obj.color, data_idx, |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
604 plot_stream, errbars); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
605 if (__gnuplot_has_feature__ ("linetype")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
606 scmd = "linetype"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
607 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
608 scmd = "linestyle"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
609 endif |
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
610 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
611 withclause{data_idx} = sprintf ("with %s %s %d", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
612 style{1}, scmd, sidx(1)); |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
613 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
614 if (length (style) > 1) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
615 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
616 is_image_data(data_idx) = is_image_data(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
617 parametric(data_idx) = parametric(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
618 have_cdata(data_idx) = have_cdata(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
619 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
620 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
621 usingclause{data_idx} = usingclause{data_idx - 1}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
622 data{data_idx} = data{data_idx - 1}; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
623 withclause{data_idx} = sprintf ("with %s %s %d", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
624 style{2}, scmd, sidx(2)); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
625 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
626 if (length (style) > 2) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
627 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
628 is_image_data(data_idx) = is_image_data(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
629 parametric(data_idx) = parametric(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
630 have_cdata(data_idx) = have_cdata(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
631 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
632 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
633 usingclause{data_idx} = usingclause{data_idx - 1}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
634 data{data_idx} = data{data_idx - 1}; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
635 withclause{data_idx} = sprintf ("with %s %s %d", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
636 style{3}, scmd, sidx(3)); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
637 endif |
6405 | 638 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
639 case "patch" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
640 cmap = parent_figure_obj.colormap; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
641 [nr, nc] = size (obj.xdata); |
7189 | 642 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
643 if (! isempty (obj.cdata)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
644 cdat = obj.cdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
645 if (strcmpi (obj.cdatamapping, "direct")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
646 cdatadirect = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
647 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
648 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
649 cdat = []; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
650 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
651 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
652 data_3d_idx = NaN; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
653 for i = 1:nc |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
654 xcol = obj.xdata(:,i); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
655 ycol = obj.ydata(:,i); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
656 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
657 if (! isempty (obj.zdata)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
658 zcol = obj.zdata(:,i); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
659 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
660 zcol = zeros (size (xcol)); |
10549 | 661 endif |
662 endif | |
9110
22ae6b3411a7
Add isocolor, isonormals and isosurface functions (For Martin Helm). Add 3D filled triangular patches and the trisurf function
David Bateman <dbateman@free.fr>
parents:
9098
diff
changeset
|
663 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
664 if (! isnan (xcol) && ! isnan (ycol)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
665 ## Is the patch closed or not |
17408
266fafd1ffc1
fix 2 strcmp<->strncmp issues from 3f0ed69d21c6
Andreas Weber <andreas.weber@hs-offenburg.de>
parents:
17405
diff
changeset
|
666 if (strcmp (obj.facecolor, "none")) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
667 hidden_removal = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
668 else |
7170 | 669 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
670 if (isnan (hidden_removal)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
671 hidden_removal = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
672 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
673 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
674 if (numel (xcol) > 3) |
20400
755ba248fb4a
build: Rename __go_draw_XXX to __gnuplot_draw_XXX for clarity.
Rik <rik@octave.org>
parents:
20286
diff
changeset
|
675 error ("__gnuplot_draw_axes__: gnuplot (as of v4.2) only supports 3-D filled triangular patches"); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
676 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
677 if (isnan (data_3d_idx)) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
678 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
679 data_3d_idx = data_idx; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
680 is_image_data(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
681 parametric(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
682 have_cdata(data_idx) = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
683 have_3d_patch(data_idx) = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
684 withclause{data_3d_idx} = sprintf ("with pm3d"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
685 usingclause{data_3d_idx} = "using 1:2:3:4"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
686 data{data_3d_idx} = []; |
10549 | 687 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
688 local_idx = data_3d_idx; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
689 ccdat = NaN; |
10549 | 690 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
691 else |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
692 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
693 local_idx = data_idx; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
694 is_image_data(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
695 parametric(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
696 have_cdata(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
697 have_3d_patch(data_idx) = false; |
10549 | 698 endif |
7189 | 699 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
700 if (i > 1 || isempty (obj.displayname)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
701 titlespec{local_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
702 else |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
703 tmp = undo_string_escapes ( |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
704 __maybe_munge_text__ (enhanced, obj, "displayname") |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
705 ); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
706 titlespec{local_idx} = ['title "' tmp '"']; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
707 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
708 if (isfield (obj, "facecolor")) |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
709 if ((strcmp (obj.facecolor, "flat") |
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
710 || strcmp (obj.facecolor, "interp")) |
10549 | 711 && isfield (obj, "cdata")) |
712 if (ndims (obj.cdata) == 2 | |
14872
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
713 && (columns (obj.cdata) == nc |
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
714 && (rows (obj.cdata) == 1 |
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
715 || rows (obj.cdata) == 3))) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
716 ccol = cdat(:, i); |
10549 | 717 elseif (ndims (obj.cdata) == 2 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
718 && (rows (obj.cdata) == nc |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
719 && (columns (obj.cdata) == 1 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
720 || columns (obj.cdata) == 3))) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
721 ccol = cdat(i, :); |
10549 | 722 elseif (ndims (obj.cdata) == 3) |
723 ccol = permute (cdat (:, i, :), [1, 3, 2]); | |
724 else | |
725 ccol = cdat; | |
726 endif | |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
727 if (strcmp (obj.facecolor, "flat")) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
728 if (isequal (size (ccol), [1, 3])) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
729 ## RGB Triplet |
10549 | 730 color = ccol; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
731 elseif (nd == 3 && numel (xcol) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
732 ccdat = ccol; |
10549 | 733 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
734 if (cdatadirect) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
735 r = round (ccol); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
736 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
737 r = 1 + round ((rows (cmap) - 1) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
738 * (ccol - clim(1))/(clim(2) - clim(1))); |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
739 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
740 r = max (1, min (r, rows (cmap))); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
741 color = cmap(r, :); |
10549 | 742 endif |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
743 elseif (strcmp (obj.facecolor, "interp")) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
744 if (nd == 3 && numel (xcol) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
745 ccdat = ccol; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
746 if (! isvector (ccdat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
747 tmp = rows (cmap) + rows (addedcmap) + ... |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
748 [1 : rows(ccdat)]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
749 addedcmap = [addedcmap; ccdat]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
750 ccdat = tmp(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
751 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
752 ccdat = ccdat(:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
753 endif |
10549 | 754 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
755 if (sum (diff (ccol))) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
756 warning ("\"interp\" not supported, using 1st entry of cdata"); |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
757 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
758 if (cdatadirect) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
759 r = round (ccol); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
760 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
761 r = 1 + round ((rows (cmap) - 1) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
762 * (ccol - clim(1))/(clim(2) - clim(1))); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
763 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
764 r = max (1, min (r, rows (cmap))); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
765 color = cmap(r(1),:); |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
766 endif |
10549 | 767 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
768 elseif (isnumeric (obj.facecolor)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
769 color = obj.facecolor; |
10549 | 770 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
771 color = [0, 1, 0]; |
10549 | 772 endif |
7020 | 773 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
774 color = [0, 1, 0]; |
10549 | 775 endif |
776 | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
777 if (nd == 3 && numel (xcol) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
778 if (isnan (ccdat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
779 ccdat = (rows (cmap) + rows (addedcmap) + 1) * ones(3, 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
780 addedcmap = [addedcmap; reshape(color, 1, 3)]; |
19419
c029983a0389
Fix error message when using trisurf w/gnuplot (bug #43447).
Rik <rik@octave.org>
parents:
19417
diff
changeset
|
781 elseif (numel (ccdat) <= 1) |
19597
db92e7e28e1f
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19586
diff
changeset
|
782 ccdat = zcol; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
783 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
784 data{data_3d_idx} = [data{data_3d_idx}, ... |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
785 [[xcol; xcol(end)], [ycol; ycol(end)], ... |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
786 [zcol; zcol(end)], [ccdat; ccdat(end)]]']; |
10549 | 787 else |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
788 if (__gnuplot_has_feature__ ("transparent_patches") |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
789 && isscalar (obj.facealpha)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
790 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\" fillstyle transparent solid %f", |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
791 round (255*color), obj.facealpha); |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
792 else |
10549 | 793 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
794 round (255*color)); | |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
795 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
796 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
797 withclause{data_idx} = sprintf ("with filledcurve %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
798 colorspec); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
799 data{data_idx} = [xcol, ycol]'; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
800 usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
801 numel (xcol)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
802 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
803 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
804 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
805 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
806 ## patch outline |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
807 if (!(strcmp (obj.edgecolor, "none") |
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
808 && (strcmp (obj.marker, "none") |
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
809 || (strcmp (obj.markeredgecolor, "none") |
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
810 && strcmp (obj.markerfacecolor, "none"))))) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
811 |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
812 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
813 is_image_data(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
814 parametric(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
815 have_cdata(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
816 have_3d_patch(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
817 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
818 usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
819 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
820 if (isfield (obj, "markersize")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
821 mdat = obj.markersize / 3; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
822 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
823 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
824 if (isfield (obj, "edgecolor")) |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
825 ## FIXME: This is the wrong thing to do as edgecolor, |
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
826 ## markeredgecolor and markerfacecolor can have different values |
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
827 ## and we should treat them seperately. However, the code below |
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
828 ## allows the scatter functions to work as expected, where only |
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
829 ## one of these values is set. |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
830 if (strcmp (obj.edgecolor, "none")) |
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
831 if (strcmp (obj.markeredgecolor, "none")) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
832 ec = obj.markerfacecolor; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
833 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
834 ec = obj.markeredgecolor; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
835 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
836 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
837 ec = obj.edgecolor; |
10549 | 838 endif |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
839 |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
840 if ((strcmp (ec, "flat") |
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
841 || strcmp (ec, "interp")) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
842 && isfield (obj, "cdata")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
843 if (ndims (obj.cdata) == 2 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
844 && (columns (obj.cdata) == nc |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
845 && (rows (obj.cdata) == 1 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
846 || rows (obj.cdata) == 3))) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
847 ccol = cdat(:, i); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
848 elseif (ndims (obj.cdata) == 2 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
849 && (rows (obj.cdata) == nc |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
850 && (columns (obj.cdata) == 1 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
851 || columns (obj.cdata) == 3))) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
852 ccol = cdat(i, :); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
853 elseif (ndims (obj.cdata) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
854 ccol = permute (cdat (:, i, :), [1, 3, 2]); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
855 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
856 ccol = cdat; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
857 endif |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
858 if (strcmp (ec, "flat")) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
859 if (numel (ccol) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
860 color = ccol; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
861 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
862 if (isscalar (ccol)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
863 ccol = repmat (ccol, numel (xcol), 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
864 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
865 color = "flat"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
866 have_cdata(data_idx) = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
867 endif |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
868 elseif (strcmp (ec, "interp")) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
869 if (numel (ccol) == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
870 warning ("\"interp\" not supported, using 1st entry of cdata"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
871 color = ccol(1,:); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
872 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
873 if (isscalar (ccol)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
874 ccol = repmat (ccol, numel (xcol), 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
875 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
876 color = "interp"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
877 have_cdata(data_idx) = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
878 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
879 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
880 elseif (isnumeric (ec)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
881 color = ec; |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
882 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
883 color = [0, 0, 0]; |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
884 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
885 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
886 color = [0, 0, 0]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
887 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
888 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
889 lt = gnuplot_linetype (obj); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
890 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
891 if (isfield (obj, "linewidth")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
892 lw = sprintf ("linewidth %f", obj.linewidth); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
893 else |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
894 lw = ""; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
895 endif |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
896 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
897 [pt, pt2, obj] = gnuplot_pointtype (obj); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
898 if (! isempty (pt)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
899 pt = sprintf ("pointtype %s", pt); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
900 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
901 if (! isempty (pt2)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
902 pt2 = sprintf ("pointtype %s", pt2); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
903 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
904 |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
905 if (ischar (color)) |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
906 colorspec = "palette"; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
907 else |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
908 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
909 round (255*color)); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
910 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
911 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
912 sidx = 1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
913 if (isempty (lt)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
914 style = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
915 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
916 style = "lines"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
917 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
918 tmpwith = {}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
919 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
920 facesame = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
921 if (! isequal (pt, pt2) && isfield (obj, "markerfacecolor") |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
922 && ! strcmp (obj.markerfacecolor, "none")) |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
923 if (strcmp (obj.markerfacecolor, "auto") |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
924 || ! isnumeric (obj.markerfacecolor) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
925 || (isnumeric (obj.markerfacecolor) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
926 && isequal (color, obj.markerfacecolor))) |
20778
8513c84a13cb
Use parser string concatenation rather than strcat() for performance in m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
927 style = [style "points"]; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
928 if (isfield (obj, "markersize")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
929 if (length (mdat) == nc) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
930 m = mdat(i); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
931 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
932 m = mdat; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
933 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
934 ps = sprintf ("pointsize %f", m / 3); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
935 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
936 ps = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
937 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
938 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
939 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
940 style, lw, pt2, lt, ps, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
941 colorspec); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
942 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
943 facesame = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
944 if (! isempty (style)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
945 tmpwith{sidx} = sprintf ("with %s %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
946 style, lw, lt, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
947 colorspec); |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
948 sidx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
949 endif |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
950 if (isnumeric (obj.markerfacecolor)) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
951 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
952 round (255*obj.markerfacecolor)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
953 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
954 style = "points"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
955 if (isfield (obj, "markersize")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
956 if (length (mdat) == nc) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
957 m = mdat(i); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
958 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
959 m = mdat; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
960 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
961 ps = sprintf ("pointsize %f", m / 3); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
962 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
963 ps = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
964 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
965 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
966 style, lw, pt2, lt, ps, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
967 colorspec); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
968 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
969 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
970 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
971 if (isfield (obj, "markeredgecolor") |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
972 && ! strcmp (obj.markeredgecolor, "none")) |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
973 if (facesame && ! isempty (pt) |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
974 && (strcmp (obj.markeredgecolor, "auto") |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
975 || ! isnumeric (obj.markeredgecolor) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
976 || (isnumeric (obj.markeredgecolor) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
977 && isequal (color, obj.markeredgecolor)))) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
978 if (sidx == 1 && ((length (style) == 5 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
979 && strncmp (style, "lines", 5)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
980 || isempty (style))) |
20778
8513c84a13cb
Use parser string concatenation rather than strcat() for performance in m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
981 style = [style, "points"]; |
10549 | 982 if (isfield (obj, "markersize")) |
983 if (length (mdat) == nc) | |
984 m = mdat(i); | |
985 else | |
986 m = mdat; | |
987 endif | |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
988 ps = sprintf ("pointsize %f", m / 3); |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
989 else |
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
990 ps = ""; |
10549 | 991 endif |
992 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
993 style, lw, pt, lt, ps, |
10549 | 994 colorspec); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
995 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
996 else |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
997 if (! isempty (style)) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
998 if (length (tmpwith) < sidx || isempty (tmpwith{sidx})) |
10549 | 999 tmpwith{sidx} = sprintf ("with %s %s %s %s", |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1000 style, lw, lt, |
10549 | 1001 colorspec); |
1002 endif | |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1003 sidx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1004 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1005 |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1006 if (! isempty (pt)) |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1007 if (strcmp (obj.markeredgecolor, "auto")) |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1008 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1009 round (255*color)); |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1010 elseif (isnumeric (obj.markeredgecolor)) |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1011 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1012 round (255*obj.markeredgecolor)); |
10549 | 1013 endif |
1014 style = "points"; | |
1015 if (isfield (obj, "markersize")) | |
1016 if (length (mdat) == nc) | |
1017 m = mdat(i); | |
1018 else | |
1019 m = mdat; | |
1020 endif | |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
1021 ps = sprintf ("pointsize %f", m / 3); |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1022 else |
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1023 ps = ""; |
10549 | 1024 endif |
1025 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1026 style, lw, pt, lt, ps, |
10549 | 1027 colorspec); |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1028 endif |
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1029 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1030 endif |
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1031 |
21368
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1032 if (! isempty (tmpwith)) |
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1033 withclause{data_idx} = tmpwith{1}; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1034 else |
21368
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1035 if (! isempty (style)) |
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1036 withclause{data_idx} = sprintf ("with %s %s %s %s %s", |
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1037 style, lw, pt, lt, |
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1038 colorspec); |
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1039 else |
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1040 withclause{data_idx} = ""; |
e789571034bc
Allow linestyle "none" for fill and patch objects (bug #38584)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
21366
diff
changeset
|
1041 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1042 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1043 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1044 if (ischar (color)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1045 if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1046 data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1047 [zcol; zcol(1)], [ccol; ccol(1)]]'; |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
1048 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1049 data{data_idx} = [xcol, ycol, zcol, ccol]'; |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
1050 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1051 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", columns (data{data_idx})); |
10549 | 1052 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1053 if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1054 data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1055 [zcol; zcol(1)]]'; |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
1056 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1057 data{data_idx} = [xcol, ycol, zcol]'; |
10236
8e58c402ebb2
Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents:
10226
diff
changeset
|
1058 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1059 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", columns (data{data_idx})); |
10549 | 1060 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1061 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1062 if (ischar (color)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1063 if (! isnan (xcol) && ! isnan (ycol)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1064 data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1065 [ccol; ccol(1)]]'; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1066 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1067 data{data_idx} = [xcol, ycol, ccol]'; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1068 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1069 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", columns (data{data_idx})); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1070 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1071 if (! isnan (xcol) && ! isnan (ycol)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1072 data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)]]'; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1073 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1074 data{data_idx} = [xcol, ycol]'; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1075 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1076 usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", columns (data{data_idx})); |
10549 | 1077 endif |
1078 endif | |
6790 | 1079 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1080 if (length (tmpwith) > 1) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1081 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1082 is_image_data(data_idx) = is_image_data(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1083 parametric(data_idx) = parametric(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1084 have_cdata(data_idx) = have_cdata(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1085 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1086 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1087 usingclause{data_idx} = usingclause{data_idx - 1}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1088 data{data_idx} = data{data_idx - 1}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1089 withclause{data_idx} = tmpwith{2}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1090 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1091 if (length (tmpwith) > 2) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1092 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1093 is_image_data(data_idx) = is_image_data(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1094 parametric(data_idx) = parametric(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1095 have_cdata(data_idx) = have_cdata(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1096 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1097 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1098 usingclause{data_idx} = usingclause{data_idx - 1}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1099 data{data_idx} = data{data_idx - 1}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1100 withclause{data_idx} = tmpwith{3}; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1101 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1102 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1103 endfor |
10995
e81914f3921f
Update legend code to support fltk (fixes #29348 and partially fixes #30461)
David Bateman <dbateman@free.fr>
parents:
10992
diff
changeset
|
1104 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1105 case "surface" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1106 view_map = true; |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
1107 if (! (strcmp (obj.edgecolor, "none") |
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
1108 && strcmp (obj.facecolor, "none"))) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1109 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1110 is_image_data(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1111 parametric(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1112 have_cdata(data_idx) = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1113 have_3d_patch(data_idx) = false; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1114 [style, sidx] = do_linestyle_command (obj, obj.edgecolor, |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1115 data_idx, |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1116 plot_stream); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1117 if (__gnuplot_has_feature__ ("linetype")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1118 scmd = "linetype"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1119 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1120 scmd = "linestyle"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1121 endif |
7110 | 1122 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1123 if (isempty (obj.displayname)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1124 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1125 else |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1126 tmp = undo_string_escapes ( |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1127 __maybe_munge_text__ (enhanced, obj, "displayname") |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1128 ); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1129 titlespec{data_idx} = ['title "' tmp '"']; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1130 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1131 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1132 flat_interp_face = (strcmp (obj.facecolor, "flat") |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1133 || strcmp (obj.facecolor, "interp")); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1134 flat_interp_edge = (strcmp (obj.edgecolor, "flat") |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1135 || strcmp (obj.edgecolor, "interp")); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1136 |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1137 facecolor_none_or_white = (strcmp (obj.facecolor, "none") |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1138 || (isnumeric (obj.facecolor) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1139 && all (obj.facecolor == 1))); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1140 xdat = obj.xdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1141 ydat = obj.ydata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1142 zdat = obj.zdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1143 cdat = obj.cdata; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1144 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1145 err = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1146 if (! size_equal (zdat, cdat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1147 err = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1148 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1149 if (isvector (xdat) && isvector (ydat) && ismatrix (zdat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1150 if (rows (zdat) == length (ydat) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1151 && columns (zdat) == length (xdat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1152 [xdat, ydat] = meshgrid (xdat, ydat); |
10549 | 1153 else |
1154 err = true; | |
1155 endif | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1156 elseif (ismatrix (xdat) && ismatrix (ydat) && ismatrix (zdat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1157 if (! size_equal (xdat, ydat, zdat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1158 err = true; |
10549 | 1159 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1160 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1161 err = true; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1162 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1163 if (err) |
20400
755ba248fb4a
build: Rename __go_draw_XXX to __gnuplot_draw_XXX for clarity.
Rik <rik@octave.org>
parents:
20286
diff
changeset
|
1164 error ("__gnuplot_draw_axes__: invalid grid data"); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1165 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1166 xlen = columns (zdat); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1167 ylen = rows (zdat); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1168 if (xlen == columns (xdat) && xlen == columns (ydat) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1169 && ylen == rows (xdat) && ylen == rows (ydat)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1170 len = 4 * xlen; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1171 zz = zeros (ylen, len); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1172 k = 1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1173 for kk = 1:4:len |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1174 zz(:,kk) = xdat(:,k); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1175 zz(:,kk+1) = ydat(:,k); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1176 zz(:,kk+2) = zdat(:,k); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1177 zz(:,kk+3) = cdat(:,k); |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1178 if (facecolor_none_or_white) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1179 zz(:,kk+3) = cdat(:,k); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1180 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1181 ## Convert color to 24-bit RGB |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1182 zz(:,kk+3) = hex2dec (sprintf ("%02x%02x%02x", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1183 round (255*obj.facecolor))); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1184 endif |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1185 k += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1186 endfor |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1187 data{data_idx} = zz.'; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1188 endif |
7109 | 1189 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1190 if (doing_interp_color) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1191 interp_str = "interpolate 0, 0"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1192 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1193 ## No interpolation of facecolors. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1194 interp_str = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1195 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1196 usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3):($4)", ylen, xlen); |
8166
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1197 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1198 fputs (plot_stream, "unset pm3d\n"); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1199 fputs (plot_stream, "set style increment default;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1200 if (flat_interp_edge && facecolor_none_or_white) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1201 withclause{data_idx} = sprintf ("with %s palette", style{1}); |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1202 if (length (style) > 1) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1203 style = style{2:end}; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1204 sidx = sidx(2:end); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1205 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1206 style = {}; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1207 sidx = []; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1208 end |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1209 if (all (obj.facecolor == 1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1210 hidden_removal = true; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1211 else |
21427
067662ac6bfe
Correct typo introduced by changeset 21c3641422e0.
Ben Abbott <bpabbott@mac.com>
parents:
21426
diff
changeset
|
1212 withclause{data_idx} = [withclause{data_idx} " nohidden3d"]; |
7119 | 1213 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1214 elseif (facecolor_none_or_white) |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1215 fputs (plot_stream,"set style increment user;\n"); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1216 withclause{data_idx} = sprintf ("with %s %s %d", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1217 style{1}, scmd, sidx(1)); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1218 if (length (style) > 1) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1219 style = style{2:end}; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1220 sidx = sidx(2:end); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1221 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1222 style = {}; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1223 sidx = []; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1224 end |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1225 if (all (obj.facecolor == 1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1226 hidden_removal = true; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1227 else |
21427
067662ac6bfe
Correct typo introduced by changeset 21c3641422e0.
Ben Abbott <bpabbott@mac.com>
parents:
21426
diff
changeset
|
1228 withclause{data_idx} = [withclause{data_idx} " nohidden3d"]; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1229 endif |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1230 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1231 hidden_removal = true; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1232 withclause{data_idx} = sprintf ("with pm3d linecolor rgb variable"); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1233 |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1234 if (doing_interp_color) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1235 ## "depthorder" interferes with interpolation of colors. |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1236 dord = "scansautomatic"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1237 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1238 dord = "depthorder"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1239 endif |
7109 | 1240 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1241 if (! (flat_interp_face && strcmp (obj.edgecolor, "flat")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1242 && ! facecolor_none_or_white) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1243 if (strcmp (obj.edgecolor, "none")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1244 if (__gnuplot_has_feature__ ("transparent_surface") |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1245 && isscalar (obj.facealpha)) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1246 fprintf (plot_stream, |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1247 "set style fill transparent solid %f;\n", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1248 obj.facealpha); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1249 endif |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1250 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1251 if (__gnuplot_has_feature__ ("transparent_surface") |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1252 && isscalar (obj.facealpha)) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1253 fprintf (plot_stream, |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1254 "set style fill transparent solid %f;\n", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1255 obj.facealpha); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1256 endif |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1257 endif |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1258 endif |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1259 fprintf (plot_stream, |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1260 "set pm3d explicit at s %s %s corners2color c3;\n", |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1261 interp_str, dord); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1262 endif |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1263 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1264 for i_stl = 1:length (style) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1265 len = 3 * xlen; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1266 zz = zeros (ylen, len); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1267 k = 1; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1268 for kk = 1:3:len |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1269 zz(:,kk) = xdat(:,k); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1270 zz(:,kk+1) = ydat(:,k); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1271 zz(:,kk+2) = zdat(:,k); |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1272 k += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1273 endfor |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1274 zz = zz.'; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1275 |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1276 data_idx += 1; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1277 is_image_data(data_idx) = is_image_data(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1278 parametric(data_idx) = parametric(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1279 have_cdata(data_idx) = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1280 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1281 titlespec{data_idx} = "title \"\""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1282 usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1283 data{data_idx} = zz; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1284 withclause{data_idx} = sprintf ("with %s %s %d", |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1285 style{i_stl}, scmd, sidx(i_stl)); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1286 endfor |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1287 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1288 endif |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1289 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1290 case "text" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1291 [label, f, s] = __maybe_munge_text__ (enhanced, obj, "string"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1292 fontspec = create_fontspec (f, s, gnuplot_term); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1293 lpos = obj.position; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1294 halign = obj.horizontalalignment; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1295 valign = obj.verticalalignment; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1296 angle = obj.rotation; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1297 units = obj.units; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1298 color = obj.color; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1299 if (strcmpi (units, "normalized")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1300 units = "graph"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1301 elseif (strcmp (axis_obj.yaxislocation, "right") |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1302 && strcmp (units, "data")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1303 units = "second"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1304 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1305 units = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1306 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1307 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1308 if (isnumeric (color)) |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1309 colorspec = get_text_colorspec (color); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1310 endif |
6405 | 1311 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1312 if (ischar (obj.string)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1313 num_lines = rows (obj.string); |
20057
e10ad5214a59
__go_draw_axes__.m: change computation of number of lines (bug #44683)
Avinoam
parents:
19833
diff
changeset
|
1314 num_lines += numel (strfind (obj.string, "\n")); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1315 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1316 num_lines = numel (obj.string); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1317 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1318 switch (valign) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1319 ## Text offset in characters. Relies on gnuplot for font metrics. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1320 case "top" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1321 dy = -0.5; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1322 case "cap" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1323 dy = -0.5; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1324 case "middle" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1325 dy = 0.5 * (num_lines - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1326 case "baseline" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1327 dy = 0.5 + (num_lines - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1328 case "bottom" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1329 dy = 0.5 + (num_lines - 1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1330 endswitch |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1331 ## Gnuplot's Character units are different for x/y and vary with |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1332 ## fontsize. The aspect ratio of 1:1.7 was determined by experiment |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1333 ## to work for eps/ps/etc. For the MacOS aqua terminal a value of 2.5 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1334 ## is needed. However, the difference is barely noticable. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1335 dx_and_dy = [(-dy * sind (angle)), (dy * cosd (angle))] .* [1.7 1]; |
6829 | 1336 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1337 ## FIXME: Multiline text produced the gnuplot |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1338 ## "warning: ft_render: skipping glyph" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1339 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1340 ## This produces the desired vertical alignment in 3D. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1341 fprintf (plot_stream, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1342 "set label \"%s\" at %s %.15e,%.15e,%.15e %s rotate by %f offset character %f,%f %s %s front %s;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1343 undo_string_escapes (label), units, lpos(1), |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1344 lpos(2), lpos(3), halign, angle, dx_and_dy, fontspec, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1345 __do_enhanced_option__ (enhanced, obj), colorspec); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1346 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1347 fprintf (plot_stream, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1348 "set label \"%s\" at %s %.15e,%.15e %s rotate by %f offset character %f,%f %s %s front %s;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1349 undo_string_escapes (label), units, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1350 lpos(1), lpos(2), halign, angle, dx_and_dy, fontspec, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1351 __do_enhanced_option__ (enhanced, obj), colorspec); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1352 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1353 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1354 case "hggroup" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1355 ## Push group children into the kid list. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1356 if (isempty (kids)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1357 kids = obj.children; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1358 elseif (! isempty (obj.children)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1359 kids = [kids; obj.children]; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1360 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1361 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1362 otherwise |
21031
66a08c3cafe3
maint: Follow Octave coding conventions in m-files.
Rik <rik@octave.org>
parents:
21000
diff
changeset
|
1363 error ("__gnuplot_draw_axes__: unknown object class, %s", obj.type); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1364 endswitch |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1365 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1366 endwhile |
11423
00b0aa8d539e
__go_draw_axes__.m: Enable vertical alignment of text objects for gnuplot.
Ben Abbott <bpabbott@mac.com>
parents:
11334
diff
changeset
|
1367 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1368 ## This is needed to prevent warnings for rotations in 3D plots, while |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1369 ## allowing colorbars with contours. |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1370 if (nd == 2 || (data_idx > 1 && ! view_map)) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1371 fputs (plot_stream, "set pm3d implicit;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1372 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1373 fputs (plot_stream, "set pm3d explicit;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1374 endif |
6405 | 1375 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1376 if (isnan (hidden_removal) || hidden_removal) |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1377 fputs (plot_stream, "set hidden3d front nooffset;\n"); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1378 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1379 fputs (plot_stream, "unset hidden3d;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1380 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1381 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1382 have_data = (! (isempty (data) || all (cellfun ("isempty", data)))); |
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1383 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1384 ## Note we don't use the [xy]2range of gnuplot as we don't use the |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1385 ## dual axis plotting features of gnuplot. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1386 if (isempty (xlim)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1387 return; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1388 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1389 if (strcmpi (axis_obj.xdir, "reverse")) |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1390 xlim = flip (xlim); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1391 endif |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1392 |
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1393 fprintf (plot_stream, "set xrange [%.15e:%.15e];\n", xlim); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1394 if (strcmpi (axis_obj.xaxislocation, "top")) |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1395 fprintf (plot_stream, "set x2range [%.15e:%.15e];\n", xlim); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1396 endif |
6405 | 1397 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1398 if (isempty (ylim)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1399 return; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1400 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1401 if (strcmpi (axis_obj.ydir, "reverse")) |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1402 ylim = flip (ylim); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1403 endif |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1404 fprintf (plot_stream, "set yrange [%.15e:%.15e];\n", ylim); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1405 if (strcmpi (axis_obj.yaxislocation, "right")) |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1406 fprintf (plot_stream, "set y2range [%.15e:%.15e];\n", ylim); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1407 endif |
7692
da1f4bc7cbe8
Conditionally set 'set pm3d implicit'
David Bateman <dbateman@free.fr>
parents:
7676
diff
changeset
|
1408 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1409 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1410 if (isempty (zlim)) |
7222 | 1411 return; |
6405 | 1412 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1413 if (strcmpi (axis_obj.zdir, "reverse")) |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1414 zlim = flip (zlim); |
6405 | 1415 endif |
20282
977853866d69
Flip gnuplot range values rather than use reverse/noreverse (bug #38914)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20231
diff
changeset
|
1416 fprintf (plot_stream, "set zrange [%.15e:%.15e];\n", zlim); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1417 endif |
6405 | 1418 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1419 cmap = parent_figure_obj.colormap; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1420 cmap_sz = rows (cmap); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1421 if (! any (isinf (clim))) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1422 if (truecolor || ! cdatadirect) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1423 if (rows (addedcmap) > 0) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1424 for i = 1:data_idx |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1425 if (have_3d_patch(i)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1426 data{i}(end,:) = clim(2) * (data{i}(end, :) - 0.5) / cmap_sz; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1427 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1428 endfor |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1429 fprintf (plot_stream, "set cbrange [%.15e:%.15e];\n", |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1430 clim(1), clim(2) * (cmap_sz + rows (addedcmap)) / cmap_sz); |
6405 | 1431 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1432 fprintf (plot_stream, "set cbrange [%.15e:%.15e];\n", clim); |
6405 | 1433 endif |
1434 else | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1435 fprintf (plot_stream, "set cbrange [1:%d];\n", cmap_sz + |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1436 rows (addedcmap)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1437 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1438 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1439 |
21366
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1440 axis_idx = data_idx; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1441 if (strcmpi (axis_obj.box, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1442 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1443 fputs (plot_stream, "set border 4095;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1444 else |
21366
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1445 axis_idx = do_border_2d (axis_obj, plot_stream, axis_idx); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1446 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1447 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1448 if (nd == 3) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1449 fputs (plot_stream, "set border 895;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1450 elseif (! isempty (axis_obj.ytick)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1451 if (strcmpi (axis_obj.yaxislocation, "right")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1452 fprintf (plot_stream, "unset ytics; set y2tics %s nomirror\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1453 axis_obj.tickdir); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1454 if (strcmpi (axis_obj.xaxislocation, "top")) |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1455 maybe_do_x2tick_mirror (plot_stream, axis_obj) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1456 elseif (strcmpi (axis_obj.xaxislocation, "bottom")) |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1457 maybe_do_xtick_mirror (plot_stream, axis_obj) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1458 else # xaxislocation == zero |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1459 fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", |
10549 | 1460 axis_obj.tickdir); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1461 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1462 elseif (strcmpi (axis_obj.yaxislocation, "left")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1463 fprintf (plot_stream, "unset y2tics; set ytics %s nomirror\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1464 axis_obj.tickdir); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1465 if (strcmpi (axis_obj.xaxislocation, "top")) |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1466 maybe_do_x2tick_mirror (plot_stream, axis_obj) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1467 elseif (strcmpi (axis_obj.xaxislocation, "bottom")) |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1468 maybe_do_xtick_mirror (plot_stream, axis_obj) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1469 else # xaxislocation == zero |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1470 maybe_do_xtick_mirror (plot_stream, axis_obj) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1471 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1472 else # yaxislocation == zero |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1473 fprintf (plot_stream, "unset y2tics; set ytics %s nomirror\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1474 axis_obj.tickdir); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1475 if (strcmpi (axis_obj.xaxislocation, "top")) |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1476 maybe_do_x2tick_mirror (plot_stream, axis_obj) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1477 elseif (strcmpi (axis_obj.xaxislocation, "bottom")) |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1478 maybe_do_xtick_mirror (plot_stream, axis_obj) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1479 else # xaxislocation == zero |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
1480 maybe_do_xtick_mirror (plot_stream, axis_obj) |
13322
16a706965ee0
Allow the axis box to be turned off for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
13299
diff
changeset
|
1481 fprintf (plot_stream, "unset y2tics; set ytics %s nomirror\n", |
16a706965ee0
Allow the axis box to be turned off for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
13299
diff
changeset
|
1482 axis_obj.tickdir); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1483 fputs (plot_stream, "unset border;\n"); |
10549 | 1484 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1485 endif |
21366
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1486 axis_idx = do_border_2d (axis_obj, plot_stream, axis_idx); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1487 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1488 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1489 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1490 if (strcmpi (axis_obj.visible, "off")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1491 fputs (plot_stream, "unset border; unset tics\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1492 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1493 fprintf (plot_stream, "set border lw %f;\n", axis_obj.linewidth); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1494 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1495 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1496 if (! isempty (hlgnd) && ! isempty (hlgnd.children) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1497 && any (strcmpi (get (hlgnd.children, "visible"), "on"))) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1498 if (strcmpi (hlgnd.box, "on")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1499 box = "box"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1500 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1501 box = "nobox"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1502 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1503 if (strcmpi (hlgnd.orientation, "vertical")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1504 horzvert = "vertical"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1505 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1506 horzvert = "horizontal"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1507 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1508 if (strcmpi (hlgnd.textposition, "right")) |
20933
8020eceafaf0
Gnuplot legend text alignment fix
Cillian O'Driscoll <cillian.odriscoll@gmail.com>
parents:
20889
diff
changeset
|
1509 reverse = "reverse Left"; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1510 else |
20933
8020eceafaf0
Gnuplot legend text alignment fix
Cillian O'Driscoll <cillian.odriscoll@gmail.com>
parents:
20889
diff
changeset
|
1511 reverse = "noreverse Right"; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1512 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1513 inout = "inside"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1514 keypos = hlgnd.location; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1515 if (ischar (keypos)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1516 keypos = lower (keypos); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1517 keyout = strfind (keypos, "outside"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1518 if (! isempty (keyout)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1519 inout = "outside"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1520 keypos = keypos(1:keyout-1); |
6405 | 1521 endif |
1522 endif | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1523 switch (keypos) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1524 case "north" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1525 pos = "center top"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1526 case "south" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1527 pos = "center bottom"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1528 case "east" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1529 pos = "right center"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1530 case "west" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1531 pos = "left center"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1532 case "northeast" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1533 pos = "right top"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1534 case "northwest" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1535 pos = "left top"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1536 case "southeast" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1537 pos = "right bottom"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1538 case "southwest" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1539 pos = "left bottom"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1540 case "best" |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1541 pos = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1542 warning ("legend: 'Best' not yet implemented for location specifier.\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1543 ## Least conflict with data in plot. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1544 ## Least unused space outside plot. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1545 otherwise |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1546 pos = ""; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1547 endswitch |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1548 if (__gnuplot_has_feature__ ("key_has_font_properties")) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1549 [fontname, fontsize] = get_fontname_and_size (hlgnd); |
19001
391e080ae810
__go_draw_axes__.m: Fix regression using legend with log axes introduced in f84361735a40.
Rik <rik@octave.org>
parents:
19000
diff
changeset
|
1550 fontspacespec = [ create_spacingspec(fontname, fontsize, gnuplot_term),... |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1551 create_fontspec(fontname, fontsize, gnuplot_term) ]; |
7565
1e6443ff960f
handle axes linewidth property
John W. Eaton <jwe@octave.org>
parents:
7564
diff
changeset
|
1552 else |
18982
04dc55bf71e8
adjust spacing in gnuplot legend when non default font size is used.
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18857
diff
changeset
|
1553 fontspacespec = ""; |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1554 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1555 textcolors = get (findobj (hlgnd.children, "type", "text"), "color"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1556 if (iscell (textcolors)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1557 textcolors = cell2mat (textcolors); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1558 textcolors = unique (textcolors, "rows"); |
7060 | 1559 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1560 if (rows (textcolors) > 1) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1561 ## Gnuplot is unable to assign arbitrary colors to each text entry |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1562 ## for the key/legend. But, the text color can be set to match the |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1563 ## color of the plot object. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1564 colorspec = "textcolor variable"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1565 else |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1566 colorspec = get_text_colorspec (textcolors); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1567 endif |
18741
e5ab507687ee
Correctly follow legend interpreter property for gnuplot (bug #40064).
Rik <rik@octave.org>
parents:
18740
diff
changeset
|
1568 fprintf (plot_stream, "set key %s %s;\nset key %s %s %s %s %s %s;\n", |
18982
04dc55bf71e8
adjust spacing in gnuplot legend when non default font size is used.
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18857
diff
changeset
|
1569 inout, pos, box, reverse, horzvert, fontspacespec, colorspec, |
18741
e5ab507687ee
Correctly follow legend interpreter property for gnuplot (bug #40064).
Rik <rik@octave.org>
parents:
18740
diff
changeset
|
1570 __do_enhanced_option__ (enhanced, hlgnd)); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1571 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1572 fputs (plot_stream, "unset key;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1573 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1574 fputs (plot_stream, "set style data lines;\n"); |
7060 | 1575 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1576 cmap = [cmap; addedcmap]; |
20231
83792dd9bcc1
Use in-place operators in m-files where possible.
Rik <rik@octave.org>
parents:
20191
diff
changeset
|
1577 cmap_sz += rows (addedcmap); |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1578 if (length (cmap) > 0) |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1579 fprintf (plot_stream, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1580 "set palette positive color model RGB maxcolors %i;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1581 cmap_sz); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1582 fprintf (plot_stream, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1583 "set palette file \"-\" binary record=%d using 1:2:3:4;\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1584 cmap_sz); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1585 fwrite (plot_stream, [1:cmap_sz; cmap.'], "float32"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1586 fwrite (plot_stream, "\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1587 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1588 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1589 fputs (plot_stream, "unset colorbox;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1590 |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1591 if (have_data) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1592 if (nd == 2) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1593 plot_cmd = "plot"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1594 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1595 plot_cmd = "splot"; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1596 rot_x = 90 - axis_obj.view(2); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1597 rot_z = axis_obj.view(1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1598 while (rot_z < 0) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1599 rot_z += 360; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1600 endwhile |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1601 fputs (plot_stream, "set ticslevel 0;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1602 if (view_map && rot_x == 0 && rot_z == 0) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1603 fputs (plot_stream, "set view map;\n"); |
6405 | 1604 else |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1605 fprintf (plot_stream, "set view %.15g, %.15g;\n", rot_x, rot_z); |
6405 | 1606 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1607 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1608 if (have_3d_patch (1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1609 fputs (plot_stream, "set pm3d depthorder\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1610 fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1611 usingclause{1}, titlespec{1}, withclause{1}); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1612 elseif (is_image_data (1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1613 if (numel (is_image_data) > 1 && is_image_data(2)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1614 ## Remove terminating semicolon |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1615 n = max (strfind (withclause{1}, ";")); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1616 if (! isempty (n)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1617 withclause{1} = withclause{1}(1:n-1); |
10549 | 1618 endif |
6977 | 1619 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1620 fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1621 usingclause{1}, titlespec{1}, withclause{1}); |
6405 | 1622 else |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1623 fprintf (plot_stream, "%s \"-\" binary format='%%float64' %s %s %s \\\n", |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1624 plot_cmd, usingclause{1}, titlespec{1}, withclause{1}); |
7189 | 1625 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1626 for i = 2:data_idx |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1627 if (have_3d_patch (i)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1628 fprintf (plot_stream, ", \"-\" %s %s %s \\\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1629 usingclause{i}, titlespec{i}, withclause{i}); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1630 elseif (is_image_data (i)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1631 if (! is_image_data (i-1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1632 fputs (plot_stream, "; "); |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1633 if (bg_is_set) |
10528
6a2e4e464d38
Unset figure color in __go_draw_axes__ (partial fix for bug #29060)
David Bateman <dbateman@free.fr>
parents:
10451
diff
changeset
|
1634 fputs (plot_stream, "unset obj 1; \\\n"); |
11204
d2f3a904ac6b
Unset the foreground color for the gnuplot backend earlier (fixes #31533)
David Bateman <dbateman@free.fr>
parents:
11201
diff
changeset
|
1635 bg_is_set = false; |
d2f3a904ac6b
Unset the foreground color for the gnuplot backend earlier (fixes #31533)
David Bateman <dbateman@free.fr>
parents:
11201
diff
changeset
|
1636 endif |
d2f3a904ac6b
Unset the foreground color for the gnuplot backend earlier (fixes #31533)
David Bateman <dbateman@free.fr>
parents:
11201
diff
changeset
|
1637 if (fg_is_set) |
d2f3a904ac6b
Unset the foreground color for the gnuplot backend earlier (fixes #31533)
David Bateman <dbateman@free.fr>
parents:
11201
diff
changeset
|
1638 fputs (plot_stream, "unset obj 2; \\\n"); |
d2f3a904ac6b
Unset the foreground color for the gnuplot backend earlier (fixes #31533)
David Bateman <dbateman@free.fr>
parents:
11201
diff
changeset
|
1639 fg_is_set = false; |
d2f3a904ac6b
Unset the foreground color for the gnuplot backend earlier (fixes #31533)
David Bateman <dbateman@free.fr>
parents:
11201
diff
changeset
|
1640 endif |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1641 if (numel (is_image_data) > i && is_image_data(i+1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1642 ## Remove terminating semicolon |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1643 n = max (strfind (withclause{i}, ";")); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1644 if (! isempty (n)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1645 withclause{i} = withclause{i}(1:n-1); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1646 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1647 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1648 fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, |
10549 | 1649 usingclause{i}, titlespec{i}, withclause{i}); |
1650 else | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1651 ## For consecutive images continue with the same plot command |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1652 fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", ",", |
10549 | 1653 usingclause{i}, titlespec{i}, withclause{i}); |
1654 endif | |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1655 elseif (is_image_data (i-1)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1656 if (bg_is_set) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1657 fputs (plot_stream, "unset obj 1; \\\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1658 bg_is_set = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1659 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1660 if (fg_is_set) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1661 fputs (plot_stream, "unset obj 2; \\\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1662 fg_is_set = false; |
10549 | 1663 endif |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1664 fprintf (plot_stream,"%s \"-\" binary format='%%float64' %s %s %s \\\n", |
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1665 plot_cmd, usingclause{i}, titlespec{i}, withclause{i}); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1666 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1667 fprintf (plot_stream, ", \"-\" binary format='%%float64' %s %s %s \\\n", |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1668 usingclause{i}, titlespec{i}, withclause{i}); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1669 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1670 endfor |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1671 fputs (plot_stream, ";\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1672 for i = 1:data_idx |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1673 if (have_3d_patch (i)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1674 ## Can't write 3d patch data as binary as can't plot more than |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1675 ## a single patch at a time and have to plot all patches together |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1676 ## so that the gnuplot depth ordering is done correctly |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1677 for j = 1 : 4 : columns (data{i}) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1678 if (j != 1) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1679 fputs (plot_stream, "\n\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1680 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1681 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j).'); |
20972
33793796aa6e
Coding improvements to __gnuplot_draw_axes__ (part of Bug # 44187).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20959
diff
changeset
|
1682 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n\n", data{i}(:,j+1).'); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1683 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+2).'); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1684 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+3).'); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1685 endfor |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1686 fputs (plot_stream, "e\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1687 elseif (is_image_data(i)) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1688 fwrite (plot_stream, data{i}, "float32"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1689 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1690 __gnuplot_write_data__ (plot_stream, data{i}, nd, parametric(i), |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1691 have_cdata(i)); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1692 endif |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1693 endfor |
20972
33793796aa6e
Coding improvements to __gnuplot_draw_axes__ (part of Bug # 44187).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20959
diff
changeset
|
1694 fputs (plot_stream, "\n"); |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1695 else |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1696 fputs (plot_stream, "plot \"-\";\nInf Inf\ne\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1697 endif |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1698 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1699 ## Needed to allow mouse rotation with pcolor. |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1700 if (view_map) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1701 fputs (plot_stream, "unset view;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1702 endif |
7271 | 1703 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1704 if (bg_is_set) |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1705 fputs (plot_stream, "unset obj 1;\n"); |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1706 bg_is_set = false; |
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1707 endif |
6405 | 1708 |
17176
abf384f5d243
maint: Remove unneeded input validation from internal fcns in private/ directories.
Rik <rik@octave.org>
parents:
17174
diff
changeset
|
1709 fflush (plot_stream); |
6405 | 1710 |
1711 endfunction | |
1712 | |
13143
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
1713 function x = flip (x) |
14872
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
1714 if (rows (x) == 1) |
13143
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
1715 x = fliplr (x); |
14872
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
1716 elseif (columns (x) == 1 || ischar (x)) |
13755
8cd08124cb59
Fix sloppy code and bugs introduced by changeset bda7b080f205.
Ben Abbott <bpabbott@mac.com>
parents:
13710
diff
changeset
|
1717 x = flipud (x); |
13143
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
1718 else |
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
1719 x = flipud (fliplr (x)); |
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
1720 endif |
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
1721 endfunction |
bda7b080f205
gnuplot support for log plots with only negative data. Bug #34232.
Ben Abbott <bpabbott@mac.com>
parents:
12965
diff
changeset
|
1722 |
18985
f84361735a40
maint: Use Octave coding conventions for some recent patches.
Rik <rik@octave.org>
parents:
18982
diff
changeset
|
1723 function spacing_spec = create_spacingspec (f, s, gp_term) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1724 ## The gnuplot default font size is 10, and default spacing is 1.25. |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1725 ## gnuplot has a concept of a figure global font, and sizes everything |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1726 ## appropriate to that, including the legend spacing. |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1727 ## |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1728 ## This means that if an alternative size is used, gnuplot will use an |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1729 ## inappropriate spacing in the legend by default. |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1730 ## |
19725
5f2c0ca0ef51
Ensure that numbers passed to integer *printf format codes are integers (bug #44245).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
1731 ## FIXME: Are fractional spacing specifications allowed? Or should this |
5f2c0ca0ef51
Ensure that numbers passed to integer *printf format codes are integers (bug #44245).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
1732 ## number be rounded? |
18982
04dc55bf71e8
adjust spacing in gnuplot legend when non default font size is used.
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18857
diff
changeset
|
1733 spc = s / 10 * 1.25; |
04dc55bf71e8
adjust spacing in gnuplot legend when non default font size is used.
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18857
diff
changeset
|
1734 spacing_spec = sprintf ("spacing %d", spc); |
04dc55bf71e8
adjust spacing in gnuplot legend when non default font size is used.
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18857
diff
changeset
|
1735 |
04dc55bf71e8
adjust spacing in gnuplot legend when non default font size is used.
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18857
diff
changeset
|
1736 endfunction |
04dc55bf71e8
adjust spacing in gnuplot legend when non default font size is used.
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18857
diff
changeset
|
1737 |
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
1738 function fontspec = create_fontspec (f, s, gp_term) |
20972
33793796aa6e
Coding improvements to __gnuplot_draw_axes__ (part of Bug # 44187).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20959
diff
changeset
|
1739 if (isempty (f) || strcmp (f, "*") || strcmp (gp_term, "tikz")) |
9098
5ecdb3d3568f
Allow fontsize to be specified for all objects with fontname == "*".
Ben Abbott <bpabbott@mac.com>
parents:
9083
diff
changeset
|
1740 fontspec = sprintf ("font \",%d\"", s); |
9063
a6cf0ad87eee
__go_draw_axes__.m: New subfunction create_fontspec(). Allow fontsize to be specified when the fontname is anonymous.
Ben Abbott <bpabbott@mac.com>
parents:
9050
diff
changeset
|
1741 else |
a6cf0ad87eee
__go_draw_axes__.m: New subfunction create_fontspec(). Allow fontsize to be specified when the fontname is anonymous.
Ben Abbott <bpabbott@mac.com>
parents:
9050
diff
changeset
|
1742 fontspec = sprintf ("font \"%s,%d\"", f, s); |
a6cf0ad87eee
__go_draw_axes__.m: New subfunction create_fontspec(). Allow fontsize to be specified when the fontname is anonymous.
Ben Abbott <bpabbott@mac.com>
parents:
9050
diff
changeset
|
1743 endif |
a6cf0ad87eee
__go_draw_axes__.m: New subfunction create_fontspec(). Allow fontsize to be specified when the fontname is anonymous.
Ben Abbott <bpabbott@mac.com>
parents:
9050
diff
changeset
|
1744 endfunction |
a6cf0ad87eee
__go_draw_axes__.m: New subfunction create_fontspec(). Allow fontsize to be specified when the fontname is anonymous.
Ben Abbott <bpabbott@mac.com>
parents:
9050
diff
changeset
|
1745 |
21366
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1746 function idx = do_border_2d (obj, plot_stream, idx) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1747 fprintf (plot_stream, "set border 0\n"); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1748 |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1749 if (strcmp (obj.box, "on") || strcmp (obj.xaxislocation, "bottom")) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1750 arrow (1, obj.xcolor, obj.linewidth, [0,0,0],[1,0,0]); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1751 endif |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1752 if (strcmp (obj.box, "on") || strcmp (obj.xaxislocation, "top")) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1753 arrow (2, obj.xcolor, obj.linewidth, [0,1,0],[1,1,0]); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1754 endif |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1755 if (strcmp (obj.box, "on") || strcmp (obj.yaxislocation, "left")) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1756 arrow (3, obj.ycolor, obj.linewidth, [0,0,0],[0,1,0]); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1757 endif |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1758 if (strcmp (obj.box, "on") || strcmp (obj.yaxislocation, "right")) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1759 arrow (4, obj.ycolor, obj.linewidth, [1,0,0],[1,1,0]); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1760 endif |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1761 |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1762 if (strcmp (obj.xaxislocation, "zero")) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1763 idx = zeroaxis (idx, obj.xcolor, "x"); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1764 endif |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1765 if (strcmp (obj.yaxislocation, "zero")) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1766 idx = zeroaxis (idx, obj.ycolor, "y"); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1767 endif |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1768 |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1769 function idx = zeroaxis (idx, lc, ax) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1770 idx = idx + 1; |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1771 do_linestyle_command (obj, lc, idx, false, plot_stream); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1772 fprintf (plot_stream, "set %szeroaxis ls %d ", ax, idx); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1773 fprintf (plot_stream, "lw %.3f\n", obj.linewidth); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1774 endfunction |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1775 |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1776 function arrow (idx, lc, lw, from, to) |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1777 fprintf (plot_stream, "set arrow %d ", idx); |
21370
df5922f77193
Remove unecessary "dashtype" syntax when drawing colored gnuplot axes.
Ben Abbott <bpabbott@mac.com>
parents:
21368
diff
changeset
|
1778 fprintf (plot_stream, "nohead nofilled front "); |
21366
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1779 fprintf (plot_stream, "lc rgb ""#%02x%02x%02x"" ", round (255 * lc)); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1780 fprintf (plot_stream, "linewidth %.3f ", obj.linewidth); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1781 fprintf (plot_stream, "from graph %d,%d,%d ", from); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1782 fprintf (plot_stream, "to graph %d,%d,%d\n", to); |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1783 endfunction |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1784 endfunction |
ad07ed235053
Apply {x|y}color to 2D axes when using gnuplot (bug #42947).
Ben Abbott <bpabbott@mac.com>
parents:
21365
diff
changeset
|
1785 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1786 function [style, ltidx] = do_linestyle_command (obj, linecolor, idx, |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1787 plot_stream, errbars = "") |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1788 idx = idx + 8; |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1789 style = {}; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1790 ltidx = []; |
6405 | 1791 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1792 if (__gnuplot_has_feature__ ("linetype")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1793 scommand = "linetype"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1794 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1795 scommand = "line style"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1796 endif |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1797 fprintf (plot_stream, "set %s %d default;\n", scommand, idx); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1798 fprintf (plot_stream, "set %s %d", scommand, idx); |
6405 | 1799 |
1800 found_style = false; | |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1801 if (isnumeric (linecolor)) |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1802 color = linecolor; |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1803 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1804 round (255*color)); |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1805 else |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1806 color = [0, 0, 0]; |
6405 | 1807 endif |
1808 | |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1809 lt = gnuplot_linetype (obj); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1810 if (! isempty (lt)) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1811 fprintf (plot_stream, " %s", lt); |
6405 | 1812 endif |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1813 if (! isempty (errbars)) |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1814 found_style = true; |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1815 endif |
6405 | 1816 |
1817 if (isfield (obj, "linewidth")) | |
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1818 fprintf (plot_stream, " linewidth %f", obj.linewidth); |
6405 | 1819 found_style = true; |
1820 endif | |
1821 | |
10933
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
1822 [pt, pt2, obj] = gnuplot_pointtype (obj); |
6405 | 1823 |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1824 if (! isempty (pt)) |
6465 | 1825 found_style = true; |
1826 endif | |
1827 | |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1828 sidx = 1; |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1829 if (isempty (errbars)) |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1830 if (isempty (lt)) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1831 style{sidx} = ""; |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1832 else |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1833 style{sidx} = "lines"; |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1834 endif |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1835 ltidx(sidx) = idx; |
11095
d4619eb6ef8e
__go_draw_axes__.m: Enable linetypes for gnuplot.
Ben Abbott <bpabbott@mac.com>
parents:
11090
diff
changeset
|
1836 |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1837 facesame = true; |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1838 if (! isequal (pt, pt2) && isfield (obj, "markerfacecolor") |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1839 && ! strcmp (obj.markerfacecolor, "none")) |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
1840 if (strcmp (obj.markerfacecolor, "auto") |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1841 || ! isnumeric (obj.markerfacecolor) |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1842 || (isnumeric (obj.markerfacecolor) |
10549 | 1843 && isequal (color, obj.markerfacecolor))) |
1844 if (! isempty (pt2)) | |
1845 fprintf (plot_stream, " pointtype %s", pt2); | |
20778
8513c84a13cb
Use parser string concatenation rather than strcat() for performance in m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
1846 style{sidx} = [style{sidx} "points"]; |
10549 | 1847 endif |
1848 if (isfield (obj, "markersize")) | |
1849 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); | |
1850 endif | |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1851 else |
10549 | 1852 facesame = false; |
1853 if (! found_style) | |
1854 fputs (plot_stream, " default"); | |
1855 endif | |
1856 fputs (plot_stream, ";\n"); | |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1857 if (! isempty (style{sidx})) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1858 sidx += 1; |
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1859 idx += 1; |
10549 | 1860 else |
1861 fputs (plot_stream, ";\n"); | |
1862 endif | |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1863 fprintf (plot_stream, "set %s %d default;\n", scommand, idx); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1864 fprintf (plot_stream, "set %s %d", scommand, idx); |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1865 if (isnumeric (obj.markerfacecolor)) |
10549 | 1866 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
1867 round (255*obj.markerfacecolor)); | |
1868 endif | |
1869 if (! isempty (pt2)) | |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1870 style{sidx} = "points"; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1871 ltidx(sidx) = idx; |
10549 | 1872 fprintf (plot_stream, " pointtype %s", pt2); |
1873 endif | |
1874 if (isfield (obj, "markersize")) | |
1875 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); | |
1876 endif | |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1877 endif |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1878 endif |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1879 if (isfield (obj, "markeredgecolor") |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1880 && ! strcmp (obj.markeredgecolor, "none")) |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1881 if (facesame && ! isempty (pt) |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
1882 && (strcmp (obj.markeredgecolor, "auto") |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1883 || ! isnumeric (obj.markeredgecolor) |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
1884 || (isnumeric (obj.markeredgecolor) |
10549 | 1885 && isequal (color, obj.markeredgecolor)))) |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1886 if (sidx == 1 && ((length (style{sidx}) == 5 |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1887 && strncmp (style{sidx}, "lines", 5)) || isempty (style{sidx}))) |
10549 | 1888 if (! isempty (pt)) |
20778
8513c84a13cb
Use parser string concatenation rather than strcat() for performance in m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
1889 style{sidx} = [style{sidx} "points"]; |
10549 | 1890 fprintf (plot_stream, " pointtype %s", pt); |
1891 endif | |
1892 if (isfield (obj, "markersize")) | |
1893 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); | |
1894 endif | |
1895 endif | |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1896 else |
10549 | 1897 if (! found_style) |
1898 fputs (plot_stream, " default"); | |
1899 endif | |
1900 fputs (plot_stream, ";\n"); | |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1901 if (! isempty (style{sidx})) |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1902 sidx += 1; |
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
1903 idx += 1; |
10549 | 1904 else |
1905 fputs (plot_stream, ";\n"); | |
1906 endif | |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1907 fprintf (plot_stream, "set %s %d default;\n", scommand, idx); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1908 fprintf (plot_stream, "set %s %d", scommand, idx); |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1909 if (strcmp (obj.markeredgecolor, "auto")) |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1910 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1911 round (255*color)); |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1912 elseif (isnumeric (obj.markeredgecolor)) |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1913 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
1914 round (255*obj.markeredgecolor)); |
10549 | 1915 endif |
1916 if (! isempty (pt)) | |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1917 style{sidx} = "points"; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1918 ltidx(sidx) = idx; |
10549 | 1919 fprintf (plot_stream, " pointtype %s", pt); |
1920 endif | |
1921 if (isfield (obj, "markersize")) | |
1922 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); | |
1923 endif | |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1924 endif |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1925 endif |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1926 else |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1927 style{1} = errbars; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1928 ltidx(1) = idx; |
10582
9676d0255440
Use "." for marker when plotting with errorbars. (bug #29057)
Rik <octave@nomad.inbox5.com>
parents:
10563
diff
changeset
|
1929 fputs (plot_stream, " pointtype 0"); |
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1930 endif |
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1931 |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
1932 if (! found_style && isempty (style{1})) |
6405 | 1933 fputs (plot_stream, " default"); |
1934 endif | |
1935 | |
1936 fputs (plot_stream, ";\n"); | |
1937 | |
1938 endfunction | |
6510 | 1939 |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1940 function [lt] = gnuplot_linetype (obj) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1941 if (isfield (obj, "linestyle")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1942 if (__gnuplot_has_feature__ ("dashtype")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1943 opt = "dashtype"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1944 switch (obj.linestyle) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1945 case "-" |
21426
0ad3fe00d6f9
Consistent linestyles for gnuplot terminals (Bug # 46886).
Ben Abbott <bpabbott@mac.com>
parents:
21373
diff
changeset
|
1946 lt = "solid"; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1947 case "--" |
21426
0ad3fe00d6f9
Consistent linestyles for gnuplot terminals (Bug # 46886).
Ben Abbott <bpabbott@mac.com>
parents:
21373
diff
changeset
|
1948 lt = "'_ '"; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1949 case ":" |
21426
0ad3fe00d6f9
Consistent linestyles for gnuplot terminals (Bug # 46886).
Ben Abbott <bpabbott@mac.com>
parents:
21373
diff
changeset
|
1950 lt = "'. '"; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1951 case "-." |
21426
0ad3fe00d6f9
Consistent linestyles for gnuplot terminals (Bug # 46886).
Ben Abbott <bpabbott@mac.com>
parents:
21373
diff
changeset
|
1952 lt = "'-. '"; |
21373
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1953 case "none" |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1954 lt = ""; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1955 otherwise |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1956 lt = ""; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1957 endswitch |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1958 elseif (__gnuplot_has_feature__ ("linetype")) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1959 opt = "linetype"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1960 switch (obj.linestyle) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1961 case "-" |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1962 lt = "1"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1963 case "--" |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1964 lt = "2"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1965 case ":" |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1966 lt = "3"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1967 case "-." |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1968 lt = "6"; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1969 case "none" |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1970 lt = ""; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1971 otherwise |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1972 lt = ""; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1973 endswitch |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1974 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1975 lt = ""; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1976 endif |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1977 if (! isempty (lt)) |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1978 lt = sprintf ("%s %s", opt, lt); |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1979 endif |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1980 else |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1981 lt = ""; |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1982 endif |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1983 endfunction |
21c3641422e0
Fix gnuplot toolkit face/edgecolor and linestyle/width for surf() (bug #34523)
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
21370
diff
changeset
|
1984 |
10933
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
1985 function [pt, pt2, obj] = gnuplot_pointtype (obj) |
10925
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1986 if (isfield (obj, "marker")) |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1987 switch (obj.marker) |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1988 case "+" |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1989 pt = pt2 = "1"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1990 case "o" |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1991 pt = "6"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1992 pt2 = "7"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1993 case "*" |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1994 pt = pt2 = "3"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
1995 case "." |
10933
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
1996 pt = "6"; |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
1997 pt2 = "7"; |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
1998 if (isfield (obj, "markerfacecolor") |
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
1999 || strcmp (obj.markerfacecolor, "none")) |
10933
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
2000 obj.markerfacecolor = "auto"; |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
2001 endif |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
2002 if (isfield (obj, "markersize")) |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
2003 obj.markersize /= 3; |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
2004 else |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
2005 obj.markersize = 5; |
e78e531dfa2d
Improve matlab compatibility with '.' marker
David Bateman <dbateman@free.fr>
parents:
10931
diff
changeset
|
2006 endif |
10925
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2007 case "x" |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2008 pt = pt2 = "2"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2009 case {"square", "s"} |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2010 pt = "4"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2011 pt2 = "5"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2012 case {"diamond", "d"} |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2013 pt = "12"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2014 pt2 = "13"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2015 case "^" |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2016 pt = "8"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2017 pt2 = "9"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2018 case "v" |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2019 pt = "10"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2020 pt2 = "11"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2021 case ">" |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2022 ## FIXME: Should be triangle pointing right, use triangle pointing up |
10925
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2023 pt = "8"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2024 pt2 = "9"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2025 case "<" |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2026 ## FIXME: Should be triangle pointing left, use triangle pointing down |
10925
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2027 pt = "10"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2028 pt2 = "11"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2029 case {"pentagram", "p"} |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2030 ## FIXME: Should be pentagram, using pentagon |
10925
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2031 pt = "14"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2032 pt2 = "15"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2033 case {"hexagram", "h"} |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2034 ## FIXME: Should be 6 pt start, using "*" instead |
10925
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2035 pt = pt2 = "3"; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2036 case "none" |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2037 pt = pt2 = ""; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2038 otherwise |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2039 pt = pt2 = ""; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2040 endswitch |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2041 else |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2042 pt = pt2 = ""; |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2043 endif |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2044 endfunction |
2f9de135e7f9
__go_draw_axes__.m: Use gnuplot's pentagon for marker == 'p'.
Ben Abbott <bpabbott@mac.com>
parents:
10920
diff
changeset
|
2045 |
7119 | 2046 function __gnuplot_write_data__ (plot_stream, data, nd, parametric, cdata) |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11549
diff
changeset
|
2047 |
6510 | 2048 ## DATA is already transposed. |
2049 | |
6605 | 2050 ## Convert NA elements to normal NaN values because fprintf writes |
2051 ## "NA" and that confuses gnuplot. | |
20972
33793796aa6e
Coding improvements to __gnuplot_draw_axes__ (part of Bug # 44187).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20959
diff
changeset
|
2052 data(isna (data)) = NaN; |
6605 | 2053 |
6510 | 2054 if (nd == 2) |
8217
f74cb5e3a6c1
send binary data to gnuplot
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8216
diff
changeset
|
2055 fwrite (plot_stream, data, "float64"); |
7109 | 2056 elseif (nd == 3) |
6510 | 2057 if (parametric) |
8217
f74cb5e3a6c1
send binary data to gnuplot
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8216
diff
changeset
|
2058 fwrite (plot_stream, data, "float64"); |
6510 | 2059 else |
7170 | 2060 nr = rows (data); |
7119 | 2061 if (cdata) |
10549 | 2062 for j = 1:4:nr |
2063 fwrite (plot_stream, data(j:j+3,:), "float64"); | |
2064 endfor | |
7119 | 2065 else |
10549 | 2066 for j = 1:3:nr |
2067 fwrite (plot_stream, data(j:j+2,:), "float64"); | |
2068 endfor | |
7119 | 2069 endif |
7109 | 2070 endif |
6510 | 2071 endif |
2072 | |
2073 endfunction | |
6745 | 2074 |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2075 function do_tics (obj, plot_stream, ymirror, gnuplot_term) |
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2076 |
8518
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2077 obj.xticklabel = ticklabel_to_cell (obj.xticklabel); |
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2078 obj.yticklabel = ticklabel_to_cell (obj.yticklabel); |
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2079 obj.zticklabel = ticklabel_to_cell (obj.zticklabel); |
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2080 |
9374
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2081 if (strcmp (obj.xminorgrid, "on")) |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2082 obj.xminortick = "on"; |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2083 endif |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2084 if (strcmp (obj.yminorgrid, "on")) |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2085 obj.yminortick = "on"; |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2086 endif |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2087 if (strcmp (obj.zminorgrid, "on")) |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2088 obj.zminortick = "on"; |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2089 endif |
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2090 |
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
2091 [fontname, fontsize] = get_fontname_and_size (obj); |
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
2092 fontspec = create_fontspec (fontname, fontsize, gnuplot_term); |
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2093 |
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2094 ## A Gnuplot tic scale of 69 is equivalent to Octave's 0.5. |
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2095 ticklength = sprintf ("scale %4.1f", (69/0.5)*obj.ticklength(1)); |
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2096 |
6809 | 2097 if (strcmpi (obj.xaxislocation, "top")) |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2098 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2099 obj.xticklabel, obj.xcolor, "x2", plot_stream, true, |
10549 | 2100 "border", obj.tickdir, ticklength, fontname, fontspec, |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2101 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2102 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2103 obj.xcolor, "x", plot_stream, true, "border", |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2104 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2105 obj.xscale, obj.xsgn, gnuplot_term); |
7321 | 2106 elseif (strcmpi (obj.xaxislocation, "zero")) |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2107 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2108 obj.xticklabel, obj.xcolor, "x", plot_stream, true, |
10549 | 2109 "axis", obj.tickdir, ticklength, fontname, fontspec, |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2110 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2111 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2112 obj.xcolor, "x2", plot_stream, true, "axis", |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2113 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2114 obj.xscale, obj.xsgn, gnuplot_term); |
6809 | 2115 else |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2116 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2117 obj.xticklabel, obj.xcolor, "x", plot_stream, true, |
10549 | 2118 "border", obj.tickdir, ticklength, fontname, fontspec, |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2119 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2120 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2121 obj.xcolor, "x2", plot_stream, true, "border", |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2122 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2123 obj.xscale, obj.xsgn, gnuplot_term); |
6809 | 2124 endif |
2125 if (strcmpi (obj.yaxislocation, "right")) | |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2126 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2127 obj.yticklabel, obj.ycolor, "y2", plot_stream, ymirror, |
10549 | 2128 "border", obj.tickdir, ticklength, fontname, fontspec, |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2129 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2130 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2131 obj.ycolor, "y", plot_stream, ymirror, "border", |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2132 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2133 obj.yscale, obj.ysgn, gnuplot_term); |
8943
4a312440b262
__go_draw_axes__.m (do_tics): fix typo
Ben Abbott <bpabbott@mac.com>
parents:
8920
diff
changeset
|
2134 elseif (strcmpi (obj.yaxislocation, "zero")) |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2135 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2136 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, |
10549 | 2137 "axis", obj.tickdir, ticklength, fontname, fontspec, |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2138 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2139 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2140 obj.ycolor, "y2", plot_stream, ymirror, "axis", |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2141 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2142 obj.yscale, obj.ysgn, gnuplot_term); |
6809 | 2143 else |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2144 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2145 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, |
10549 | 2146 "border", obj.tickdir, ticklength, fontname, fontspec, |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2147 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2148 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2149 obj.ycolor, "y2", plot_stream, ymirror, "border", |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2150 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2151 obj.yscale, obj.ysgn, gnuplot_term); |
6809 | 2152 endif |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2153 do_tics_1 (obj.ztickmode, obj.ztick, obj.zminortick, obj.zticklabelmode, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2154 obj.zticklabel, obj.zcolor, "z", plot_stream, true, |
10549 | 2155 "border", obj.tickdir, ticklength, fontname, fontspec, |
20286
42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
20282
diff
changeset
|
2156 obj.ticklabelinterpreter, obj.zscale, obj.zsgn, gnuplot_term); |
6745 | 2157 endfunction |
2158 | |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2159 function do_tics_1 (ticmode, tics, mtics, labelmode, labels, color, ax, |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2160 plot_stream, mirror, axispos, tickdir, ticklength, |
13209
9eff72139c05
Use "-10^{%T}" format for negative values in log scale plots.
Ben Abbott <bpabbott@mac.com>
parents:
13176
diff
changeset
|
2161 fontname, fontspec, interpreter, scale, sgn, gnuplot_term) |
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2162 persistent warned_latex = false; |
19417
cdb6bc186c42
Fix ploting 1D images with gnuplot (bug #43836).
Juan Pablo Carbajal <ajuanpi+dev@gmail.com>
parents:
19388
diff
changeset
|
2163 |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2164 ## Avoid emitting anything if the tics are empty, because this undoes the |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2165 ## effect of the previous unset xtics and thereby adds back in the tics. |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2166 if (isempty (tics)) |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2167 return; |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2168 endif |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2169 |
18826
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2170 if (mirror) |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2171 mirror = "mirror"; |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2172 else |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2173 mirror = "nomirror"; |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2174 endif |
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2175 if (strcmpi (interpreter, "tex")) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2176 for n = 1 : numel (labels) |
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2177 labels{n} = __tex2enhanced__ (labels{n}, fontname, false, false); |
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2178 endfor |
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2179 elseif (strcmpi (interpreter, "latex")) |
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2180 if (! warned_latex) |
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2181 warning ("latex markup not supported for tick marks"); |
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2182 warned_latex = true; |
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2183 endif |
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2184 endif |
9302
5542c40e40ac
__go_draw_axes__.m: Change strncmpi(scale,'lo') -> strcmp(scale,'log').
Ben Abbott <bpabbott@mac.com>
parents:
9301
diff
changeset
|
2185 if (strcmp (scale, "log")) |
9374
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2186 num_mtics = 10; |
20959
3894a672799e
Place ticklabels in LaTeX mathmode when using gnuplot terminal "eepic".
Ben Abbott <bpabbott@mac.com>
parents:
20958
diff
changeset
|
2187 if (any (strcmp (gnuplot_term, {"cairolatex", "eepic", "epslatex", ... |
3894a672799e
Place ticklabels in LaTeX mathmode when using gnuplot terminal "eepic".
Ben Abbott <bpabbott@mac.com>
parents:
20958
diff
changeset
|
2188 "latex", "pslatex", "pstex", "pstricks", "texdraw", "tikz"}))) |
13155
62e710cea7f1
Fix bug #33204. Use latex markeup for log tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
12677
diff
changeset
|
2189 fmt = "$10^{%T}$"; |
62e710cea7f1
Fix bug #33204. Use latex markeup for log tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
12677
diff
changeset
|
2190 else |
62e710cea7f1
Fix bug #33204. Use latex markeup for log tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
12677
diff
changeset
|
2191 fmt = "10^{%T}"; |
62e710cea7f1
Fix bug #33204. Use latex markeup for log tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
12677
diff
changeset
|
2192 endif |
13209
9eff72139c05
Use "-10^{%T}" format for negative values in log scale plots.
Ben Abbott <bpabbott@mac.com>
parents:
13176
diff
changeset
|
2193 if (sgn < 0) |
20778
8513c84a13cb
Use parser string concatenation rather than strcat() for performance in m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
2194 fmt = ["-" fmt]; |
13209
9eff72139c05
Use "-10^{%T}" format for negative values in log scale plots.
Ben Abbott <bpabbott@mac.com>
parents:
13176
diff
changeset
|
2195 endif |
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
2196 else |
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
2197 fmt = "%g"; |
9374
6a035159ba0e
grid.m: Add missing semi-colon. Fix grid toggle. Allow minor grid when no minor tick.
Ben Abbott <bpabbott@mac.com>
parents:
9361
diff
changeset
|
2198 num_mtics = 5; |
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
2199 endif |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2200 colorspec = get_text_colorspec (color); |
18829
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2201 fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2202 if (strcmpi (ticmode, "manual")) |
6745 | 2203 if (isempty (tics)) |
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2204 fprintf (plot_stream, "unset %stics;\nunset m%stics;\n", ax, ax); |
18826
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2205 return |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2206 endif |
18829
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2207 fprintf (plot_stream, "set %stics %s %s %s %s (", ax, tickdir, |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2208 ticklength, axispos, mirror); |
20889
a88142abca36
Remove spurious tick labels occuring when setting ticks and removing tick labels.
Edarag <edera@gmx.fr>
parents:
20852
diff
changeset
|
2209 fprintf (plot_stream, " %.15g,", tics(1:end-1)); |
a88142abca36
Remove spurious tick labels occuring when setting ticks and removing tick labels.
Edarag <edera@gmx.fr>
parents:
20852
diff
changeset
|
2210 fprintf (plot_stream, " %.15g) %s;\n", tics(end), fontspec); |
6745 | 2211 else |
18826
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2212 fprintf (plot_stream, "set %stics %s %s %s %s %s %s;\n", ax, |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2213 tickdir, ticklength, axispos, mirror, colorspec, fontspec); |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2214 endif |
18829
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2215 if (strcmpi (labelmode, "manual")) |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2216 k = 1; |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2217 ntics = numel (tics); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2218 nlabels = numel (labels); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2219 fprintf (plot_stream, "set %stics add %s %s %s %s (", ax, |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2220 tickdir, ticklength, axispos, mirror); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2221 labels = strrep (labels, "%", "%%"); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2222 for i = 1:ntics |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2223 fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i)); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2224 if (i < ntics) |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2225 fputs (plot_stream, ", "); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2226 endif |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2227 if (k > nlabels) |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2228 k = 1; |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2229 endif |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2230 endfor |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2231 fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec); |
0dae39867b2b
cleanup of tic and ticlabel code
Stefan Mahr <dac922@gmx.de>
parents:
18828
diff
changeset
|
2232 endif |
18826
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2233 if (strcmp (mtics, "on")) |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2234 fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2235 else |
9c2ff2361864
fix xticklabel with minor grid (bug #38139, bug #40256)
Stefan Mahr <dac922@gmx.de>
parents:
18741
diff
changeset
|
2236 fprintf (plot_stream, "unset m%stics;\n", ax); |
7194 | 2237 endif |
2238 endfunction | |
2239 | |
9281
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
2240 function ticklabel = ticklabel_to_cell (ticklabel) |
9472
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2241 if (ischar (ticklabel)) |
18828
6a8cd989c69a
remove unneeded ticklabel conversions
Stefan Mahr <dac922@gmx.de>
parents:
18826
diff
changeset
|
2242 ticklabel = cellstr (ticklabel); |
6a8cd989c69a
remove unneeded ticklabel conversions
Stefan Mahr <dac922@gmx.de>
parents:
18826
diff
changeset
|
2243 elseif (iscellstr (ticklabel)) |
6a8cd989c69a
remove unneeded ticklabel conversions
Stefan Mahr <dac922@gmx.de>
parents:
18826
diff
changeset
|
2244 ticklabel = ticklabel; |
9280
40fb718a2e67
__go_draw_axes__.m: Add support for ticklabel separator '|'.
Ben Abbott <bpabbott@mac.com>
parents:
9272
diff
changeset
|
2245 else |
20400
755ba248fb4a
build: Rename __go_draw_XXX to __gnuplot_draw_XXX for clarity.
Rik <rik@octave.org>
parents:
20286
diff
changeset
|
2246 error ("__gnuplot_draw_axes__: unsupported type of ticklabel"); |
8518
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2247 endif |
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2248 endfunction |
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2249 |
21365
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2250 function colorspec = get_text_colorspec (color) |
5b9618f4f841
Rely upon print.m for mono/color conversion. This simplifies gnuplot support
Ben Abbott <bpabbott@mac.com>
parents:
21031
diff
changeset
|
2251 colorspec = sprintf ("textcolor rgb \"#%02x%02x%02x\"", round (255*color)); |
6745 | 2252 endfunction |
7163 | 2253 |
7189 | 2254 function [f, s, fnt, it, bld] = get_fontname_and_size (t) |
11549
beb4f0f27a32
Use {} as the default font for the gnuplot backend
David Bateman <dbateman@free.fr>
parents:
11523
diff
changeset
|
2255 if (isempty (t.fontname) || strcmp (t.fontname, "*")) |
20972
33793796aa6e
Coding improvements to __gnuplot_draw_axes__ (part of Bug # 44187).
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
20959
diff
changeset
|
2256 fnt = ""; |
7163 | 2257 else |
7372 | 2258 fnt = t.fontname; |
7168 | 2259 endif |
7189 | 2260 f = fnt; |
2261 it = false; | |
2262 bld = false; | |
7372 | 2263 if (! isempty (t.fontweight) && strcmpi (t.fontweight, "bold")) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2264 if (! isempty (t.fontangle) |
10549 | 2265 && (strcmpi (t.fontangle, "italic") |
2266 || strcmpi (t.fontangle, "oblique"))) | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2267 f = [f "-bolditalic"]; |
7189 | 2268 it = true; |
2269 bld = true; | |
7168 | 2270 else |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2271 f = [f "-bold"]; |
7189 | 2272 bld = true; |
7168 | 2273 endif |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2274 elseif (! isempty (t.fontangle) |
10549 | 2275 && (strcmpi (t.fontangle, "italic") |
2276 || strcmpi (t.fontangle, "oblique"))) | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2277 f = [f "-italic"]; |
7189 | 2278 it = true; |
7163 | 2279 endif |
2280 if (isempty (t.fontsize)) | |
2281 s = 10; | |
2282 else | |
2283 s = t.fontsize; | |
2284 endif | |
2285 endfunction | |
7189 | 2286 |
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
2287 function [str, f, s] = __maybe_munge_text__ (enhanced, obj, fld) |
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
2288 |
7189 | 2289 persistent warned_latex = false; |
2290 | |
2291 if (strcmp (fld, "string")) | |
2292 [f, s, fnt, it, bld] = get_fontname_and_size (obj); | |
2293 else | |
7372 | 2294 f = "Helvetica"; |
7189 | 2295 s = 10; |
2296 fnt = f; | |
2297 it = false; | |
2298 bld = false; | |
2299 endif | |
2300 | |
19424
e23aedcc70a7
Fix using '@' character in gnuplot text strings (bug #35363).
Rik <rik@octave.org>
parents:
19419
diff
changeset
|
2301 ## The text object may be multiline, and may be of any class |
7189 | 2302 str = getfield (obj, fld); |
14872
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
2303 if (ischar (str) && rows (str) > 1) |
12965
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2304 str = cellstr (str); |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2305 elseif (isnumeric (str)) |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2306 str = cellstr (num2str (str(:))); |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2307 endif |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2308 if (iscellstr (str)) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2309 for n = 1:numel (str) |
12965
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2310 if (isnumeric (str{n})) |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2311 str{n} = num2str (str{n}); |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2312 endif |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2313 endfor |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2314 str = sprintf ("%s\n", str{:})(1:end-1); |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2315 endif |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2316 |
7189 | 2317 if (enhanced) |
19424
e23aedcc70a7
Fix using '@' character in gnuplot text strings (bug #35363).
Rik <rik@octave.org>
parents:
19419
diff
changeset
|
2318 str = regexprep (str, '(?<!\\)@', '\@'); |
e23aedcc70a7
Fix using '@' character in gnuplot text strings (bug #35363).
Rik <rik@octave.org>
parents:
19419
diff
changeset
|
2319 endif |
e23aedcc70a7
Fix using '@' character in gnuplot text strings (bug #35363).
Rik <rik@octave.org>
parents:
19419
diff
changeset
|
2320 |
e23aedcc70a7
Fix using '@' character in gnuplot text strings (bug #35363).
Rik <rik@octave.org>
parents:
19419
diff
changeset
|
2321 if (enhanced) |
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2322 if (strcmpi (obj.interpreter, "tex")) |
12965
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2323 if (iscellstr (str)) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2324 for n = 1:numel (str) |
12965
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2325 str{n} = __tex2enhanced__ (str{n}, fnt, it, bld); |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2326 endfor |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2327 else |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2328 str = __tex2enhanced__ (str, fnt, it, bld); |
22bc9ec80c2c
allow multi-line string property for text objects using cell arrays or char matrices
Ben Abbott <bpabbott@mac.com>
parents:
12931
diff
changeset
|
2329 endif |
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2330 elseif (strcmpi (obj.interpreter, "latex")) |
7189 | 2331 if (! warned_latex) |
10549 | 2332 warning ("latex markup not supported for text objects"); |
2333 warned_latex = true; | |
7189 | 2334 endif |
2335 endif | |
2336 endif | |
2337 endfunction | |
2338 | |
2339 function str = __tex2enhanced__ (str, fnt, it, bld) | |
2340 persistent sym = __setup_sym_table__ (); | |
2341 persistent flds = fieldnames (sym); | |
2342 | |
16001
7275cfaddb5e
Fix texenhanced regression.
Ben Abbott <bpabbott@mac.com>
parents:
15617
diff
changeset
|
2343 [s, e, m] = regexp (str, "\\\\([a-zA-Z]+|0)", "start", "end", "matches"); |
7189 | 2344 |
2345 for i = length (s) : -1 : 1 | |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2346 ## special case for "\0" and replace with empty set "{/Symbol \306}' |
7189 | 2347 if (strncmp (m{i}, '\0', 2)) |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2348 str = [str(1:s(i) - 1) '{/Symbol \306}' str(s(i) + 2:end)]; |
7189 | 2349 else |
2350 f = m{i}(2:end); | |
2351 if (isfield (sym, f)) | |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2352 g = getfield (sym, f); |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2353 ## FIXME: The symbol font doesn't seem to support bold or italic |
10549 | 2354 ##if (bld) |
2355 ## if (it) | |
20191
64f817945783
Use strrep instead of regexprep where possible in m-files for performance.
Rik <rik@octave.org>
parents:
20057
diff
changeset
|
2356 ## g = strrep (g, '/Symbol', '/Symbol-bolditalic'); |
10549 | 2357 ## else |
20191
64f817945783
Use strrep instead of regexprep where possible in m-files for performance.
Rik <rik@octave.org>
parents:
20057
diff
changeset
|
2358 ## g = strrep (g, '/Symbol', '/Symbol-bold'); |
10549 | 2359 ## endif |
2360 ##elseif (it) | |
20191
64f817945783
Use strrep instead of regexprep where possible in m-files for performance.
Rik <rik@octave.org>
parents:
20057
diff
changeset
|
2361 ## g = strrep (g, '/Symbol', '/Symbol-italic'); |
10549 | 2362 ##endif |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2363 str = [str(1:s(i) - 1) g str(e(i) + 1:end)]; |
7189 | 2364 elseif (strncmp (f, "rm", 2)) |
10549 | 2365 bld = false; |
2366 it = false; | |
21524
aac8b2ca9280
Include curly braces when adding weight to strings for gnuplot (bug #46037).
bpabbott
parents:
21427
diff
changeset
|
2367 str = [str(1:s(i) - 1) '{/' fnt ' ' str(s(i) + 3:end) '}']; |
7189 | 2368 elseif (strncmp (f, "it", 2) || strncmp (f, "sl", 2)) |
10549 | 2369 it = true; |
2370 if (bld) | |
21524
aac8b2ca9280
Include curly braces when adding weight to strings for gnuplot (bug #46037).
bpabbott
parents:
21427
diff
changeset
|
2371 str = [str(1:s(i) - 1) '{/' fnt '-bolditalic ' str(s(i) + 3:end) '}']; |
7189 | 2372 else |
21524
aac8b2ca9280
Include curly braces when adding weight to strings for gnuplot (bug #46037).
bpabbott
parents:
21427
diff
changeset
|
2373 str = [str(1:s(i) - 1) '{/' fnt '-italic ' str(s(i) + 3:end) '}']; |
7189 | 2374 endif |
2375 elseif (strncmp (f, "bf", 2)) | |
10549 | 2376 bld = true; |
2377 if (it) | |
21524
aac8b2ca9280
Include curly braces when adding weight to strings for gnuplot (bug #46037).
bpabbott
parents:
21427
diff
changeset
|
2378 str = [str(1:s(i) - 1) '{/' fnt '-bolditalic ' str(s(i) + 3:end) '}']; |
7189 | 2379 else |
21524
aac8b2ca9280
Include curly braces when adding weight to strings for gnuplot (bug #46037).
bpabbott
parents:
21427
diff
changeset
|
2380 str = [str(1:s(i) - 1) '{/' fnt '-bold ' str(s(i) + 3:end) '}']; |
7189 | 2381 endif |
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2382 elseif (strcmpi (f, "color")) |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2383 ## FIXME: Ignore \color but remove trailing {} block as well |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2384 d = strfind (str(e(i) + 1:end),'}'); |
7189 | 2385 if (isempty (d)) |
10549 | 2386 warning ('syntax error in \color argument'); |
2387 else | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2388 str = [str(1:s(i) - 1) str(e(i) + d + 1:end)]; |
7189 | 2389 endif |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2390 elseif (strcmpi (f, "fontname")) |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2391 b1 = strfind (str(e(i) + 1:end),'{'); |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2392 b2 = strfind (str(e(i) + 1:end),'}'); |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2393 if (isempty (b1) || isempty (b2)) |
10549 | 2394 warning ('syntax error in \fontname argument'); |
2395 else | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2396 str = [str(1:s(i) - 1), '/', str(e(i)+b1(1) + 1:e(i)+b2(1)-1), ... |
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2397 '{}', str(e(i) + b2(1) + 1:end)]; |
7189 | 2398 endif |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2399 elseif (strcmpi (f, "fontsize")) |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2400 b1 = strfind (str(e(i) + 1:end),'{'); |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2401 b2 = strfind (str(e(i) + 1:end),'}'); |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2402 if (isempty (b1) || isempty (b2)) |
10549 | 2403 warning ('syntax error in \fontname argument'); |
2404 else | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2405 str = [str(1:s(i) - 1), '/=', str(e(i)+b1(1) + 1:e(i)+b2(1)-1), ... |
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2406 '{}', str(e(i) + b2(1) + 1:end)]; |
7189 | 2407 endif |
2408 else | |
10549 | 2409 ## Last desperate attempt to treat the symbol. Look for things |
2410 ## like \pix, that should be translated to the symbol Pi and x | |
2411 for j = 1 : length (flds) | |
2412 if (strncmp (flds{j}, f, length (flds{j}))) | |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2413 g = getfield (sym, flds{j}); |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2414 ## FIXME: The symbol font doesn't seem to support bold or italic |
10549 | 2415 ##if (bld) |
2416 ## if (it) | |
20191
64f817945783
Use strrep instead of regexprep where possible in m-files for performance.
Rik <rik@octave.org>
parents:
20057
diff
changeset
|
2417 ## g = strrep (g, '/Symbol', '/Symbol-bolditalic'); |
10549 | 2418 ## else |
20191
64f817945783
Use strrep instead of regexprep where possible in m-files for performance.
Rik <rik@octave.org>
parents:
20057
diff
changeset
|
2419 ## g = strrep (g, '/Symbol', '/Symbol-bold'); |
10549 | 2420 ## endif |
2421 ##elseif (it) | |
20191
64f817945783
Use strrep instead of regexprep where possible in m-files for performance.
Rik <rik@octave.org>
parents:
20057
diff
changeset
|
2422 ## g = strrep (g, '/Symbol', '/Symbol-italic'); |
10549 | 2423 ##endif |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2424 str = [str(1:s(i) - 1) g str(s(i) + length (flds{j}) + 1:end)]; |
10549 | 2425 break; |
2426 endif | |
2427 endfor | |
7189 | 2428 endif |
2429 endif | |
2430 endfor | |
2431 | |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2432 ## Prepend @ to things like _0^x or _{-100}^{100} for alignment. |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2433 ## But need to put the shorter of the two arguments first. |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2434 ## Careful of nested {} and unprinted characters when defining |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2435 ## shortest.. Don't have to worry about things like ^\theta as they |
8506 | 2436 ## are already converted to ^{/Symbol q}. |
7189 | 2437 |
18857
7bbe3658c5ef
maint: Use "FIXME:" coding convention in m-files.
Rik <rik@octave.org>
parents:
18829
diff
changeset
|
2438 ## FIXME: This is a mess... Is it worth it just for a "@" character? |
7189 | 2439 |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2440 [s, m] = regexp (str,'[_\^]','start','matches'); |
7189 | 2441 i = 1; |
2442 p = 0; | |
2443 while (i < length (s)) | |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2444 if (i < length (s)) |
7189 | 2445 if (str(s(i) + p + 1) == "{") |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2446 s1 = strfind (str(s(i) + p + 2:end),'{'); |
10549 | 2447 si = 1; |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2448 l1 = strfind (str(s(i) + p + 1:end),'}'); |
7189 | 2449 li = 1; |
10549 | 2450 while (li <= length (l1) && si <= length (s1)) |
7189 | 2451 if (l1(li) < s1(si)) |
10549 | 2452 if (li == si) |
2453 break; | |
2454 endif | |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2455 li += 1; |
10549 | 2456 else |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2457 si += 1; |
10549 | 2458 endif |
2459 endwhile | |
20231
83792dd9bcc1
Use in-place operators in m-files where possible.
Rik <rik@octave.org>
parents:
20191
diff
changeset
|
2460 l1 = l1(min (length (l1), si)); |
7189 | 2461 if (s(i) + l1 + 1 == s(i+1)) |
10549 | 2462 if (str(s(i + 1) + p + 1) == "{") |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2463 s2 = strfind (str(s(i + 1) + p + 2:end),'{'); |
10549 | 2464 si = 1; |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2465 l2 = strfind (str(s(i + 1) + p + 1:end),'}'); |
7189 | 2466 li = 1; |
10549 | 2467 while (li <= length (l2) && si <= length (s2)) |
7189 | 2468 if (l2(li) < s2(si)) |
10549 | 2469 if (li == si) |
2470 break; | |
2471 endif | |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2472 li += 1; |
10549 | 2473 else |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2474 si += 1; |
10549 | 2475 endif |
2476 endwhile | |
20231
83792dd9bcc1
Use in-place operators in m-files where possible.
Rik <rik@octave.org>
parents:
20191
diff
changeset
|
2477 l2 = l2(min (length (l2), si)); |
10549 | 2478 if (length_string (str(s(i)+p+2:s(i)+p+l1-1)) <= |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2479 length_string (str(s(i+1)+p+2:s(i+1)+p+l2-1))) |
10549 | 2480 ## Shortest already first! |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2481 str = [str(1:s(i)+p-1) "@" str(s(i)+p:end)]; |
10549 | 2482 else |
2483 ## Have to swap sub/super-script to get shortest first. | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2484 str = [str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+l2), ... |
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2485 str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+l2+1:end)]; |
10549 | 2486 endif |
2487 else | |
2488 ## Have to swap sub/super-script to get shortest first. | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2489 str = [str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+1), ... |
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2490 str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+2:end)]; |
10549 | 2491 endif |
7189 | 2492 i += 2; |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2493 p += 1; |
10549 | 2494 else |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2495 i += 1; |
10549 | 2496 endif |
7189 | 2497 else |
10549 | 2498 if (s(i+1) == s(i) + 2) |
2499 ## Shortest already first! | |
16994
333243133364
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents:
16933
diff
changeset
|
2500 str = [str(1:s(i)+p-1) "@" str(s(i)+p:end)]; |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2501 p += 1; |
7189 | 2502 i += 2; |
10549 | 2503 else |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2504 i += 1; |
10549 | 2505 endif |
7189 | 2506 endif |
2507 else | |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
20714
diff
changeset
|
2508 i += 1; |
7189 | 2509 endif |
2510 endwhile | |
2511 | |
2512 endfunction | |
2513 | |
2514 function l = length_string (s) | |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14840
diff
changeset
|
2515 l = length (s) - length (strfind (s,'{')) - length (strfind (s,'}')); |
12462
e4dbfe3019b1
Use PCRE regular expressions throughout Octave.
Rik <octave@nomad.inbox5.com>
parents:
12420
diff
changeset
|
2516 m = regexp (s, '/([\w-]+|[\w-]+=\d+)', 'matches'); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2517 if (! isempty (m)) |
20231
83792dd9bcc1
Use in-place operators in m-files where possible.
Rik <rik@octave.org>
parents:
20191
diff
changeset
|
2518 l -= sum (cellfun ("length", m)); |
7189 | 2519 endif |
2520 endfunction | |
2521 | |
2522 function sym = __setup_sym_table__ () | |
2523 ## Setup the translation table for TeX to gnuplot enhanced mode. | |
2524 sym.forall = '{/Symbol \042}'; | |
2525 sym.exists = '{/Symbol \044}'; | |
2526 sym.ni = '{/Symbol \047}'; | |
2527 sym.cong = '{/Symbol \100}'; | |
2528 sym.Delta = '{/Symbol D}'; | |
2529 sym.Phi = '{/Symbol F}'; | |
7608
49810341db91
Correct typos in __go_draw_axes__.m and update Manual
godfrey@qss.Stanford.EDU
parents:
7603
diff
changeset
|
2530 sym.Gamma = '{/Symbol G}'; |
7190 | 2531 sym.vartheta = '{/Symbol J}'; |
7189 | 2532 sym.Lambda = '{/Symbol L}'; |
2533 sym.Pi = '{/Symbol P}'; | |
2534 sym.Theta = '{/Symbol Q}'; | |
2535 sym.Sigma = '{/Symbol S}'; | |
2536 sym.varsigma = '{/Symbol V}'; | |
7420 | 2537 sym.Omega = '{/Symbol W}'; |
7189 | 2538 sym.Xi = '{/Symbol X}'; |
2539 sym.Psi = '{/Symbol Y}'; | |
2540 sym.perp = '{/Symbol \136}'; | |
2541 sym.alpha = '{/Symbol a}'; | |
2542 sym.beta = '{/Symbol b}'; | |
2543 sym.chi = '{/Symbol c}'; | |
2544 sym.delta = '{/Symbol d}'; | |
2545 sym.epsilon = '{/Symbol e}'; | |
2546 sym.phi = '{/Symbol f}'; | |
7608
49810341db91
Correct typos in __go_draw_axes__.m and update Manual
godfrey@qss.Stanford.EDU
parents:
7603
diff
changeset
|
2547 sym.gamma = '{/Symbol g}'; |
7189 | 2548 sym.eta = '{/Symbol h}'; |
2549 sym.iota = '{/Symbol i}'; | |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2550 sym.varphi = '{/Symbol j}'; # Not in OpenGL |
7189 | 2551 sym.kappa = '{/Symbol k}'; |
2552 sym.lambda = '{/Symbol l}'; | |
2553 sym.mu = '{/Symbol m}'; | |
2554 sym.nu = '{/Symbol n}'; | |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2555 sym.o = '{/Symbol o}'; |
7189 | 2556 sym.pi = '{/Symbol p}'; |
2557 sym.theta = '{/Symbol q}'; | |
2558 sym.rho = '{/Symbol r}'; | |
2559 sym.sigma = '{/Symbol s}'; | |
2560 sym.tau = '{/Symbol t}'; | |
2561 sym.upsilon = '{/Symbol u}'; | |
2562 sym.varpi = '{/Symbol v}'; | |
2563 sym.omega = '{/Symbol w}'; | |
2564 sym.xi = '{/Symbol x}'; | |
2565 sym.psi = '{/Symbol y}'; | |
2566 sym.zeta = '{/Symbol z}'; | |
2567 sym.sim = '{/Symbol \176}'; | |
2568 sym.Upsilon = '{/Symbol \241}'; | |
2569 sym.prime = '{/Symbol \242}'; | |
2570 sym.leq = '{/Symbol \243}'; | |
2571 sym.infty = '{/Symbol \245}'; | |
2572 sym.clubsuit = '{/Symbol \247}'; | |
2573 sym.diamondsuit = '{/Symbol \250}'; | |
2574 sym.heartsuit = '{/Symbol \251}'; | |
2575 sym.spadesuit = '{/Symbol \252}'; | |
2576 sym.leftrightarrow = '{/Symbol \253}'; | |
2577 sym.leftarrow = '{/Symbol \254}'; | |
2578 sym.uparrow = '{/Symbol \255}'; | |
2579 sym.rightarrow = '{/Symbol \256}'; | |
2580 sym.downarrow = '{/Symbol \257}'; | |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2581 sym.circ = '{/Symbol \260}'; # degree symbol, not circ as in FLTK |
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2582 sym.deg = '{/Symbol \260}'; |
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2583 sym.ast = '{/Symbol *}'; |
7189 | 2584 sym.pm = '{/Symbol \261}'; |
2585 sym.geq = '{/Symbol \263}'; | |
2586 sym.times = '{/Symbol \264}'; | |
2587 sym.propto = '{/Symbol \265}'; | |
2588 sym.partial = '{/Symbol \266}'; | |
2589 sym.bullet = '{/Symbol \267}'; | |
2590 sym.div = '{/Symbol \270}'; | |
2591 sym.neq = '{/Symbol \271}'; | |
2592 sym.equiv = '{/Symbol \272}'; | |
2593 sym.approx = '{/Symbol \273}'; | |
2594 sym.ldots = '{/Symbol \274}'; | |
2595 sym.mid = '{/Symbol \275}'; | |
2596 sym.aleph = '{/Symbol \300}'; | |
2597 sym.Im = '{/Symbol \301}'; | |
2598 sym.Re = '{/Symbol \302}'; | |
2599 sym.wp = '{/Symbol \303}'; | |
2600 sym.otimes = '{/Symbol \304}'; | |
2601 sym.oplus = '{/Symbol \305}'; | |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2602 ## empty set, not circled slash division operator as in FLTK. |
7189 | 2603 sym.oslash = '{/Symbol \306}'; |
2604 sym.cap = '{/Symbol \307}'; | |
2605 sym.cup = '{/Symbol \310}'; | |
2606 sym.supset = '{/Symbol \311}'; | |
2607 sym.supseteq = '{/Symbol \312}'; | |
2608 sym.subset = '{/Symbol \314}'; | |
2609 sym.subseteq = '{/Symbol \315}'; | |
2610 sym.in = '{/Symbol \316}'; | |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2611 sym.notin = '{/Symbol \317}'; # Not in OpenGL |
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2612 sym.angle = '{/Symbol \320}'; |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2613 sym.bigtriangledown = '{/Symbol \321}'; # Not in OpenGL |
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2614 sym.langle = '{/Symbol \341}'; |
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2615 sym.rangle = '{/Symbol \361}'; |
7189 | 2616 sym.nabla = '{/Symbol \321}'; |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2617 sym.prod = '{/Symbol \325}'; # Not in OpenGL |
7189 | 2618 sym.surd = '{/Symbol \326}'; |
2619 sym.cdot = '{/Symbol \327}'; | |
2620 sym.neg = '{/Symbol \330}'; | |
2621 sym.wedge = '{/Symbol \331}'; | |
2622 sym.vee = '{/Symbol \332}'; | |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2623 sym.Leftrightarrow = '{/Symbol \333}'; # Not in OpenGL |
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2624 sym.Leftarrow = '{/Symbol \334}'; |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2625 sym.Uparrow = '{/Symbol \335}'; # Not in OpenGL |
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2626 sym.Rightarrow = '{/Symbol \336}'; |
19448
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2627 sym.Downarrow = '{/Symbol \337}'; # Not in OpenGL |
29b6d072b5e9
Add \ast, \deg symbols to gnuplot TeX interpreter.
Rik <rik@octave.org>
parents:
19438
diff
changeset
|
2628 sym.diamond = '{/Symbol \340}'; # Not in OpenGL |
7189 | 2629 sym.copyright = '{/Symbol \343}'; |
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2630 sym.lfloor = '{/Symbol \353}'; |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2631 sym.lceil = '{/Symbol \351}'; |
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2632 sym.rfloor = '{/Symbol \373}'; |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19725
diff
changeset
|
2633 sym.rceil = '{/Symbol \371}'; |
7189 | 2634 sym.int = '{/Symbol \362}'; |
2635 endfunction | |
2636 | |
7390 | 2637 function retval = __do_enhanced_option__ (enhanced, obj) |
2638 retval = ""; | |
2639 if (enhanced) | |
2640 if (strcmpi (obj.interpreter, "none")) | |
2641 retval = "noenhanced"; | |
2642 else | |
2643 retval = "enhanced"; | |
2644 endif | |
2645 endif | |
2646 endfunction | |
17338
1c89599167a6
maint: End m-files with 1 blank line.
Rik <rik@octave.org>
parents:
17306
diff
changeset
|
2647 |
19000
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2648 function maybe_do_xtick_mirror (plot_stream, axis_obj) |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2649 if (! isempty(axis_obj.xtick)) |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2650 fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2651 axis_obj.tickdir); |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2652 endif |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2653 endfunction |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2654 |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2655 function maybe_do_x2tick_mirror (plot_stream, axis_obj) |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2656 if (! isempty(axis_obj.xtick)) |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2657 fprintf (plot_stream, "unset xtics; set x2tics %s nomirror\n", |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2658 axis_obj.tickdir); |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2659 endif |
1ad621d894ba
Fix set(gca, 'xtick', []) with gnuplot backend (bug #42936).
Serviscope Minor <serviscope_minor@verybigfrog.com>
parents:
18999
diff
changeset
|
2660 endfunction |