Mercurial > octave-nkf
annotate scripts/plot/__go_draw_axes__.m @ 10121:b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Sat, 16 Jan 2010 07:59:52 +0100 |
| parents | b52cba8be2eb |
| children | 4516a0c97ced |
| rev | line source |
|---|---|
| 8920 | 1 ## Copyright (C) 2005, 2007, 2008, 2009 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 -*- |
|
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8740
diff
changeset
|
20 ## @deftypefn {Function File} {} __go_draw_axes__ (@var{h}, @var{plot_stream}, @var{enhanced}, @var{mono}) |
| 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 | |
|
8889
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
26 function __go_draw_axes__ (h, plot_stream, enhanced, mono, implicit_margin) |
| 6405 | 27 |
|
8889
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
28 if (nargin >= 4 && nargin <= 5) |
| 6405 | 29 |
|
8894
4414e555505d
__go_draw_axes__.m: Do not render axis labels twice when their handles are visible.
Ben Abbott <bpabbott@mac.com>
parents:
8889
diff
changeset
|
30 showhiddenhandles = get (0, "showhiddenhandles"); |
|
4414e555505d
__go_draw_axes__.m: Do not render axis labels twice when their handles are visible.
Ben Abbott <bpabbott@mac.com>
parents:
8889
diff
changeset
|
31 unwind_protect |
|
4414e555505d
__go_draw_axes__.m: Do not render axis labels twice when their handles are visible.
Ben Abbott <bpabbott@mac.com>
parents:
8889
diff
changeset
|
32 set (0, "showhiddenhandles", "on"); |
|
4414e555505d
__go_draw_axes__.m: Do not render axis labels twice when their handles are visible.
Ben Abbott <bpabbott@mac.com>
parents:
8889
diff
changeset
|
33 axis_obj = __get__ (h); |
|
4414e555505d
__go_draw_axes__.m: Do not render axis labels twice when their handles are visible.
Ben Abbott <bpabbott@mac.com>
parents:
8889
diff
changeset
|
34 unwind_protect_cleanup |
|
4414e555505d
__go_draw_axes__.m: Do not render axis labels twice when their handles are visible.
Ben Abbott <bpabbott@mac.com>
parents:
8889
diff
changeset
|
35 set (0, "showhiddenhandles", showhiddenhandles); |
|
4414e555505d
__go_draw_axes__.m: Do not render axis labels twice when their handles are visible.
Ben Abbott <bpabbott@mac.com>
parents:
8889
diff
changeset
|
36 end_unwind_protect |
| 6405 | 37 |
| 38 parent_figure_obj = get (axis_obj.parent); | |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
39 gnuplot_term = __gnuplot_get_var__ (axis_obj.parent, "GPVAL_TERM"); |
| 6405 | 40 |
| 8208 | 41 ## Set to false for plotyy axes. |
| 42 if (strcmp (axis_obj.tag, "plotyy")) | |
| 8102 | 43 ymirror = false; |
| 8208 | 44 else |
| 45 ymirror = true; | |
| 7189 | 46 endif |
| 47 | |
|
8889
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
48 nd = __calc_dimensions__ (axis_obj); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
49 pos = axis_obj.position; |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
50 pos = pos - implicit_margin([1, 2, 1, 2]).*[1, 1, -0.5, -0.5]; |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
51 if (__gnuplot_has_feature__ ("screen_coordinates_for_{lrtb}margin")) |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
52 if (strcmpi (axis_obj.dataaspectratiomode, "manual")) |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
53 pos = __actual_axis_position__ (axis_obj); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
54 endif |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
55 if (nd == 2) |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
56 x = [1, 1]; |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
57 else |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
58 ## 3D plots need to be sized down to fit in the window. |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
59 x = 1.0 ./ sqrt([2, 2.5]); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
60 endif |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
61 fprintf (plot_stream, "set tmargin screen %.15g;\n", pos(2)+pos(4)/2+x(2)*pos(4)/2); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
62 fprintf (plot_stream, "set bmargin screen %.15g;\n", pos(2)+pos(4)/2-x(2)*pos(4)/2); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
63 fprintf (plot_stream, "set lmargin screen %.15g;\n", pos(1)+pos(3)/2-x(1)*pos(3)/2); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
64 fprintf (plot_stream, "set rmargin screen %.15g;\n", pos(1)+pos(3)/2+x(1)*pos(3)/2); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
65 else |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
66 ## FIXME -- nothing should change for gnuplot 4.2.x. |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
67 fprintf (plot_stream, "set tmargin 0;\n"); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
68 fprintf (plot_stream, "set bmargin 0;\n"); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
69 fprintf (plot_stream, "set lmargin 0;\n"); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
70 fprintf (plot_stream, "set rmargin 0;\n"); |
| 7189 | 71 |
|
8889
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
72 fprintf (plot_stream, "set origin %.15g, %.15g;\n", pos(1), pos(2)); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
73 fprintf (plot_stream, "set size %.15g, %.15g;\n", pos(3), pos(4)); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
74 |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
75 if (strcmpi (axis_obj.dataaspectratiomode, "manual")) |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
76 r = axis_obj.dataaspectratio; |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
77 fprintf (plot_stream, "set size ratio %.15g;\n", -r(2)/r(1)); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
78 else |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
79 fputs (plot_stream, "set size noratio;\n"); |
|
665b264b6a50
Compatible support of figure paper properties and resolution for the gnuplot backend.
Ben Abbott <bpabbott@mac.com>
parents:
8812
diff
changeset
|
80 endif |
| 6405 | 81 endif |
| 82 | |
|
8953
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
83 ## Reset all labels, axis-labels, tick-labels, and title |
|
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
84 ## FIXME - We should have an function to initialize the axis. |
|
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
85 ## Presently, this is dispersed in this function. |
| 6778 | 86 fputs (plot_stream, "unset label;\n"); |
|
8953
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
87 fputs (plot_stream, "unset xtics;\n"); |
|
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
88 fputs (plot_stream, "unset ytics;\n"); |
|
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
89 fputs (plot_stream, "unset ztics;\n"); |
|
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
90 fputs (plot_stream, "unset x2tics;\n"); |
|
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
91 fputs (plot_stream, "unset x2tics;\n"); |
| 6778 | 92 |
|
10121
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
93 # Reset next marker calculation |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
94 markerorder = axis_obj.markerorder; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
95 next_marker (0); |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
96 |
| 6405 | 97 if (! isempty (axis_obj.title)) |
| 98 t = get (axis_obj.title); | |
| 99 if (isempty (t.string)) | |
| 100 fputs (plot_stream, "unset title;\n"); | |
| 101 else | |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
102 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
103 fontspec = create_fontspec (f, s, gnuplot_term); |
|
9050
e15f4197d907
__go_draw_axes__.m: Properly position the title for 3D plots when using the gnuplot (v4.3+) backend.
Ben Abbott <bpabbott@mac.com>
parents:
8953
diff
changeset
|
104 fprintf (plot_stream, "set title \"%s\" %s %s", |
| 7390 | 105 undo_string_escapes (tt), fontspec, |
| 106 __do_enhanced_option__ (enhanced, t)); | |
|
9082
2d85197dbae4
__go_draw_axes__.m: Fix title placement for gnuplot 4.2.x.
Ben Abbott <bpabbott@mac.com>
parents:
9063
diff
changeset
|
107 if (nd == 3 && __gnuplot_has_feature__ ("screen_coordinates_for_{lrtb}margin")) |
|
9050
e15f4197d907
__go_draw_axes__.m: Properly position the title for 3D plots when using the gnuplot (v4.3+) backend.
Ben Abbott <bpabbott@mac.com>
parents:
8953
diff
changeset
|
108 fprintf (plot_stream, " offset screen 0, screen %.3f;\n", pos(4)/5); |
|
e15f4197d907
__go_draw_axes__.m: Properly position the title for 3D plots when using the gnuplot (v4.3+) backend.
Ben Abbott <bpabbott@mac.com>
parents:
8953
diff
changeset
|
109 else |
|
e15f4197d907
__go_draw_axes__.m: Properly position the title for 3D plots when using the gnuplot (v4.3+) backend.
Ben Abbott <bpabbott@mac.com>
parents:
8953
diff
changeset
|
110 fprintf (plot_stream, ";\n"); |
|
e15f4197d907
__go_draw_axes__.m: Properly position the title for 3D plots when using the gnuplot (v4.3+) backend.
Ben Abbott <bpabbott@mac.com>
parents:
8953
diff
changeset
|
111 endif |
| 6405 | 112 endif |
| 113 endif | |
| 114 | |
| 115 if (! isempty (axis_obj.xlabel)) | |
| 116 t = get (axis_obj.xlabel); | |
| 6737 | 117 angle = t.rotation; |
| 7269 | 118 colorspec = get_text_colorspec (axis_obj.xcolor, mono); |
| 6405 | 119 if (isempty (t.string)) |
| 7194 | 120 fprintf (plot_stream, "unset xlabel;\n"); |
| 121 fprintf (plot_stream, "unset x2label;\n"); | |
| 6405 | 122 else |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
123 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
124 fontspec = create_fontspec (f, s, gnuplot_term); |
| 7194 | 125 if (strcmpi (axis_obj.xaxislocation, "top")) |
| 7390 | 126 fprintf (plot_stream, "set x2label \"%s\" %s %s %s", |
| 127 undo_string_escapes (tt), colorspec, fontspec, | |
| 128 __do_enhanced_option__ (enhanced, t)); | |
| 7194 | 129 else |
| 7390 | 130 fprintf (plot_stream, "set xlabel \"%s\" %s %s %s", |
| 131 undo_string_escapes (tt), colorspec, fontspec, | |
| 132 __do_enhanced_option__ (enhanced, t)); | |
| 7194 | 133 endif |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
134 fprintf (plot_stream, " rotate by %f;\n", angle); |
| 7194 | 135 if (strcmpi (axis_obj.xaxislocation, "top")) |
| 136 fprintf (plot_stream, "unset xlabel;\n"); | |
| 137 else | |
| 138 fprintf (plot_stream, "unset x2label;\n"); | |
| 139 endif | |
| 6405 | 140 endif |
| 141 endif | |
| 142 | |
| 143 if (! isempty (axis_obj.ylabel)) | |
| 144 t = get (axis_obj.ylabel); | |
| 6737 | 145 angle = t.rotation; |
| 7269 | 146 colorspec = get_text_colorspec (axis_obj.ycolor, mono); |
| 6405 | 147 if (isempty (t.string)) |
| 7194 | 148 fprintf (plot_stream, "unset ylabel;\n"); |
| 149 fprintf (plot_stream, "unset y2label;\n"); | |
| 6405 | 150 else |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
151 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
152 fontspec = create_fontspec (f, s, gnuplot_term); |
| 7194 | 153 if (strcmpi (axis_obj.yaxislocation, "right")) |
| 7390 | 154 fprintf (plot_stream, "set y2label \"%s\" %s %s %s", |
| 155 undo_string_escapes (tt), colorspec, fontspec, | |
| 156 __do_enhanced_option__ (enhanced, t)); | |
| 7194 | 157 else |
| 7390 | 158 fprintf (plot_stream, "set ylabel \"%s\" %s %s %s", |
| 159 undo_string_escapes (tt), colorspec, fontspec, | |
| 160 __do_enhanced_option__ (enhanced, t)); | |
| 7194 | 161 endif |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
162 fprintf (plot_stream, " rotate by %f;\n", angle); |
| 7194 | 163 if (strcmpi (axis_obj.yaxislocation, "right")) |
| 164 fprintf (plot_stream, "unset ylabel;\n"); | |
| 165 else | |
| 166 fprintf (plot_stream, "unset y2label;\n"); | |
| 167 endif | |
| 6405 | 168 endif |
| 169 endif | |
| 170 | |
| 171 if (! isempty (axis_obj.zlabel)) | |
| 172 t = get (axis_obj.zlabel); | |
| 6737 | 173 angle = t.rotation; |
| 7269 | 174 colorspec = get_text_colorspec (axis_obj.zcolor, mono); |
| 6405 | 175 if (isempty (t.string)) |
| 176 fputs (plot_stream, "unset zlabel;\n"); | |
| 177 else | |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
178 [tt, f, s] = __maybe_munge_text__ (enhanced, t, "string"); |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
179 fontspec = create_fontspec (f, s, gnuplot_term); |
| 7390 | 180 fprintf (plot_stream, "set zlabel \"%s\" %s %s %s", |
| 181 undo_string_escapes (tt), colorspec, fontspec, | |
| 182 __do_enhanced_option__ (enhanced, t)); | |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
183 fprintf (plot_stream, " rotate by %f;\n", angle); |
| 6405 | 184 endif |
| 185 endif | |
| 186 | |
| 6809 | 187 if (strcmpi (axis_obj.xaxislocation, "top")) |
| 188 xaxisloc = "x2"; | |
| 189 xaxisloc_using = "x2"; | |
| 190 else | |
| 191 xaxisloc = "x"; | |
| 192 xaxisloc_using = "x1"; | |
| 7321 | 193 if (strcmpi (axis_obj.xaxislocation, "zero")) |
| 194 fputs (plot_stream, "set xzeroaxis;\n"); | |
| 195 endif | |
| 6809 | 196 endif |
| 197 if (strcmpi (axis_obj.yaxislocation, "right")) | |
| 198 yaxisloc = "y2"; | |
| 199 yaxisloc_using = "y2"; | |
| 200 else | |
| 201 yaxisloc = "y"; | |
| 202 yaxisloc_using = "y1"; | |
| 7321 | 203 if (strcmpi (axis_obj.yaxislocation, "zero")) |
| 204 fputs (plot_stream, "set yzeroaxis;\n"); | |
| 205 endif | |
| 6809 | 206 endif |
| 207 | |
| 7274 | 208 have_grid = false; |
| 209 | |
| 6758 | 210 if (strcmpi (axis_obj.xgrid, "on")) |
| 7274 | 211 have_grid = true; |
| 6809 | 212 fprintf (plot_stream, "set grid %stics;\n", xaxisloc); |
| 6405 | 213 else |
| 6809 | 214 fprintf (plot_stream, "set grid no%stics;\n", xaxisloc); |
| 6405 | 215 endif |
| 216 | |
| 6758 | 217 if (strcmpi (axis_obj.ygrid, "on")) |
| 7274 | 218 have_grid = true; |
| 6809 | 219 fprintf (plot_stream, "set grid %stics;\n", yaxisloc); |
| 6405 | 220 else |
| 6809 | 221 fprintf (plot_stream, "set grid no%stics;\n", yaxisloc); |
| 6405 | 222 endif |
| 223 | |
| 6758 | 224 if (strcmpi (axis_obj.zgrid, "on")) |
| 7274 | 225 have_grid = true; |
| 6405 | 226 fputs (plot_stream, "set grid ztics;\n"); |
| 227 else | |
| 7085 | 228 fputs (plot_stream, "set grid noztics;\n"); |
| 6405 | 229 endif |
| 230 | |
| 6758 | 231 if (strcmpi (axis_obj.xminorgrid, "on")) |
| 7274 | 232 have_grid = true; |
|
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
|
233 if (strcmp (axis_obj.xscale, "log")) |
|
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
|
234 m = 10; |
|
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
|
235 else |
|
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
|
236 m = 5; |
|
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
|
237 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
|
238 fprintf (plot_stream, "set m%stics %d;\n", xaxisloc, m); |
| 6809 | 239 fprintf (plot_stream, "set grid m%stics;\n", xaxisloc); |
| 6405 | 240 else |
| 6809 | 241 fprintf (plot_stream, "set grid nom%stics;\n", xaxisloc); |
| 6405 | 242 endif |
| 243 | |
| 6758 | 244 if (strcmpi (axis_obj.yminorgrid, "on")) |
| 7274 | 245 have_grid = true; |
|
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
|
246 if (strcmp (axis_obj.yscale, "log")) |
|
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
|
247 m = 10; |
|
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
|
248 else |
|
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
|
249 m = 5; |
|
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
|
250 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
|
251 fprintf (plot_stream, "set m%stics %d;\n", yaxisloc, m); |
| 6809 | 252 fprintf (plot_stream, "set grid m%stics;\n", yaxisloc); |
| 6405 | 253 else |
| 6809 | 254 fprintf (plot_stream, "set grid nom%stics;\n", yaxisloc); |
| 6405 | 255 endif |
| 256 | |
| 6758 | 257 if (strcmpi (axis_obj.zminorgrid, "on")) |
| 7274 | 258 have_grid = true; |
|
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
|
259 if (strcmp (axis_obj.zscale, "log")) |
|
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
|
260 m = 10; |
|
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
|
261 else |
|
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
|
262 m = 5; |
|
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
|
263 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
|
264 fprintf (plot_stream, "set mztics %d;\n", m); |
| 6405 | 265 fputs (plot_stream, "set grid mztics;\n"); |
| 266 else | |
| 267 fputs (plot_stream, "set grid nomztics;\n"); | |
| 268 endif | |
| 269 | |
| 7307 | 270 ## The grid front/back/layerdefault option also controls the |
| 271 ## appearance of tics, so it is used even if the grid is absent. | |
| 272 if (strcmpi (axis_obj.layer, "top")) | |
| 273 fputs (plot_stream, "set grid front;\n"); | |
|
9438
bac81ac76a57
__go_draw_axes__.m: also use layer property for plot border
John W. Eaton <jwe@octave.org>
parents:
9374
diff
changeset
|
274 fputs (plot_stream, "set border front;\n"); |
| 7307 | 275 else |
| 276 fputs (plot_stream, "set grid layerdefault;\n"); | |
|
9438
bac81ac76a57
__go_draw_axes__.m: also use layer property for plot border
John W. Eaton <jwe@octave.org>
parents:
9374
diff
changeset
|
277 ## FIXME -- the gnuplot help says that "layerdefault" should work |
|
bac81ac76a57
__go_draw_axes__.m: also use layer property for plot border
John W. Eaton <jwe@octave.org>
parents:
9374
diff
changeset
|
278 ## for set border too, but it fails for me with gnuplot 4.2.5. So |
|
bac81ac76a57
__go_draw_axes__.m: also use layer property for plot border
John W. Eaton <jwe@octave.org>
parents:
9374
diff
changeset
|
279 ## use "back" instead. |
|
bac81ac76a57
__go_draw_axes__.m: also use layer property for plot border
John W. Eaton <jwe@octave.org>
parents:
9374
diff
changeset
|
280 fputs (plot_stream, "set border back;\n"); |
| 7307 | 281 endif |
| 7297 | 282 if (! have_grid) |
| 283 fputs (plot_stream, "unset grid;\n"); | |
| 7274 | 284 endif |
| 285 | |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
286 do_tics (axis_obj, plot_stream, ymirror, mono, gnuplot_term); |
| 6405 | 287 |
| 6758 | 288 xlogscale = strcmpi (axis_obj.xscale, "log"); |
| 6405 | 289 if (xlogscale) |
| 6809 | 290 fprintf (plot_stream, "set logscale %s;\n", xaxisloc); |
| 6405 | 291 else |
| 6809 | 292 fprintf (plot_stream, "unset logscale %s;\n", xaxisloc); |
| 6405 | 293 endif |
| 294 | |
| 6758 | 295 ylogscale = strcmpi (axis_obj.yscale, "log"); |
| 6405 | 296 if (ylogscale) |
| 6809 | 297 fprintf (plot_stream, "set logscale %s;\n", yaxisloc); |
| 6405 | 298 else |
| 6809 | 299 fprintf (plot_stream, "unset logscale %s;\n", yaxisloc); |
| 6405 | 300 endif |
| 301 | |
| 6758 | 302 zlogscale = strcmpi (axis_obj.zscale, "log"); |
| 6405 | 303 if (zlogscale) |
| 304 fputs (plot_stream, "set logscale z;\n"); | |
| 305 else | |
| 306 fputs (plot_stream, "unset logscale z;\n"); | |
| 307 endif | |
| 308 | |
| 6758 | 309 xautoscale = strcmpi (axis_obj.xlimmode, "auto"); |
| 310 yautoscale = strcmpi (axis_obj.ylimmode, "auto"); | |
| 311 zautoscale = strcmpi (axis_obj.zlimmode, "auto"); | |
| 7109 | 312 cautoscale = strcmpi (axis_obj.climmode, "auto"); |
|
7471
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
313 cdatadirect = false; |
|
7930
1f6eb3de1c4e
__img__.m, imshow.m, __go_draw_axes__.m: improve handling of truecolor images
John W. Eaton <jwe@octave.org>
parents:
7873
diff
changeset
|
314 truecolor = false; |
| 6405 | 315 |
|
8360
32d9c0299e99
Set gnuplot two point clipping
David Bateman <dbateman@free.fr>
parents:
8354
diff
changeset
|
316 fputs (plot_stream, "set clip two;\n"); |
|
32d9c0299e99
Set gnuplot two point clipping
David Bateman <dbateman@free.fr>
parents:
8354
diff
changeset
|
317 |
| 6405 | 318 kids = axis_obj.children; |
|
8915
485eabc0cfec
__go_draw_axes__.m: Preserve the order of axes' children when pruning the handles for the {x,y,z}labels and title.
Ben Abbott <bpabbott@mac.com>
parents:
8909
diff
changeset
|
319 ## Remove the axis labels and title from the children, and |
|
485eabc0cfec
__go_draw_axes__.m: Preserve the order of axes' children when pruning the handles for the {x,y,z}labels and title.
Ben Abbott <bpabbott@mac.com>
parents:
8909
diff
changeset
|
320 ## preserved the original order. |
|
485eabc0cfec
__go_draw_axes__.m: Preserve the order of axes' children when pruning the handles for the {x,y,z}labels and title.
Ben Abbott <bpabbott@mac.com>
parents:
8909
diff
changeset
|
321 [jnk, k] = setdiff (kids, [axis_obj.xlabel; axis_obj.ylabel; ... |
|
485eabc0cfec
__go_draw_axes__.m: Preserve the order of axes' children when pruning the handles for the {x,y,z}labels and title.
Ben Abbott <bpabbott@mac.com>
parents:
8909
diff
changeset
|
322 axis_obj.zlabel; axis_obj.title]); |
|
485eabc0cfec
__go_draw_axes__.m: Preserve the order of axes' children when pruning the handles for the {x,y,z}labels and title.
Ben Abbott <bpabbott@mac.com>
parents:
8909
diff
changeset
|
323 kids = kids (sort (k)); |
| 6405 | 324 |
| 7316 | 325 if (nd == 3) |
| 326 fputs (plot_stream, "set parametric;\n"); | |
| 327 fputs (plot_stream, "set style data lines;\n"); | |
| 328 fputs (plot_stream, "set surface;\n"); | |
| 329 fputs (plot_stream, "unset contour;\n"); | |
| 330 endif | |
| 331 | |
| 6405 | 332 data_idx = 0; |
| 333 data = cell (); | |
| 6464 | 334 is_image_data = []; |
| 7175 | 335 hidden_removal = NaN; |
| 7271 | 336 view_map = false; |
| 6405 | 337 |
| 7223 | 338 xlim = axis_obj.xlim; |
| 339 ylim = axis_obj.ylim; | |
| 340 zlim = axis_obj.zlim; | |
| 341 clim = axis_obj.clim; | |
| 6405 | 342 |
| 7222 | 343 if (! cautoscale && clim(1) == clim(2)) |
| 344 clim(2)++; | |
| 7189 | 345 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
|
346 addedcmap = []; |
| 7189 | 347 |
| 6405 | 348 [view_cmd, view_fcn, view_zoom] = image_viewer (); |
| 349 use_gnuplot_for_images = (ischar (view_fcn) | |
|
7583
1d7c23e288d7
__go_draw_axes__: use strcmpi for text properties; use get for hidden properties
John W. Eaton <jwe@octave.org>
parents:
7582
diff
changeset
|
350 && strcmpi (view_fcn, "gnuplot_internal")); |
| 6405 | 351 |
| 352 ximg_data = {}; | |
| 353 ximg_data_idx = 0; | |
| 354 | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
355 while (! isempty (kids)) |
| 6405 | 356 |
|
8344
b5f10b123440
__go_draw_axes__.m: Correct order for rendering children.
Ben Abbott <bpabbott@mac.com>
parents:
8322
diff
changeset
|
357 obj = get (kids(end)); |
|
b5f10b123440
__go_draw_axes__.m: Correct order for rendering children.
Ben Abbott <bpabbott@mac.com>
parents:
8322
diff
changeset
|
358 kids = kids(1:(end-1)); |
| 6405 | 359 |
|
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
360 if (strcmpi (obj.visible, "off")) |
|
8052
961d4c52ffae
Convert stem and stem3 to use stem series objects
David Bateman <dbateman@free.fr>
parents:
8048
diff
changeset
|
361 continue; |
|
961d4c52ffae
Convert stem and stem3 to use stem series objects
David Bateman <dbateman@free.fr>
parents:
8048
diff
changeset
|
362 endif |
|
961d4c52ffae
Convert stem and stem3 to use stem series objects
David Bateman <dbateman@free.fr>
parents:
8048
diff
changeset
|
363 |
|
8171
15ffb9836c01
__go_draw_axes__.m: Remove depdenence on gnuplot version.
Ben Abbott <bpabbott@mac.com>
parents:
8166
diff
changeset
|
364 ## Check for facecolor interpolation for surfaces. |
|
15ffb9836c01
__go_draw_axes__.m: Remove depdenence on gnuplot version.
Ben Abbott <bpabbott@mac.com>
parents:
8166
diff
changeset
|
365 doing_interp_color = ... |
|
15ffb9836c01
__go_draw_axes__.m: Remove depdenence on gnuplot version.
Ben Abbott <bpabbott@mac.com>
parents:
8166
diff
changeset
|
366 isfield (obj, "facecolor") && strncmp (obj.facecolor, "interp", 6); |
|
8166
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
367 |
| 6405 | 368 switch (obj.type) |
| 369 case "image" | |
| 370 img_data = obj.cdata; | |
| 371 img_xdata = obj.xdata; | |
| 372 img_ydata = obj.ydata; | |
| 373 | |
| 374 if (use_gnuplot_for_images) | |
| 375 | |
|
7930
1f6eb3de1c4e
__img__.m, imshow.m, __go_draw_axes__.m: improve handling of truecolor images
John W. Eaton <jwe@octave.org>
parents:
7873
diff
changeset
|
376 if (ndims (img_data) == 3) |
|
1f6eb3de1c4e
__img__.m, imshow.m, __go_draw_axes__.m: improve handling of truecolor images
John W. Eaton <jwe@octave.org>
parents:
7873
diff
changeset
|
377 truecolor = true; |
|
1f6eb3de1c4e
__img__.m, imshow.m, __go_draw_axes__.m: improve handling of truecolor images
John W. Eaton <jwe@octave.org>
parents:
7873
diff
changeset
|
378 elseif (strcmpi (obj.cdatamapping, "direct")) |
|
7471
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
379 cdatadirect = true; |
|
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
380 endif |
| 6405 | 381 data_idx++; |
| 6464 | 382 is_image_data(data_idx) = true; |
| 6861 | 383 parametric(data_idx) = false; |
| 7119 | 384 have_cdata(data_idx) = false; |
|
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
|
385 have_3d_patch(data_idx) = false; |
| 6405 | 386 |
| 387 [y_dim, x_dim] = size (img_data(:,:,1)); | |
| 388 if (x_dim > 1) | |
| 389 dx = abs (img_xdata(2)-img_xdata(1))/(x_dim-1); | |
| 390 else | |
| 8208 | 391 x_dim = 2; |
| 392 img_data = [img_data, img_data]; | |
| 393 dx = abs (img_xdata(2)-img_xdata(1)); | |
| 6405 | 394 endif |
| 395 if (y_dim > 1) | |
| 396 dy = abs (img_ydata(2)-img_ydata(1))/(y_dim-1); | |
| 397 else | |
| 8208 | 398 y_dim = 2; |
| 399 img_data = [img_data; img_data]; | |
| 400 dy = abs (img_ydata(2)-img_ydata(1)); | |
| 6405 | 401 endif |
| 402 x_origin = min (img_xdata); | |
| 403 y_origin = min (img_ydata); | |
| 404 | |
| 405 if (ndims (img_data) == 3) | |
| 6464 | 406 data{data_idx} = permute (img_data, [3, 1, 2])(:); |
| 6405 | 407 format = "1:2:3"; |
| 408 imagetype = "rgbimage"; | |
| 409 else | |
| 6464 | 410 data{data_idx} = img_data(:); |
| 6405 | 411 format = "1"; |
| 412 imagetype = "image"; | |
| 413 endif | |
| 414 | |
| 6579 | 415 titlespec{data_idx} = "title \"\""; |
| 6914 | 416 usingclause{data_idx} = sprintf ("binary array=%dx%d scan=yx origin=(%.15g,%.15g) dx=%.15g dy=%.15g using %s", |
| 6405 | 417 x_dim, y_dim, x_origin, y_origin, dx, dy, format); |
|
9083
3c7a36f80972
__go_draw_axes__.m: Include gnuplot command termination when plotting image.
Ben Abbott <bpabbott@mac.com>
parents:
9082
diff
changeset
|
418 withclause{data_idx} = sprintf ("with %s;", imagetype); |
| 6405 | 419 |
| 420 else | |
| 421 ximg_data{++ximg_data_idx} = img_data; | |
| 422 endif | |
| 423 | |
| 424 case "line" | |
| 7120 | 425 if (strncmp (obj.linestyle, "none", 4) |
| 426 && (! isfield (obj, "marker") | |
| 427 || (isfield (obj, "marker") | |
| 428 && strncmp (obj.marker, "none", 4)))) | |
| 429 continue; | |
| 430 endif | |
| 6405 | 431 data_idx++; |
| 6464 | 432 is_image_data(data_idx) = false; |
| 6861 | 433 parametric(data_idx) = true; |
| 7119 | 434 have_cdata(data_idx) = false; |
|
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
|
435 have_3d_patch(data_idx) = false; |
|
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
|
436 |
| 6405 | 437 if (isempty (obj.keylabel)) |
| 438 titlespec{data_idx} = "title \"\""; | |
| 439 else | |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
440 tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
441 titlespec{data_idx} = cstrcat ("title \"", tmp, "\""); |
| 6405 | 442 endif |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
443 usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); |
|
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
444 errbars = ""; |
| 7316 | 445 if (nd == 3) |
| 6405 | 446 xdat = obj.xdata(:); |
| 447 ydat = obj.ydata(:); | |
| 7316 | 448 if (! isempty (obj.zdata)) |
| 449 zdat = obj.zdata(:); | |
| 450 else | |
| 451 zdat = zeros (size (xdat)); | |
| 452 endif | |
| 6405 | 453 data{data_idx} = [xdat, ydat, zdat]'; |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
454 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", numel (xdat)); |
| 7316 | 455 ## fputs (plot_stream, "set parametric;\n"); |
| 6405 | 456 else |
| 457 xdat = obj.xdata(:); | |
| 458 ydat = obj.ydata(:); | |
| 459 ldat = obj.ldata; | |
| 460 yerr = xerr = false; | |
| 461 if (! isempty (ldat)) | |
| 462 yerr = true; | |
| 463 ldat = ldat(:); | |
| 464 endif | |
| 465 udat = obj.udata; | |
| 466 if (! isempty (udat)) | |
| 467 udat = udat(:); | |
| 468 endif | |
| 469 xldat = obj.xldata; | |
| 470 if (! isempty (xldat)) | |
| 471 xerr = true; | |
| 472 xldat = xldat(:); | |
| 473 endif | |
| 474 xudat = obj.xudata; | |
| 475 if (! isempty (xudat)) | |
| 476 xudat = xudat(:); | |
| 477 endif | |
| 478 if (yerr) | |
| 7213 | 479 if (isempty (ldat)) |
| 480 ylo = ydat; | |
| 481 else | |
| 482 ylo = ydat-ldat; | |
| 483 endif | |
| 484 if (isempty (udat)) | |
| 485 yhi = ydat; | |
| 486 else | |
| 487 yhi = ydat+udat; | |
| 488 endif | |
| 6405 | 489 if (xerr) |
| 7213 | 490 if (isempty (xldat)) |
| 491 xlo = xdat; | |
| 492 else | |
| 493 xlo = xdat-xldat; | |
| 494 endif | |
| 495 if (isempty (xudat)) | |
| 496 xhi = xdat; | |
| 497 else | |
| 498 xhi = xdat+xudat; | |
| 499 endif | |
| 6405 | 500 data{data_idx} = [xdat, ydat, xlo, xhi, ylo, yhi]'; |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
501 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4):($5):($6)", numel (xdat)); |
|
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
502 errbars = "xyerrorbars"; |
| 6405 | 503 else |
| 504 data{data_idx} = [xdat, ydat, ylo, yhi]'; | |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
505 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", numel (xdat)); |
|
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
506 errbars = "yerrorbars"; |
| 6405 | 507 endif |
| 508 elseif (xerr) | |
| 7236 | 509 if (isempty (xldat)) |
| 510 xlo = xdat; | |
| 511 else | |
| 512 xlo = xdat-xldat; | |
| 513 endif | |
| 514 if (isempty (xudat)) | |
| 515 xhi = xdat; | |
| 516 else | |
| 517 xhi = xdat+xudat; | |
| 518 endif | |
| 6405 | 519 data{data_idx} = [xdat, ydat, xlo, xhi]'; |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
520 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3):($4)", numel (xdat)); |
|
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
521 errbars = "xerrorbars"; |
| 6405 | 522 else |
| 523 data{data_idx} = [xdat, ydat]'; | |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
524 usingclause{data_idx} = sprintf ("record=%d using ($1):($2) axes %s%s", |
|
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
525 rows(xdat), xaxisloc_using, yaxisloc_using); |
| 6405 | 526 endif |
| 527 endif | |
|
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
528 |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
529 style = do_linestyle_command (obj, obj.color, data_idx, mono, |
|
10121
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
530 plot_stream, markerorder, errbars); |
|
7510
f3e6ada67d9e
improve handling line style for errorbar plots
John W. Eaton <jwe@octave.org>
parents:
7472
diff
changeset
|
531 |
|
10111
b52cba8be2eb
Fix for markerfacecolor and markeredgecolor properties with unfillable markers like '+'
David Bateman <dbateman@free.fr>
parents:
10089
diff
changeset
|
532 withclause{data_idx} = sprintf ("with %s linestyle %d", |
|
b52cba8be2eb
Fix for markerfacecolor and markeredgecolor properties with unfillable markers like '+'
David Bateman <dbateman@free.fr>
parents:
10089
diff
changeset
|
533 style{1}, data_idx); |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
534 |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
535 if (length (style) > 1) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
536 data_idx++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
537 is_image_data(data_idx) = is_image_data(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
538 parametric(data_idx) = parametric(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
539 have_cdata(data_idx) = have_cdata(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
540 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
541 titlespec{data_idx} = "title \"\""; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
542 usingclause{data_idx} = usingclause{data_idx - 1}; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
543 data{data_idx} = data{data_idx - 1}; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
544 withclause{data_idx} = sprintf ("with %s linestyle %d", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
545 style{2}, data_idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
546 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
547 if (length (style) > 2) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
548 data_idx++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
549 is_image_data(data_idx) = is_image_data(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
550 parametric(data_idx) = parametric(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
551 have_cdata(data_idx) = have_cdata(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
552 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
553 titlespec{data_idx} = "title \"\""; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
554 usingclause{data_idx} = usingclause{data_idx - 1}; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
555 data{data_idx} = data{data_idx - 1}; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
556 withclause{data_idx} = sprintf ("with %s linestyle %d", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
557 style{3}, data_idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
558 endif |
| 6405 | 559 |
| 6790 | 560 case "patch" |
| 6885 | 561 cmap = parent_figure_obj.colormap; |
| 7020 | 562 [nr, nc] = size (obj.xdata); |
| 563 | |
| 7189 | 564 if (! isempty (obj.cdata)) |
| 565 cdat = obj.cdata; | |
|
7583
1d7c23e288d7
__go_draw_axes__: use strcmpi for text properties; use get for hidden properties
John W. Eaton <jwe@octave.org>
parents:
7582
diff
changeset
|
566 if (strcmpi (obj.cdatamapping, "direct")) |
|
7471
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
567 cdatadirect = true; |
|
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
568 endif |
| 7189 | 569 else |
| 570 cdat = []; | |
| 571 endif | |
| 572 | |
|
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
|
573 data_3d_idx = NaN; |
| 7170 | 574 for i = 1:nc |
| 7020 | 575 xcol = obj.xdata(:,i); |
| 576 ycol = obj.ydata(:,i); | |
| 7316 | 577 if (nd == 3) |
| 578 if (! isempty (obj.zdata)) | |
| 579 zcol = obj.zdata(:,i); | |
| 580 else | |
| 581 zcol = zeros (size (xcol)); | |
| 582 endif | |
| 7170 | 583 endif |
| 7020 | 584 |
| 585 if (! isnan (xcol) && ! isnan (ycol)) | |
| 586 ## Is the patch closed or not | |
| 7175 | 587 if (strncmp (obj.facecolor, "none", 4)) |
| 7318 | 588 hidden_removal = false; |
| 589 else | |
|
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
|
590 |
| 7175 | 591 if (isnan (hidden_removal)) |
| 7318 | 592 hidden_removal = true; |
| 7175 | 593 endif |
| 7316 | 594 if (nd == 3) |
|
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
|
595 if (numel (xcol) > 3) |
|
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
|
596 error ("gnuplot (as of v4.2) only supports 3D filled triangular patches"); |
|
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
|
597 else |
|
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
|
598 if (isnan (data_3d_idx)) |
|
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
|
599 data_idx++; |
|
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
|
600 data_3d_idx = data_idx; |
|
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
|
601 is_image_data(data_idx) = false; |
|
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
|
602 parametric(data_idx) = false; |
|
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
|
603 have_cdata(data_idx) = true; |
|
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
|
604 have_3d_patch(data_idx) = true; |
|
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
|
605 withclause{data_3d_idx} = sprintf ("with pm3d"); |
|
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
|
606 usingclause{data_3d_idx} = "using 1:2:3:4"; |
|
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
|
607 data{data_3d_idx} = []; |
|
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
|
608 endif |
|
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
|
609 local_idx = data_3d_idx; |
|
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
|
610 ccdat = NaN; |
|
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
|
611 endif |
|
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
|
612 else |
|
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
|
613 data_idx++; |
|
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
|
614 local_idx = data_idx; |
|
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
|
615 is_image_data(data_idx) = false; |
|
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
|
616 parametric(data_idx) = false; |
|
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
|
617 have_cdata(data_idx) = false; |
|
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
|
618 have_3d_patch(data_idx) = false; |
| 7170 | 619 endif |
| 620 | |
| 621 if (i > 1 || isempty (obj.keylabel)) | |
|
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
|
622 titlespec{local_idx} = "title \"\""; |
| 7170 | 623 else |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
624 tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); |
|
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
|
625 titlespec{local_idx} = cstrcat ("title \"", tmp, "\""); |
| 7170 | 626 endif |
| 7189 | 627 if (isfield (obj, "facecolor")) |
| 628 if ((strncmp (obj.facecolor, "flat", 4) | |
| 7284 | 629 || strncmp (obj.facecolor, "interp", 6)) |
| 630 && isfield (obj, "cdata")) | |
| 7170 | 631 if (ndims (obj.cdata) == 2 |
| 7189 | 632 && (size (obj.cdata, 2) == nc |
| 633 && (size (obj.cdata, 1) == 1 | |
| 634 || size (obj.cdata, 1) == 3))) | |
| 635 ccol = cdat (:, i); | |
| 636 elseif (ndims (obj.cdata) == 2 | |
| 637 && (size (obj.cdata, 1) == nc | |
| 638 && (size (obj.cdata, 2) == 1 | |
| 639 || size (obj.cdata, 2) == 3))) | |
| 640 ccol = cdat (i, :); | |
| 7170 | 641 elseif (ndims (obj.cdata) == 3) |
| 7189 | 642 ccol = permute (cdat (:, i, :), [1, 3, 2]); |
| 7170 | 643 else |
| 7189 | 644 ccol = cdat; |
| 7170 | 645 endif |
| 646 if (strncmp (obj.facecolor, "flat", 4)) | |
| 647 if (numel(ccol) == 3) | |
| 648 color = ccol; | |
|
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
|
649 elseif (nd == 3 && numel (xcol) == 3) |
|
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
|
650 ccdat = ccol * ones (3,1); |
| 7170 | 651 else |
| 7226 | 652 r = 1 + round ((size (cmap, 1) - 1) |
| 653 * (ccol - clim(1))/(clim(2) - clim(1))); | |
| 7170 | 654 r = max (1, min (r, size (cmap, 1))); |
| 655 color = cmap(r, :); | |
| 656 endif | |
| 657 elseif (strncmp (obj.facecolor, "interp", 6)) | |
|
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
|
658 if (nd == 3 && numel (xcol) == 3) |
|
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
|
659 ccdat = ccol; |
|
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
|
660 if (! isvector (ccdat)) |
|
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
|
661 tmp = rows(cmap) + rows(addedcmap) + ... |
|
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
|
662 [1 : rows(ccdat)]; |
|
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 addedcmap = [addedcmap; ccdat]; |
|
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
|
664 ccdat = tmp(:); |
|
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
|
665 else |
|
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
|
666 ccdat = ccdat(:); |
|
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
|
667 endif |
|
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
|
668 else |
|
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
|
669 warning ("\"interp\" not supported, using 1st entry of cdata"); |
|
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
|
670 r = 1 + round ((size (cmap, 1) - 1) * ccol(1)); |
|
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
|
671 r = max (1, min (r, size (cmap, 1))); |
|
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
|
672 color = cmap(r,:); |
|
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
|
673 endif |
| 7170 | 674 endif |
| 7189 | 675 elseif (isnumeric (obj.facecolor)) |
| 676 color = obj.facecolor; | |
| 7170 | 677 else |
| 7189 | 678 color = [0, 1, 0]; |
| 7170 | 679 endif |
| 680 else | |
| 681 color = [0, 1, 0]; | |
| 682 endif | |
| 683 | |
|
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
|
684 if (nd == 3 && numel (xcol) == 3) |
|
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
|
685 if (isnan (ccdat)) |
|
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
|
686 ccdat = (rows (cmap) + rows(addedcmap) + 1) * ones(3, 1); |
|
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
|
687 addedcmap = [addedcmap; reshape(color, 1, 3)]; |
|
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
|
688 endif |
|
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
|
689 data{data_3d_idx} = [data{data_3d_idx}, ... |
|
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
|
690 [[xcol; xcol(end)], [ycol; ycol(end)], ... |
|
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
|
691 [zcol; zcol(end)], [ccdat; ccdat(end)]]']; |
| 7170 | 692 else |
|
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
|
693 if (mono) |
|
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
|
694 colorspec = ""; |
|
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
|
695 elseif (__gnuplot_has_feature__ ("transparent_patches") |
|
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
|
696 && isscalar (obj.facealpha)) |
|
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
|
697 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\" fillstyle transparent solid %f", |
|
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
|
698 round (255*color), obj.facealpha); |
|
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
|
699 else |
|
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
|
700 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
|
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
|
701 round (255*color)); |
|
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
|
702 endif |
|
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
|
703 |
|
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
|
704 withclause{data_idx} = sprintf ("with filledcurve %s", |
|
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
|
705 colorspec); |
|
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
|
706 data{data_idx} = [xcol, ycol]'; |
|
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
|
707 usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", |
|
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
|
708 numel (xcol)); |
| 7170 | 709 endif |
| 710 endif | |
| 711 endif | |
| 712 | |
| 713 ## patch outline | |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
714 if (!(strncmp (obj.edgecolor, "none", 4) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
715 && strncmp (obj.markeredgecolor, "none", 4) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
716 && strncmp (obj.markerfacecolor, "none", 4))) |
| 7170 | 717 |
| 718 data_idx++; | |
| 719 is_image_data(data_idx) = false; | |
| 720 parametric(data_idx) = false; | |
| 721 have_cdata(data_idx) = false; | |
|
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
|
722 have_3d_patch(data_idx) = false; |
| 7170 | 723 titlespec{data_idx} = "title \"\""; |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
724 usingclause{data_idx} = sprintf ("record=%d", numel (obj.xdata)); |
| 7189 | 725 |
| 726 if (isfield (obj, "markersize")) | |
|
8510
738cb6271933
__go_draw_axes__.m: scale markersize by 1/3 instead of 1/6
John W. Eaton <jwe@octave.org>
parents:
8506
diff
changeset
|
727 mdat = obj.markersize / 3; |
| 7189 | 728 endif |
| 729 | |
| 730 if (isfield (obj, "edgecolor")) | |
| 731 if ((strncmp (obj.edgecolor, "flat", 4) | |
| 7284 | 732 || strncmp (obj.edgecolor, "interp", 6)) |
| 733 && isfield (obj, "cdata")) | |
| 7119 | 734 if (ndims (obj.cdata) == 2 |
| 7189 | 735 && (size (obj.cdata, 2) == nc |
| 736 && (size (obj.cdata, 1) == 1 | |
| 737 || size (obj.cdata, 1) == 3))) | |
| 738 ccol = cdat (:, i); | |
| 739 elseif (ndims (obj.cdata) == 2 | |
| 740 && (size (obj.cdata, 1) == nc | |
| 741 && (size (obj.cdata, 2) == 1 | |
| 742 || size (obj.cdata, 2) == 3))) | |
| 743 ccol = cdat (i, :); | |
| 7020 | 744 elseif (ndims (obj.cdata) == 3) |
| 7189 | 745 ccol = permute (cdat (:, i, :), [1, 3, 2]); |
| 7020 | 746 else |
| 7189 | 747 ccol = cdat; |
| 7020 | 748 endif |
| 7170 | 749 if (strncmp (obj.edgecolor, "flat", 4)) |
| 7189 | 750 if (numel(ccol) == 3) |
| 7020 | 751 color = ccol; |
| 752 else | |
| 7226 | 753 r = 1 + round ((size (cmap, 1) - 1) |
| 754 * (ccol - clim(1))/(clim(2) - clim(1))); | |
| 7020 | 755 r = max (1, min (r, size (cmap, 1))); |
| 756 color = cmap(r, :); | |
| 757 endif | |
| 7170 | 758 elseif (strncmp (obj.edgecolor, "interp", 6)) |
| 7582 | 759 warning ("\"interp\" not supported, using 1st entry of cdata"); |
| 7020 | 760 r = 1 + round ((size (cmap, 1) - 1) * ccol(1)); |
| 761 r = max (1, min (r, size (cmap, 1))); | |
| 762 color = cmap(r,:); | |
| 763 endif | |
| 7189 | 764 elseif (isnumeric (obj.edgecolor)) |
| 765 color = obj.edgecolor; | |
| 766 else | |
| 767 color = [0, 0, 0]; | |
| 7020 | 768 endif |
| 769 else | |
| 7189 | 770 color = [0, 0, 0]; |
| 7020 | 771 endif |
| 7189 | 772 |
| 773 if (isfield (obj, "linestyle")) | |
| 774 switch (obj.linestyle) | |
| 775 case "-" | |
| 7317 | 776 lt = "lt 1"; |
| 7189 | 777 case "--" |
| 7317 | 778 lt = "lt 2"; |
| 7189 | 779 case ":" |
| 7317 | 780 lt = "lt 3"; |
| 7189 | 781 case "-." |
| 7317 | 782 lt = "lt 6"; |
| 7189 | 783 case "none" |
| 784 lt = ""; | |
| 785 otherwise | |
| 786 lt = ""; | |
| 787 endswitch | |
| 788 else | |
| 789 lt = ""; | |
| 790 endif | |
| 791 | |
|
7462
dfcaf7ed48e3
Allow linewidth to be specified for contours
David Bateman
parents:
7420
diff
changeset
|
792 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
|
793 lw = sprintf("linewidth %f", obj.linewidth); |
|
7462
dfcaf7ed48e3
Allow linewidth to be specified for contours
David Bateman
parents:
7420
diff
changeset
|
794 else |
|
dfcaf7ed48e3
Allow linewidth to be specified for contours
David Bateman
parents:
7420
diff
changeset
|
795 lw = ""; |
|
dfcaf7ed48e3
Allow linewidth to be specified for contours
David Bateman
parents:
7420
diff
changeset
|
796 endif |
|
dfcaf7ed48e3
Allow linewidth to be specified for contours
David Bateman
parents:
7420
diff
changeset
|
797 |
| 7189 | 798 if (isfield (obj, "marker")) |
| 799 if (isfield (obj, "marker")) | |
| 800 switch (obj.marker) | |
|
10121
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
801 case "@" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
802 [pt, pt2] = next_marker (markerorder); |
| 7189 | 803 case "+" |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
804 pt = pt2 = "pt 1"; |
| 7189 | 805 case "o" |
| 806 pt = "pt 6"; | |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
807 pt2 = "pt 7"; |
| 7189 | 808 case "*" |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
809 pt = pt2 = "pt 3"; |
| 7189 | 810 case "." |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
811 pt = pt2 = "pt 0"; |
| 7189 | 812 case "x" |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
813 pt = pt2 = "pt 2"; |
| 7189 | 814 case {"square", "s"} |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
815 pt = "pt 4"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
816 pt2 = "pt 5"; |
| 7189 | 817 case {"diamond", "d"} |
| 818 pt = "pt 13"; | |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
819 pt2 = "pt 14"; |
| 7189 | 820 case "^" |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
821 pt = "pt 8"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
822 pt2 = "pt 9"; |
| 7189 | 823 case "v" |
| 824 pt = "pt 10"; | |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
825 pt2 = "pt 11"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
826 case ">" |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
827 ## FIXME missing point type |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
828 pt = "pt 8"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
829 pt2 = "pt 9"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
830 case "<" |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
831 ## FIXME missing point type |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
832 pt = "pt 10"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
833 pt2 = "pt 11"; |
| 7189 | 834 case {"pentagram", "p"} |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
835 ## FIXME missing point type |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
836 pt = pt2 = "pt 3"; |
| 7189 | 837 case {"hexagram", "h"} |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
838 pt = pt2 = "pt 3"; |
| 7189 | 839 case "none" |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
840 pt = pt2 = ""; |
| 7189 | 841 otherwise |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
842 pt = pt2 = ""; |
| 7189 | 843 endswitch |
| 844 endif | |
| 845 else | |
| 846 pt = ""; | |
| 847 endif | |
| 848 | |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
849 if (mono) |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
850 colorspec = ""; |
| 7020 | 851 else |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
852 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
853 round (255*color)); |
| 7020 | 854 endif |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
855 |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
856 sidx = 1; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
857 if (isempty (lt)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
858 style = ""; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
859 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
860 style = "lines"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
861 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
862 tmpwith = {}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
863 |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
864 facesame = true; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
865 if (! isequal (pt, pt2) && isfield (obj, "markerfacecolor") |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
866 && !strncmp (obj.markerfacecolor, "none", 4)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
867 if (strncmp (obj.markerfacecolor, "auto", 4) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
868 || ! isnumeric (obj.markerfacecolor) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
869 || (isnumeric (obj.markerfacecolor) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
870 && isequal (color, obj.markerfacecolor))) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
871 style = strcat (style, "points"); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
872 if (isfield (obj, "markersize")) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
873 if (length (mdat) == nc) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
874 m = mdat(i); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
875 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
876 m = mdat; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
877 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
878 ps = sprintf("pointsize %f", m / 3); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
879 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
880 ps = ""; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
881 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
882 |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
883 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
884 style, lw, pt2, lt, ps, |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
885 colorspec); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
886 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
887 facesame = false; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
888 if (! isempty (style)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
889 tmpwith{sidx} = sprintf ("with %s %s %s %s", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
890 style, lw, lt, |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
891 colorspec); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
892 sidx ++; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
893 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
894 if (isnumeric (obj.markerfacecolor) && ! mono) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
895 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
896 round (255*obj.markerfacecolor)); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
897 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
898 style = "points"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
899 if (isfield (obj, "markersize")) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
900 if (length (mdat) == nc) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
901 m = mdat(i); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
902 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
903 m = mdat; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
904 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
905 ps = sprintf("pointsize %f", m / 3); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
906 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
907 ps = ""; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
908 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
909 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
910 style, lw, pt2, lt, ps, |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
911 colorspec); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
912 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
913 endif |
| 6790 | 914 |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
915 if (isfield (obj, "markeredgecolor") |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
916 && !strncmp (obj.markeredgecolor, "none", 4)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
917 if (facesame && (strncmp (obj.markeredgecolor, "auto", 4) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
918 || ! isnumeric (obj.markeredgecolor) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
919 || (isnumeric (obj.markeredgecolor) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
920 && isequal (color, obj.markeredgecolor)))) |
|
10111
b52cba8be2eb
Fix for markerfacecolor and markeredgecolor properties with unfillable markers like '+'
David Bateman <dbateman@free.fr>
parents:
10089
diff
changeset
|
921 if (sidx == 1 && ((length (style) == 5 |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
922 && strncmp (style, "lines", 5)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
923 || isempty (style))) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
924 style = strcat (style, "points"); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
925 if (isfield (obj, "markersize")) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
926 if (length (mdat) == nc) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
927 m = mdat(i); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
928 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
929 m = mdat; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
930 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
931 ps = sprintf("pointsize %f", m / 3); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
932 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
933 ps = ""; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
934 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
935 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
936 style, lw, pt, lt, ps, |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
937 colorspec); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
938 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
939 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
940 if (!isempty (style)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
941 if (isempty (tmpwith{sidx})) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
942 tmpwith{sidx} = sprintf ("with %s %s %s %s", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
943 style, lw, lt, |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
944 colorspec); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
945 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
946 sidx ++; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
947 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
948 if (! mono) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
949 if (strncmp (obj.markeredgecolor, "auto", 4)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
950 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
951 round (255*color)); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
952 elseif (isnumeric (obj.markeredgecolor) && ! mono) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
953 colorspec = sprintf ("lc rgb \"#%02x%02x%02x\"", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
954 round (255*obj.markeredgecolor)); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
955 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
956 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
957 style = "points"; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
958 if (isfield (obj, "markersize")) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
959 if (length (mdat) == nc) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
960 m = mdat(i); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
961 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
962 m = mdat; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
963 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
964 ps = sprintf("pointsize %f", m / 3); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
965 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
966 ps = ""; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
967 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
968 tmpwith{sidx} = sprintf ("with %s %s %s %s %s %s", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
969 style, lw, pt, lt, ps, |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
970 colorspec); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
971 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
972 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
973 |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
974 if (isempty (tmpwith)) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
975 withclause{data_idx} = sprintf ("with %s %s %s %s %s", |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
976 style, lw, pt, lt, |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
977 colorspec); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
978 else |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
979 withclause{data_idx} = tmpwith{1}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
980 endif |
| 7316 | 981 if (nd == 3) |
| 7170 | 982 if (! isnan (xcol) && ! isnan (ycol) && ! isnan (zcol)) |
| 983 data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)], ... | |
| 984 [zcol; zcol(1)]]'; | |
| 985 else | |
| 986 data{data_idx} = [xcol, ycol, zcol]'; | |
| 987 endif | |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
988 usingclause{data_idx} = sprintf ("record=%d using ($1):($2):($3)", columns (data{data_idx})); |
| 7020 | 989 else |
| 7170 | 990 if (! isnan (xcol) && ! isnan (ycol)) |
| 991 data{data_idx} = [[xcol; xcol(1)], [ycol; ycol(1)]]'; | |
| 992 else | |
| 993 data{data_idx} = [xcol, ycol]'; | |
| 994 endif | |
|
8218
8a5fbd656f55
make previous change work for surface plots
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8217
diff
changeset
|
995 usingclause{data_idx} = sprintf ("record=%d using ($1):($2)", columns (data{data_idx})); |
| 7020 | 996 endif |
|
10089
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
997 |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
998 if (length (tmpwith) > 1) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
999 data_idx++; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1000 is_image_data(data_idx) = is_image_data(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1001 parametric(data_idx) = parametric(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1002 have_cdata(data_idx) = have_cdata(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1003 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1004 titlespec{data_idx} = "title \"\""; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1005 usingclause{data_idx} = usingclause{data_idx - 1}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1006 data{data_idx} = data{data_idx - 1}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1007 withclause{data_idx} = tmpwith{2}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1008 endif |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1009 if (length (tmpwith) > 2) |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1010 data_idx++; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1011 is_image_data(data_idx) = is_image_data(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1012 parametric(data_idx) = parametric(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1013 have_cdata(data_idx) = have_cdata(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1014 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1015 titlespec{data_idx} = "title \"\""; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1016 usingclause{data_idx} = usingclause{data_idx - 1}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1017 data{data_idx} = data{data_idx - 1}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1018 withclause{data_idx} = tmpwith{3}; |
|
dd70982c81a3
Allow markerfacecolor and markeredgecolor to be set and used for patch objects
David Bateman <dbateman@free.fr>
parents:
9793
diff
changeset
|
1019 endif |
| 6885 | 1020 endif |
| 7020 | 1021 endfor |
| 6790 | 1022 |
| 6405 | 1023 case "surface" |
| 7271 | 1024 view_map = true; |
| 7110 | 1025 if (! (strncmp (obj.edgecolor, "none", 4) |
| 1026 && strncmp (obj.facecolor, "none", 4))) | |
| 7109 | 1027 data_idx++; |
| 1028 is_image_data(data_idx) = false; | |
| 1029 parametric(data_idx) = false; | |
| 7119 | 1030 have_cdata(data_idx) = true; |
|
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
|
1031 have_3d_patch(data_idx) = false; |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1032 style = do_linestyle_command (obj, obj.edgecolor, |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1033 data_idx, mono, |
|
10121
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1034 plot_stream, markerorder); |
| 7109 | 1035 if (isempty (obj.keylabel)) |
| 1036 titlespec{data_idx} = "title \"\""; | |
| 1037 else | |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1038 tmp = undo_string_escapes (__maybe_munge_text__ (enhanced, obj, "keylabel")); |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
1039 titlespec{data_idx} = cstrcat ("title \"", tmp, "\""); |
| 7109 | 1040 endif |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1041 withclause{data_idx} = sprintf ("with pm3d linestyle %d", |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1042 data_idx); |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1043 withpm3d = true; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1044 pm3didx = data_idx; |
| 7109 | 1045 |
| 1046 xdat = obj.xdata; | |
| 1047 ydat = obj.ydata; | |
| 1048 zdat = obj.zdata; | |
| 1049 cdat = obj.cdata; | |
| 7110 | 1050 |
| 7109 | 1051 err = false; |
| 1052 if (! size_equal(zdat, cdat)) | |
| 6405 | 1053 err = true; |
| 7109 | 1054 endif |
| 1055 if (isvector (xdat) && isvector (ydat) && ismatrix (zdat)) | |
| 7110 | 1056 if (rows (zdat) == length (ydat) |
| 1057 && columns (zdat) == length (xdat)) | |
| 7109 | 1058 [xdat, ydat] = meshgrid (xdat, ydat); |
| 1059 else | |
| 1060 err = true; | |
| 1061 endif | |
| 1062 elseif (ismatrix (xdat) && ismatrix (ydat) && ismatrix (zdat)) | |
| 7292 | 1063 if (! size_equal (xdat, ydat, zdat)) |
| 7109 | 1064 err = true; |
| 1065 endif | |
| 1066 else | |
| 1067 err = true; | |
| 1068 endif | |
| 1069 if (err) | |
| 1070 error ("__go_draw_axes__: invalid grid data"); | |
| 6405 | 1071 endif |
| 7109 | 1072 xlen = columns (zdat); |
| 1073 ylen = rows (zdat); | |
| 1074 if (xlen == columns (xdat) && xlen == columns (ydat) | |
| 1075 && ylen == rows (xdat) && ylen == rows (ydat)) | |
| 1076 len = 4 * xlen; | |
| 1077 zz = zeros (ylen, len); | |
| 1078 k = 1; | |
| 1079 for kk = 1:4:len | |
| 1080 zz(:,kk) = xdat(:,k); | |
| 1081 zz(:,kk+1) = ydat(:,k); | |
| 1082 zz(:,kk+2) = zdat(:,k); | |
| 1083 zz(:,kk+3) = cdat(:,k); | |
| 1084 k++; | |
| 1085 endfor | |
| 7170 | 1086 data{data_idx} = zz.'; |
| 7109 | 1087 endif |
| 1088 | |
|
8166
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1089 if (doing_interp_color) |
|
8665
55efd5d71649
__go_draw_axes__.m: __go_draw_axes__.m: Improved gnuplot color interpolation.
Ben Abbott <bpabbott@mac.com>
parents:
8645
diff
changeset
|
1090 interp_str = "interpolate 0, 0"; |
|
8166
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1091 else |
|
8171
15ffb9836c01
__go_draw_axes__.m: Remove depdenence on gnuplot version.
Ben Abbott <bpabbott@mac.com>
parents:
8166
diff
changeset
|
1092 ## No interpolation of facecolors. |
|
8166
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1093 interp_str = ""; |
|
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1094 endif |
|
8242
a9d3b88ea6fb
__go_draw_axes__.m: Fix for binary xfer of suface plots.
Ben Abbott <bpabbott@mac.com>
parents:
8226
diff
changeset
|
1095 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
|
1096 |
| 7119 | 1097 flat_interp_face = (strncmp (obj.facecolor, "flat", 4) |
| 1098 || strncmp (obj.facecolor, "interp", 6)); | |
| 1099 flat_interp_edge = (strncmp (obj.edgecolor, "flat", 4) | |
| 1100 || strncmp (obj.edgecolor, "interp", 6)); | |
| 7154 | 1101 |
| 1102 facecolor_none_or_white = (strncmp (obj.facecolor, "none", 4) | |
| 1103 || (isnumeric (obj.facecolor) | |
| 1104 && all (obj.facecolor == 1))); | |
| 7582 | 1105 hidden_removal = false; |
| 7592 | 1106 fputs (plot_stream, "set style increment default;\n"); |
| 7318 | 1107 if (flat_interp_edge && facecolor_none_or_white) |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1108 withpm3d = false; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1109 withclause{data_idx} = sprintf ("with %s palette", style {1}); |
|
7541
6acd0a18a3ee
If FaceColor is none don't use pm3d mode and set linestyle correctly.
kai@linux-pc
parents:
7540
diff
changeset
|
1110 fputs (plot_stream, "unset pm3d\n"); |
| 7582 | 1111 if (all (obj.facecolor == 1)) |
| 7592 | 1112 hidden_removal = true; |
| 7582 | 1113 endif |
|
7541
6acd0a18a3ee
If FaceColor is none don't use pm3d mode and set linestyle correctly.
kai@linux-pc
parents:
7540
diff
changeset
|
1114 elseif (facecolor_none_or_white) |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1115 if (all (obj.facecolor == 1)) |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1116 hidden_removal = true; |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1117 endif |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1118 fputs(plot_stream,"unset pm3d;\n"); |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1119 fputs(plot_stream,"set style increment user;\n"); |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1120 withpm3d = false; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1121 withclause{data_idx} = sprintf("with %s linestyle %d", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1122 style{1}, data_idx); |
| 7582 | 1123 fputs (plot_stream, "unset pm3d\n"); |
| 7119 | 1124 endif |
| 7109 | 1125 |
|
8166
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1126 if (doing_interp_color) |
|
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1127 ## "depthorder" interferes with interpolation of colors. |
|
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1128 dord = "scansautomatic"; |
|
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1129 else |
|
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1130 dord = "depthorder"; |
|
4024fc815f8d
__go_draw_axes__.m: Fix interpolation of facecolors.
Ben Abbott <bpabbott@mac.com>
parents:
8164
diff
changeset
|
1131 endif |
| 7109 | 1132 |
| 7318 | 1133 if (flat_interp_face && strncmp (obj.edgecolor, "flat", 4)) |
| 1134 fprintf (plot_stream, "set pm3d explicit at s %s %s corners2color c3;\n", | |
| 7189 | 1135 interp_str, dord); |
| 7318 | 1136 elseif (!facecolor_none_or_white) |
| 7119 | 1137 if (strncmp (obj.edgecolor, "none", 4)) |
| 8645 | 1138 if (__gnuplot_has_feature__ ("transparent_surface") |
| 1139 && isscalar (obj.facealpha)) | |
| 1140 fprintf (plot_stream, | |
| 1141 "set style fill transparent solid %f;\n", | |
| 1142 obj.facealpha); | |
| 1143 endif | |
| 7318 | 1144 fprintf (plot_stream, "set pm3d explicit at s %s corners2color c3;\n", |
| 7189 | 1145 interp_str, dord); |
| 7109 | 1146 else |
| 7318 | 1147 fprintf (plot_stream, "set pm3d explicit at s hidden3d %d %s %s corners2color c3;\n", |
| 7189 | 1148 data_idx, interp_str, dord); |
| 7119 | 1149 |
| 8645 | 1150 if (__gnuplot_has_feature__ ("transparent_surface") |
| 1151 && isscalar (obj.facealpha)) | |
| 1152 fprintf (plot_stream, | |
| 1153 "set style fill transparent solid %f;\n", | |
| 1154 obj.facealpha); | |
| 1155 endif | |
| 7109 | 1156 endif |
| 7119 | 1157 endif |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1158 |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1159 zz = []; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1160 if (length (style) > 1) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1161 len = 3 * xlen; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1162 zz = zeros (ylen, len); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1163 k = 1; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1164 for kk = 1:3:len |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1165 zz(:,kk) = xdat(:,k); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1166 zz(:,kk+1) = ydat(:,k); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1167 zz(:,kk+2) = zdat(:,k); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1168 k++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1169 endfor |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1170 zz = zz.'; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1171 |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1172 data_idx++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1173 is_image_data(data_idx) = is_image_data(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1174 parametric(data_idx) = parametric(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1175 have_cdata(data_idx) = false; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1176 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1177 titlespec{data_idx} = "title \"\""; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1178 usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1179 data{data_idx} = zz; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1180 withclause{data_idx} = sprintf ("with %s linestyle %d", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1181 style{2}, data_idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1182 |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1183 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1184 if (length (style) > 2) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1185 data_idx++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1186 is_image_data(data_idx) = is_image_data(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1187 parametric(data_idx) = parametric(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1188 have_cdata(data_idx) = false; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1189 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1190 titlespec{data_idx} = "title \"\""; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1191 usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1192 data{data_idx} = zz; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1193 withclause{data_idx} = sprintf ("with %s linestyle %d", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1194 style{3}, data_idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1195 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1196 if (withpm3d && strncmp (style {1}, "linespoints", 11)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1197 if (isempty(zz)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1198 len = 3 * xlen; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1199 zz = zeros (ylen, len); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1200 k = 1; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1201 for kk = 1:3:len |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1202 zz(:,kk) = xdat(:,k); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1203 zz(:,kk+1) = ydat(:,k); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1204 zz(:,kk+2) = zdat(:,k); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1205 k++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1206 endfor |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1207 zz = zz.'; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1208 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1209 data_idx++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1210 is_image_data(data_idx) = is_image_data(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1211 parametric(data_idx) = parametric(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1212 have_cdata(data_idx) = false; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1213 have_3d_patch(data_idx) = have_3d_patch(data_idx - 1); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1214 titlespec{data_idx} = "title \"\""; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1215 usingclause{data_idx} = sprintf ("record=%dx%d using ($1):($2):($3)", ylen, xlen); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1216 data{data_idx} = zz; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1217 withclause{data_idx} = sprintf ("with points linestyle %d", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1218 pm3didx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1219 endif |
| 6405 | 1220 endif |
| 1221 | |
| 1222 case "text" | |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1223 [label, f, s] = __maybe_munge_text__ (enhanced, obj, "string"); |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
1224 fontspec = create_fontspec (f, s, gnuplot_term); |
| 6405 | 1225 lpos = obj.position; |
| 1226 halign = obj.horizontalalignment; | |
| 6724 | 1227 angle = obj.rotation; |
| 6752 | 1228 units = obj.units; |
| 6829 | 1229 color = obj.color; |
| 6758 | 1230 if (strcmpi (units, "normalized")) |
| 6752 | 1231 units = "graph"; |
| 1232 else | |
| 1233 units = ""; | |
| 1234 endif | |
| 1235 | |
| 6829 | 1236 if (isnumeric (color)) |
| 7269 | 1237 colorspec = get_text_colorspec (color, mono); |
| 6829 | 1238 endif |
| 1239 | |
| 6405 | 1240 if (nd == 3) |
| 6724 | 1241 fprintf (plot_stream, |
| 7390 | 1242 "set label \"%s\" at %s %.15g,%.15g,%.15g %s rotate by %f %s %s front %s;\n", |
| 7162 | 1243 undo_string_escapes (label), units, lpos(1), |
| 7390 | 1244 lpos(2), lpos(3), halign, angle, fontspec, |
| 1245 __do_enhanced_option__ (enhanced, obj), colorspec); | |
| 6405 | 1246 else |
| 7162 | 1247 fprintf (plot_stream, |
| 7390 | 1248 "set label \"%s\" at %s %.15g,%.15g %s rotate by %f %s %s front %s;\n", |
| 7162 | 1249 undo_string_escapes (label), units, |
| 7390 | 1250 lpos(1), lpos(2), halign, angle, fontspec, |
| 1251 __do_enhanced_option__ (enhanced, obj), colorspec); | |
| 6405 | 1252 endif |
| 1253 | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1254 case "hggroup" |
| 8506 | 1255 ## Push group children into the kid list. |
|
8216
5d6b9311be38
__go_draw_axes__.m: Fix concatenation of handles.
Ben Abbott <bpabbott@mac.com>
parents:
8208
diff
changeset
|
1256 if (isempty (kids)) |
|
5d6b9311be38
__go_draw_axes__.m: Fix concatenation of handles.
Ben Abbott <bpabbott@mac.com>
parents:
8208
diff
changeset
|
1257 kids = obj.children; |
|
5d6b9311be38
__go_draw_axes__.m: Fix concatenation of handles.
Ben Abbott <bpabbott@mac.com>
parents:
8208
diff
changeset
|
1258 elseif (! isempty (obj.children)) |
|
9328
0307f5e5568c
__go_draw_axes__.m: Fix order when pushing group children onto kid list.
Ben Abbott <bpabbott@mac.com>
parents:
9302
diff
changeset
|
1259 kids = [kids; obj.children]; |
|
8216
5d6b9311be38
__go_draw_axes__.m: Fix concatenation of handles.
Ben Abbott <bpabbott@mac.com>
parents:
8208
diff
changeset
|
1260 endif |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1261 |
| 6405 | 1262 otherwise |
| 1263 error ("__go_draw_axes__: unknown object class, %s", | |
| 1264 obj.type); | |
| 1265 endswitch | |
| 1266 | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1267 endwhile |
| 6405 | 1268 |
|
7692
da1f4bc7cbe8
Conditionally set 'set pm3d implicit'
David Bateman <dbateman@free.fr>
parents:
7676
diff
changeset
|
1269 ## This is need to prevent warnings for rotations in 3D plots, while |
| 8506 | 1270 ## allowing colorbars with contours. |
|
8042
827d4f24ec6c
Fix for meshed surfaces with more than one oobject per plot
David Bateman <dbateman@free.fr>
parents:
7930
diff
changeset
|
1271 if (nd == 2 || (data_idx > 1 && !view_map)) |
|
7692
da1f4bc7cbe8
Conditionally set 'set pm3d implicit'
David Bateman <dbateman@free.fr>
parents:
7676
diff
changeset
|
1272 fputs (plot_stream, "set pm3d implicit;\n"); |
|
da1f4bc7cbe8
Conditionally set 'set pm3d implicit'
David Bateman <dbateman@free.fr>
parents:
7676
diff
changeset
|
1273 else |
|
da1f4bc7cbe8
Conditionally set 'set pm3d implicit'
David Bateman <dbateman@free.fr>
parents:
7676
diff
changeset
|
1274 fputs (plot_stream, "set pm3d explicit;\n"); |
|
da1f4bc7cbe8
Conditionally set 'set pm3d implicit'
David Bateman <dbateman@free.fr>
parents:
7676
diff
changeset
|
1275 endif |
|
da1f4bc7cbe8
Conditionally set 'set pm3d implicit'
David Bateman <dbateman@free.fr>
parents:
7676
diff
changeset
|
1276 |
| 7175 | 1277 if (isnan(hidden_removal) || hidden_removal) |
| 7149 | 1278 fputs (plot_stream, "set hidden3d;\n"); |
| 1279 else | |
| 1280 fputs (plot_stream, "unset hidden3d;\n"); | |
| 1281 endif | |
| 1282 | |
|
8048
2f7ff06c0c7b
__go_draw_axes__.m (__gnuplot_write_data__): write "Inf Inf\n" if all data pairs contain NaN values
John W. Eaton <jwe@octave.org>
parents:
8042
diff
changeset
|
1283 have_data = (! (isempty (data) || all (cellfun (@isempty, data)))); |
| 6405 | 1284 |
| 8208 | 1285 ## Note we don't use the [xy]2range of gnuplot as we don't use the |
| 8506 | 1286 ## dual axis plotting features of gnuplot. |
| 7222 | 1287 if (isempty (xlim)) |
| 1288 return; | |
| 6405 | 1289 endif |
| 6758 | 1290 if (strcmpi (axis_obj.xdir, "reverse")) |
| 6405 | 1291 xdir = "reverse"; |
| 1292 else | |
| 1293 xdir = "noreverse"; | |
| 1294 endif | |
| 8208 | 1295 fprintf (plot_stream, "set xrange [%.15e:%.15e] %s;\n", xlim, xdir); |
|
9281
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
1296 if (strcmpi (axis_obj.xaxislocation, "top")) |
|
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
1297 fprintf (plot_stream, "set x2range [%.15e:%.15e] %s;\n", xlim, xdir); |
|
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
1298 endif |
| 6405 | 1299 |
| 7222 | 1300 if (isempty (ylim)) |
| 1301 return; | |
| 6405 | 1302 endif |
| 6758 | 1303 if (strcmpi (axis_obj.ydir, "reverse")) |
| 6405 | 1304 ydir = "reverse"; |
| 1305 else | |
| 1306 ydir = "noreverse"; | |
| 1307 endif | |
| 8208 | 1308 fprintf (plot_stream, "set yrange [%.15e:%.15e] %s;\n", ylim, ydir); |
|
9281
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
1309 if (strcmpi (axis_obj.yaxislocation, "right")) |
|
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
1310 fprintf (plot_stream, "set y2range [%.15e:%.15e] %s;\n", ylim, ydir); |
|
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
1311 endif |
| 6405 | 1312 |
| 7119 | 1313 if (nd == 3) |
| 7222 | 1314 if (isempty (zlim)) |
| 1315 return; | |
| 6405 | 1316 endif |
| 6758 | 1317 if (strcmpi (axis_obj.zdir, "reverse")) |
| 6405 | 1318 zdir = "reverse"; |
| 1319 else | |
| 1320 zdir = "noreverse"; | |
| 1321 endif | |
|
8171
15ffb9836c01
__go_draw_axes__.m: Remove depdenence on gnuplot version.
Ben Abbott <bpabbott@mac.com>
parents:
8166
diff
changeset
|
1322 fprintf (plot_stream, "set zrange [%.15e:%.15e] %s;\n", zlim, zdir); |
| 6405 | 1323 endif |
| 7110 | 1324 |
|
7471
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
1325 cmap = parent_figure_obj.colormap; |
|
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
1326 cmap_sz = rows(cmap); |
| 7189 | 1327 if (! any (isinf (clim))) |
|
7930
1f6eb3de1c4e
__img__.m, imshow.m, __go_draw_axes__.m: improve handling of truecolor images
John W. Eaton <jwe@octave.org>
parents:
7873
diff
changeset
|
1328 if (truecolor || ! cdatadirect) |
|
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
|
1329 if (rows(addedcmap) > 0) |
|
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
|
1330 for i = 1:data_idx |
|
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
|
1331 if (have_3d_patch(i)) |
|
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
|
1332 data{i}(end,:) = clim(2) * (data{i}(end, :) - 0.5) / cmap_sz; |
|
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
|
1333 endif |
|
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
|
1334 endfor |
|
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
|
1335 fprintf (plot_stream, "set cbrange [%g:%g];\n", clim(1), clim(2) * |
|
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
|
1336 (cmap_sz + rows(addedcmap)) / cmap_sz); |
|
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
|
1337 else |
|
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
|
1338 fprintf (plot_stream, "set cbrange [%g:%g];\n", clim); |
|
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
|
1339 endif |
|
7930
1f6eb3de1c4e
__img__.m, imshow.m, __go_draw_axes__.m: improve handling of truecolor images
John W. Eaton <jwe@octave.org>
parents:
7873
diff
changeset
|
1340 else |
|
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
|
1341 fprintf (plot_stream, "set cbrange [1:%d];\n", cmap_sz + |
|
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
|
1342 rows (addedcmap)); |
|
7471
86ba621332ff
Implement cdatamapping and respect to to allow correct image/imagesc rendering
David Bateman <dbateman@free.fr>
parents:
7462
diff
changeset
|
1343 endif |
| 7189 | 1344 endif |
| 1345 | |
| 6758 | 1346 if (strcmpi (axis_obj.box, "on")) |
| 7119 | 1347 if (nd == 3) |
| 6405 | 1348 fputs (plot_stream, "set border 4095;\n"); |
| 1349 else | |
| 1350 fputs (plot_stream, "set border 431;\n"); | |
| 1351 endif | |
| 1352 else | |
| 7119 | 1353 if (nd == 3) |
| 6405 | 1354 fputs (plot_stream, "set border 895;\n"); |
| 1355 else | |
| 7320 | 1356 if (strcmpi (axis_obj.yaxislocation, "right")) |
|
7873
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1357 fprintf (plot_stream, "unset ytics; set y2tics %s nomirror\n", |
|
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1358 axis_obj.tickdir); |
| 7320 | 1359 if (strcmpi (axis_obj.xaxislocation, "top")) |
|
7873
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1360 fprintf (plot_stream, "unset xtics; set x2tics %s nomirror\n", |
|
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1361 axis_obj.tickdir); |
| 7320 | 1362 fputs (plot_stream, "set border 12;\n"); |
| 1363 else | |
|
7873
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1364 fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", |
|
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1365 axis_obj.tickdir); |
| 7320 | 1366 fputs (plot_stream, "set border 9;\n"); |
| 1367 endif | |
| 1368 else | |
|
7873
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1369 fprintf (plot_stream, "unset y2tics; set ytics %s nomirror\n", |
|
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1370 axis_obj.tickdir); |
| 7320 | 1371 if (strcmpi (axis_obj.xaxislocation, "top")) |
|
7873
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1372 fprintf (plot_stream, "unset xtics; set x2tics %s nomirror\n", |
|
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1373 axis_obj.tickdir); |
| 7320 | 1374 fputs (plot_stream, "set border 6;\n"); |
| 1375 else | |
|
7873
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1376 fprintf (plot_stream, "unset x2tics; set xtics %s nomirror\n", |
|
02b590f46a29
correct fputs to fprintf in __go_draw_axes__.m
Jaroslav Hajek <highegg@gmail.com>
parents:
7865
diff
changeset
|
1377 axis_obj.tickdir); |
| 7320 | 1378 fputs (plot_stream, "set border 3;\n"); |
| 1379 endif | |
| 1380 endif | |
| 6405 | 1381 endif |
| 1382 endif | |
| 1383 | |
| 7060 | 1384 if (strcmpi (axis_obj.visible, "off")) |
| 1385 fputs (plot_stream, "unset border; unset tics\n"); | |
|
7565
1e6443ff960f
handle axes linewidth property
John W. Eaton <jwe@octave.org>
parents:
7564
diff
changeset
|
1386 else |
|
1e6443ff960f
handle axes linewidth property
John W. Eaton <jwe@octave.org>
parents:
7564
diff
changeset
|
1387 fprintf (plot_stream, "set border lw %f;\n", axis_obj.linewidth); |
| 7060 | 1388 endif |
| 1389 | |
| 6758 | 1390 if (strcmpi (axis_obj.key, "on")) |
| 1391 if (strcmpi (axis_obj.keybox, "on")) | |
| 6405 | 1392 box = "box"; |
| 1393 else | |
| 1394 box = "nobox"; | |
| 1395 endif | |
|
8291
53f35799b235
Add support for left/right argument to the legend function
David Bateman <dbateman@free.fr>
parents:
8242
diff
changeset
|
1396 if (strcmpi (axis_obj.keyreverse, "on")) |
|
53f35799b235
Add support for left/right argument to the legend function
David Bateman <dbateman@free.fr>
parents:
8242
diff
changeset
|
1397 reverse = "reverse"; |
|
53f35799b235
Add support for left/right argument to the legend function
David Bateman <dbateman@free.fr>
parents:
8242
diff
changeset
|
1398 else |
|
53f35799b235
Add support for left/right argument to the legend function
David Bateman <dbateman@free.fr>
parents:
8242
diff
changeset
|
1399 reverse = "noreverse"; |
|
53f35799b235
Add support for left/right argument to the legend function
David Bateman <dbateman@free.fr>
parents:
8242
diff
changeset
|
1400 endif |
| 6405 | 1401 inout = "inside"; |
| 6977 | 1402 keypos = axis_obj.keypos; |
| 1403 if (ischar (keypos)) | |
| 1404 keypos = lower (keypos); | |
| 1405 keyout = findstr (keypos, "outside"); | |
| 1406 if (! isempty (keyout)) | |
| 1407 inout = "outside"; | |
| 7119 | 1408 keypos = keypos(1:keyout-1); |
| 6977 | 1409 endif |
| 1410 endif | |
| 1411 switch (keypos) | |
| 6405 | 1412 case -1 |
| 6977 | 1413 pos = "right top"; |
| 6405 | 1414 inout = "outside"; |
| 1415 case 1 | |
| 1416 pos = "right top"; | |
| 1417 case 2 | |
| 1418 pos = "left top"; | |
| 1419 case 3 | |
| 1420 pos = "left bottom"; | |
| 6977 | 1421 case {4, 0} |
| 6405 | 1422 pos = "right bottom"; |
| 6977 | 1423 case "north" |
| 1424 pos = "center top"; | |
| 1425 case "south" | |
| 1426 pos = "center bottom"; | |
| 1427 case "east" | |
| 1428 pos = "right center"; | |
| 1429 case "west" | |
| 1430 pos = "left center"; | |
| 1431 case "northeast" | |
| 1432 pos = "right top"; | |
| 1433 case "northwest" | |
| 1434 pos = "left top"; | |
| 1435 case "southeast" | |
| 1436 pos = "right bottom"; | |
| 1437 case "southwest" | |
| 1438 pos = "left bottom"; | |
| 1439 case "best" | |
| 1440 pos = ""; | |
| 1441 warning ("legend: 'Best' not yet implemented for location specifier.\n"); | |
| 8506 | 1442 ## Least conflict with data in plot. |
| 1443 ## Least unused space outside plot. | |
| 6405 | 1444 otherwise |
| 1445 pos = ""; | |
| 1446 endswitch | |
|
9191
ad33527d2e51
Have 'legend' inherit font properties from the parent axis.
Ben Abbott <bpabbott@mac.com>
parents:
9110
diff
changeset
|
1447 if (__gnuplot_has_feature__ ("key_has_font_properties")) |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
1448 fontspec = create_fontspec (axis_obj.fontname, axis_obj.fontsize, gnuplot_term); |
|
9191
ad33527d2e51
Have 'legend' inherit font properties from the parent axis.
Ben Abbott <bpabbott@mac.com>
parents:
9110
diff
changeset
|
1449 else |
|
ad33527d2e51
Have 'legend' inherit font properties from the parent axis.
Ben Abbott <bpabbott@mac.com>
parents:
9110
diff
changeset
|
1450 fontspec = ""; |
|
ad33527d2e51
Have 'legend' inherit font properties from the parent axis.
Ben Abbott <bpabbott@mac.com>
parents:
9110
diff
changeset
|
1451 endif |
|
ad33527d2e51
Have 'legend' inherit font properties from the parent axis.
Ben Abbott <bpabbott@mac.com>
parents:
9110
diff
changeset
|
1452 fprintf (plot_stream, "set key %s %s %s %s %s;\n", inout, pos, box, |
|
ad33527d2e51
Have 'legend' inherit font properties from the parent axis.
Ben Abbott <bpabbott@mac.com>
parents:
9110
diff
changeset
|
1453 reverse, fontspec); |
| 6405 | 1454 else |
| 1455 fputs (plot_stream, "unset key;\n"); | |
| 1456 endif | |
| 1457 | |
| 1458 fputs (plot_stream, "set style data lines;\n"); | |
| 1459 | |
| 1460 if (! use_gnuplot_for_images) | |
| 1461 for i = 1:ximg_data_idx | |
| 1462 view_fcn (xlim, ylim, ximg_data{i}, view_zoom, view_cmd); | |
| 1463 endfor | |
| 1464 endif | |
| 1465 | |
|
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
|
1466 cmap = [cmap; addedcmap]; |
|
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
|
1467 cmap_sz = cmap_sz + rows(addedcmap); |
| 7189 | 1468 if (length(cmap) > 0) |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1469 fprintf (plot_stream, |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1470 "set palette positive color model RGB maxcolors %i;\n", |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1471 cmap_sz); |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1472 fprintf (plot_stream, |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1473 "set palette file \"-\" binary record=%d using 1:2:3:4;\n", |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1474 cmap_sz); |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1475 fwrite (plot_stream, [1:cmap_sz; cmap.'], "float32"); |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1476 fwrite (plot_stream, "\n"); |
| 7189 | 1477 endif |
| 8208 | 1478 |
| 1479 fputs (plot_stream, "unset colorbox;\n"); | |
| 7189 | 1480 |
| 6405 | 1481 if (have_data) |
| 1482 if (nd == 2) | |
| 1483 plot_cmd = "plot"; | |
| 1484 else | |
| 1485 plot_cmd = "splot"; | |
| 1486 rot_x = 90 - axis_obj.view(2); | |
| 1487 rot_z = axis_obj.view(1); | |
| 1488 while (rot_z < 0) | |
| 1489 rot_z += 360; | |
| 1490 endwhile | |
| 6461 | 1491 fputs (plot_stream, "set ticslevel 0;\n"); |
| 7271 | 1492 if (view_map && rot_x == 0 && rot_z == 0) |
| 1493 fputs (plot_stream, "set view map;\n"); | |
| 1494 else | |
| 1495 fprintf (plot_stream, "set view %.15g, %.15g;\n", rot_x, rot_z); | |
| 1496 endif | |
| 6405 | 1497 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
|
1498 if (have_3d_patch (1)) |
|
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
|
1499 fputs (plot_stream, "set pm3d depthorder\n"); |
|
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
|
1500 fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, |
|
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
|
1501 usingclause{1}, titlespec{1}, withclause{1}); |
|
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
|
1502 elseif (is_image_data (1)) |
|
8226
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1503 fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1504 usingclause{1}, titlespec{1}, withclause{1}); |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1505 else |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1506 fprintf (plot_stream, "%s \"-\" binary format='%%float64' %s %s %s \\\n", plot_cmd, |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1507 usingclause{1}, titlespec{1}, withclause{1}); |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1508 endif |
| 6405 | 1509 for i = 2:data_idx |
|
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
|
1510 if (have_3d_patch (i)) |
|
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
|
1511 fprintf (plot_stream, ", \"-\" %s %s %s \\\n", |
|
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
|
1512 usingclause{i}, titlespec{i}, withclause{i}); |
|
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
|
1513 elseif (is_image_data (i)) |
|
9272
3eda945bda43
__go_draw_axes__.m: Fix rendering of overlaping images and line objects. Add demos as well.
Ben Abbott <bpabbott@mac.com>
parents:
9257
diff
changeset
|
1514 if (! is_image_data (i-1)) |
|
3eda945bda43
__go_draw_axes__.m: Fix rendering of overlaping images and line objects. Add demos as well.
Ben Abbott <bpabbott@mac.com>
parents:
9257
diff
changeset
|
1515 fputs (plot_stream, "; "); |
|
3eda945bda43
__go_draw_axes__.m: Fix rendering of overlaping images and line objects. Add demos as well.
Ben Abbott <bpabbott@mac.com>
parents:
9257
diff
changeset
|
1516 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
|
1517 fprintf (plot_stream, "%s \"-\" %s %s %s \\\n", plot_cmd, |
|
8226
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1518 usingclause{i}, titlespec{i}, withclause{i}); |
|
9272
3eda945bda43
__go_draw_axes__.m: Fix rendering of overlaping images and line objects. Add demos as well.
Ben Abbott <bpabbott@mac.com>
parents:
9257
diff
changeset
|
1519 elseif (is_image_data (i-1)) |
|
3eda945bda43
__go_draw_axes__.m: Fix rendering of overlaping images and line objects. Add demos as well.
Ben Abbott <bpabbott@mac.com>
parents:
9257
diff
changeset
|
1520 fprintf (plot_stream, "%s \"-\" binary format='%%float64' %s %s %s \\\n", plot_cmd, |
|
3eda945bda43
__go_draw_axes__.m: Fix rendering of overlaping images and line objects. Add demos as well.
Ben Abbott <bpabbott@mac.com>
parents:
9257
diff
changeset
|
1521 usingclause{i}, titlespec{i}, withclause{i}); |
|
8226
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1522 else |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1523 fprintf (plot_stream, ", \"-\" binary format='%%float64' %s %s %s \\\n", |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1524 usingclause{i}, titlespec{i}, withclause{i}); |
|
50fa927b4e49
Fix for images with new gnuplot/binary transfer code
David Bateman <dbateman@free.fr>
parents:
8222
diff
changeset
|
1525 endif |
| 6405 | 1526 endfor |
| 1527 fputs (plot_stream, ";\n"); | |
| 1528 for i = 1:data_idx | |
|
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
|
1529 if (have_3d_patch (i)) |
|
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
|
1530 ## Can't write 3d patch data as binary as can't plot more than |
|
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
|
1531 ## a single patch at a time and have to plot all patches together |
|
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
|
1532 ## so that the gnuplot depth ordering is done correctly |
|
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
|
1533 for j = 1 : 4 : columns(data{i}) |
|
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
|
1534 if (j != 1) |
|
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
|
1535 fputs (plot_stream, "\n\n"); |
|
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
|
1536 endif |
|
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
|
1537 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j).'); |
|
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
|
1538 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n\n", data{i}(:,j+1).'); |
|
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
|
1539 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+2).'); |
|
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
|
1540 fprintf (plot_stream, "%.15g %.15g %.15g %.15g\n", data{i}(:,j+3).'); |
|
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
|
1541 endfor |
|
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
|
1542 fputs (plot_stream, "e\n"); |
|
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
|
1543 elseif (is_image_data(i)) |
| 6464 | 1544 fwrite (plot_stream, data{i}, "float32"); |
| 1545 else | |
| 7119 | 1546 __gnuplot_write_data__ (plot_stream, data{i}, nd, parametric(i), |
| 1547 have_cdata(i)); | |
| 6405 | 1548 endif |
| 1549 endfor | |
| 6431 | 1550 else |
| 1551 fputs (plot_stream, "plot \"-\";\nInf Inf\ne\n"); | |
| 6405 | 1552 endif |
| 1553 | |
| 8506 | 1554 ## Needed to allow mouse rotation with pcolor. |
| 7271 | 1555 if (view_map) |
| 1556 fputs (plot_stream, "unset view;\n"); | |
| 1557 endif | |
| 1558 | |
| 6405 | 1559 fflush (plot_stream); |
| 1560 | |
| 1561 else | |
| 1562 print_usage (); | |
| 7109 | 1563 endif |
| 6405 | 1564 |
| 1565 endfunction | |
| 1566 | |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
1567 function fontspec = create_fontspec (f, s, gp_term) |
|
9468
5af462716bff
Add support for gnuplot's Lua-TikZ terminal.
Ben Abbott <bpabbott@mac.com>
parents:
9438
diff
changeset
|
1568 if (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
|
1569 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
|
1570 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
|
1571 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
|
1572 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
|
1573 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
|
1574 |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1575 function style = do_linestyle_command (obj, linecolor, idx, mono, |
|
10121
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1576 plot_stream, markerorder, errbars = "") |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1577 style = {}; |
| 6405 | 1578 |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
1579 fprintf (plot_stream, "set style line %d default;\n", idx); |
| 6405 | 1580 fprintf (plot_stream, "set style line %d", idx); |
| 1581 | |
| 1582 found_style = false; | |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1583 if (isnumeric (linecolor)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1584 color = linecolor; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1585 if (! mono) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1586 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1587 round (255*color)); |
| 6405 | 1588 endif |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1589 else |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1590 color = [0, 0, 0]; |
| 6405 | 1591 endif |
| 1592 | |
| 1593 if (isfield (obj, "linestyle")) | |
| 1594 switch (obj.linestyle) | |
| 1595 case "-" | |
| 6415 | 1596 lt = "1"; |
| 6405 | 1597 case "--" |
| 6415 | 1598 lt = "2"; |
| 6405 | 1599 case ":" |
| 6415 | 1600 lt = "3"; |
| 6405 | 1601 case "-." |
| 6415 | 1602 lt = "6"; |
| 6405 | 1603 case "none" |
| 1604 lt = ""; | |
| 1605 otherwise | |
| 1606 lt = ""; | |
| 1607 endswitch | |
| 6843 | 1608 |
| 1609 ## FIXME -- linetype is currently broken, since it disables the | |
| 1610 ## gnuplot default dashed and solid linestyles with the only | |
| 1611 ## benefit of being able to specify '--' and get a single sized | |
| 1612 ## dashed line of identical dash pattern for all called this way. | |
| 1613 ## All dash patterns are a subset of "with lines" and none of the | |
| 1614 ## lt specifications will correctly propagate into the x11 terminal | |
| 1615 ## or the print command. Therefore, it is currently disabled in | |
| 1616 ## order to allow print (..., "-dashed") etc. to work correctly. | |
| 1617 | |
| 1618 ## if (! isempty (lt)) | |
| 1619 ## fprintf (plot_stream, " linetype %s", lt); | |
| 1620 ## endif | |
| 1621 | |
| 6405 | 1622 else |
| 1623 lt = ""; | |
| 1624 endif | |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1625 if (! isempty (errbars)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1626 found_style = true; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1627 endif |
| 6405 | 1628 |
| 1629 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
|
1630 fprintf (plot_stream, " linewidth %f", obj.linewidth); |
| 6405 | 1631 found_style = true; |
| 1632 endif | |
| 1633 | |
| 1634 if (isfield (obj, "marker")) | |
| 1635 switch (obj.marker) | |
|
10121
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1636 case "@" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1637 [pt, pt2] = next_marker (markerorder); |
| 6405 | 1638 case "+" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1639 pt = pt2 = "1"; |
| 6405 | 1640 case "o" |
| 6413 | 1641 pt = "6"; |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1642 pt2 = "7"; |
| 6405 | 1643 case "*" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1644 pt = pt2 = "3"; |
| 6405 | 1645 case "." |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1646 pt = pt2 = "0"; |
| 6405 | 1647 case "x" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1648 pt = pt2 = "2"; |
| 6405 | 1649 case {"square", "s"} |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1650 pt = "4"; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1651 pt2 = "5"; |
| 6405 | 1652 case {"diamond", "d"} |
| 1653 pt = "13"; | |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1654 pt2 = "14"; |
| 6405 | 1655 case "^" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1656 pt = "8"; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1657 pt2 = "9"; |
| 6405 | 1658 case "v" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1659 pt = "10"; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1660 pt2 = "11"; |
| 6405 | 1661 case ">" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1662 ## FIXME missing point type |
| 6405 | 1663 pt = "8"; |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1664 pt2 = "9"; |
| 6405 | 1665 case "<" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1666 ## FIXME missing point type |
| 6405 | 1667 pt = "10"; |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1668 pt2 = "11"; |
| 6405 | 1669 case {"pentagram", "p"} |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1670 ## FIXME missing point type |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1671 pt = pt2 = "3"; |
| 6405 | 1672 case {"hexagram", "h"} |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1673 pt = pt2 = "3"; |
| 6405 | 1674 case "none" |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1675 pt = pt2 = ""; |
| 6405 | 1676 otherwise |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1677 pt = pt2 = ""; |
| 6405 | 1678 endswitch |
| 1679 else | |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1680 pt = pt2 = ""; |
| 6405 | 1681 endif |
| 1682 | |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1683 if (! isempty (pt)) |
| 6465 | 1684 found_style = true; |
| 1685 endif | |
| 1686 | |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1687 sidx = 1; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1688 if (isempty (errbars)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1689 if (isempty (lt)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1690 style {sidx} = ""; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1691 else |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1692 style {sidx} = "lines"; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1693 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1694 |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1695 facesame = true; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1696 if (! isequal (pt, pt2) && isfield (obj, "markerfacecolor") |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1697 && !strncmp (obj.markerfacecolor, "none", 4)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1698 if (strncmp (obj.markerfacecolor, "auto", 4) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1699 || ! isnumeric (obj.markerfacecolor) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1700 || (isnumeric (obj.markerfacecolor) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1701 && isequal (color, obj.markerfacecolor))) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1702 style {sidx} = strcat (style{sidx}, "points"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1703 if (! isempty (pt2)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1704 fprintf (plot_stream, " pointtype %s", pt2); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1705 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1706 if (isfield (obj, "markersize")) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1707 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1708 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1709 else |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1710 facesame = false; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1711 if (! found_style) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1712 fputs (plot_stream, " default"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1713 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1714 fputs (plot_stream, ";\n"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1715 if (! isempty (style {sidx})) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1716 sidx ++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1717 idx ++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1718 else |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1719 fputs (plot_stream, ";\n"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1720 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1721 fprintf (plot_stream, "set style line %d default;\n", idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1722 fprintf (plot_stream, "set style line %d", idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1723 if (isnumeric (obj.markerfacecolor) && ! mono) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1724 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1725 round (255*obj.markerfacecolor)); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1726 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1727 style {sidx} = "points"; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1728 if (! isempty (pt2)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1729 fprintf (plot_stream, " pointtype %s", pt2); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1730 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1731 if (isfield (obj, "markersize")) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1732 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1733 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1734 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1735 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1736 if (isfield (obj, "markeredgecolor") |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1737 && !strncmp (obj.markeredgecolor, "none", 4)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1738 if (facesame && (strncmp (obj.markeredgecolor, "auto", 4) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1739 || ! isnumeric (obj.markeredgecolor) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1740 || (isnumeric (obj.markeredgecolor) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1741 && isequal (color, obj.markeredgecolor)))) |
|
10111
b52cba8be2eb
Fix for markerfacecolor and markeredgecolor properties with unfillable markers like '+'
David Bateman <dbateman@free.fr>
parents:
10089
diff
changeset
|
1742 if (sidx == 1 && ((length (style {sidx}) == 5 |
|
9729
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1743 && strncmp (style {sidx}, "lines", 5)) || isempty (style {sidx}))) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1744 style {sidx} = strcat (style{sidx}, "points"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1745 if (! isempty (pt)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1746 fprintf (plot_stream, " pointtype %s", pt); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1747 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1748 if (isfield (obj, "markersize")) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1749 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1750 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1751 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1752 else |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1753 if (! found_style) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1754 fputs (plot_stream, " default"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1755 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1756 fputs (plot_stream, ";\n"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1757 if (!isempty (style {sidx})) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1758 sidx ++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1759 idx ++; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1760 else |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1761 fputs (plot_stream, ";\n"); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1762 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1763 fprintf (plot_stream, "set style line %d default;\n", idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1764 fprintf (plot_stream, "set style line %d", idx); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1765 if (! mono) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1766 if (strncmp (obj.markeredgecolor, "auto", 4)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1767 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1768 round (255*color)); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1769 elseif (isnumeric (obj.markeredgecolor) && ! mono) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1770 fprintf (plot_stream, " linecolor rgb \"#%02x%02x%02x\"", |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1771 round (255*obj.markeredgecolor)); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1772 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1773 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1774 style {sidx} = "points"; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1775 if (! isempty (pt)) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1776 fprintf (plot_stream, " pointtype %s", pt); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1777 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1778 if (isfield (obj, "markersize")) |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1779 fprintf (plot_stream, " pointsize %f", obj.markersize / 3); |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1780 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1781 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1782 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1783 else |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1784 style{1} = errbars; |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1785 endif |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1786 |
|
3b7e644bb46d
Treat markerfacecolor and markeredgecolor properties for lines and surfaces
David Bateman <dbateman@free.fr>
parents:
9472
diff
changeset
|
1787 if (! found_style && isempty (style {1})) |
| 6405 | 1788 fputs (plot_stream, " default"); |
| 1789 endif | |
| 1790 | |
| 1791 fputs (plot_stream, ";\n"); | |
| 1792 | |
| 1793 endfunction | |
| 6510 | 1794 |
|
10121
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1795 function [pt, pt2] = next_marker (__set__) |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1796 persistent __next_marker__ = 0; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1797 |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1798 if (isnumeric (__set__)) |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1799 __next_marker__ = __set__; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1800 else |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1801 |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1802 __marker__ = __set__ (rem (__next_marker__ ++, length (__set__)) + 1); |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1803 switch (__marker__) |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1804 case "+" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1805 pt = pt2 = "1"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1806 case "o" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1807 pt = "6"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1808 pt2 = "7"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1809 case "*" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1810 pt = pt2 = "3"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1811 case "." |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1812 pt = pt2 = "0"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1813 case "x" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1814 pt = pt2 = "2"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1815 case "s" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1816 pt = "4"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1817 pt2 = "5"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1818 case "d" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1819 pt = "13"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1820 pt2 = "14"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1821 case "^" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1822 pt = "8"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1823 pt2 = "9"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1824 case "v" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1825 pt = "10"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1826 pt2 = "11"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1827 case ">" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1828 ## FIXME missing point type |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1829 pt = "8"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1830 pt2 = "9"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1831 case "<" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1832 ## FIXME missing point type |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1833 pt = "10"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1834 pt2 = "11"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1835 case "p" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1836 ## FIXME missing point type |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1837 pt = pt2 = "3"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1838 case "h" |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1839 pt = pt2 = "3"; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1840 otherwise |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1841 pt = pt2 = ""; |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1842 endswitch |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1843 endif |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1844 endfunction |
|
b5cc666da6ca
Support the '@' marker that was present in Octave 2.1.x
David Bateman <dbateman@free.fr>
parents:
10111
diff
changeset
|
1845 |
| 7316 | 1846 function nd = __calc_dimensions__ (obj) |
| 1847 kids = obj.children; | |
| 1848 nd = 2; | |
| 1849 for i = 1:length (kids) | |
| 1850 obj = get (kids(i)); | |
| 1851 switch (obj.type) | |
| 1852 case {"image", "text"} | |
| 1853 ## ignore as they | |
| 1854 case {"line", "patch"} | |
| 1855 if (! isempty (obj.zdata)) | |
| 1856 nd = 3; | |
| 1857 endif | |
| 1858 case "surface" | |
| 1859 nd = 3; | |
|
7865
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1860 case "hggroup" |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1861 obj_nd = __calc_dimensions__ (obj); |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1862 if (obj_nd == 3) |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1863 nd = 3; |
|
b74039822fd2
Add support for hggroup
Michael Goffioul <michael.goffioul@gmail.com>
parents:
7726
diff
changeset
|
1864 endif |
| 7316 | 1865 endswitch |
| 1866 endfor | |
| 1867 endfunction | |
| 1868 | |
| 7119 | 1869 function __gnuplot_write_data__ (plot_stream, data, nd, parametric, cdata) |
| 6510 | 1870 |
| 1871 ## DATA is already transposed. | |
| 1872 | |
| 1873 ## FIXME -- this may need to be converted to C++ for speed. | |
| 1874 | |
| 6605 | 1875 ## Convert NA elements to normal NaN values because fprintf writes |
| 1876 ## "NA" and that confuses gnuplot. | |
| 1877 idx = find (isna (data)); | |
| 1878 if (any (idx)) | |
| 1879 data(idx) = NaN; | |
| 1880 endif | |
| 1881 | |
| 6510 | 1882 if (nd == 2) |
|
8217
f74cb5e3a6c1
send binary data to gnuplot
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8216
diff
changeset
|
1883 fwrite (plot_stream, data, "float64"); |
| 7109 | 1884 elseif (nd == 3) |
| 6510 | 1885 if (parametric) |
|
8217
f74cb5e3a6c1
send binary data to gnuplot
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8216
diff
changeset
|
1886 fwrite (plot_stream, data, "float64"); |
| 6510 | 1887 else |
| 7170 | 1888 nr = rows (data); |
| 7119 | 1889 if (cdata) |
| 7170 | 1890 for j = 1:4:nr |
|
8217
f74cb5e3a6c1
send binary data to gnuplot
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8216
diff
changeset
|
1891 fwrite (plot_stream, data(j:j+3,:), "float64"); |
| 7119 | 1892 endfor |
| 1893 else | |
| 7170 | 1894 for j = 1:3:nr |
|
8217
f74cb5e3a6c1
send binary data to gnuplot
Daniel J. Sebald <daniel.sebald@ieee.org>
parents:
8216
diff
changeset
|
1895 fwrite (plot_stream, data(j:j+2,:), "float64"); |
| 7119 | 1896 endfor |
| 1897 endif | |
| 7109 | 1898 endif |
| 6510 | 1899 endif |
| 1900 | |
| 1901 endfunction | |
| 6745 | 1902 |
|
9257
ab952265ad06
__go_draw_axes__.m: Properly render TeX symbols for x11.
Ben Abbott <bpabbott@mac.com>
parents:
9191
diff
changeset
|
1903 function do_tics (obj, plot_stream, ymirror, mono, gnuplot_term) |
|
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1904 |
|
8518
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
1905 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
|
1906 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
|
1907 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
|
1908 |
|
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
|
1909 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
|
1910 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
|
1911 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
|
1912 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
|
1913 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
|
1914 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
|
1915 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
|
1916 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
|
1917 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
|
1918 |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
1919 [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
|
1920 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
|
1921 |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
1922 ## 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
|
1923 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
|
1924 |
| 6809 | 1925 if (strcmpi (obj.xaxislocation, "top")) |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1926 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1927 obj.xticklabel, obj.xcolor, "x2", plot_stream, true, mono, |
|
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
|
1928 "border", obj.tickdir, ticklength, fontname, fontspec, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1929 obj.interpreter, obj.xscale); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1930 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
1931 obj.xcolor, "x", plot_stream, true, mono, "border", |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1932 "", "", fontname, fontspec, obj.interpreter, obj.xscale); |
| 7321 | 1933 elseif (strcmpi (obj.xaxislocation, "zero")) |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1934 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1935 obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, |
|
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
|
1936 "axis", obj.tickdir, ticklength, fontname, fontspec, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1937 obj.interpreter, obj.xscale); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1938 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
1939 obj.xcolor, "x2", plot_stream, true, mono, "axis", |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1940 "", "", fontname, fontspec, obj.interpreter, obj.xscale); |
| 6809 | 1941 else |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1942 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1943 obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, |
|
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
|
1944 "border", obj.tickdir, ticklength, fontname, fontspec, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1945 obj.interpreter, obj.xscale); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1946 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
1947 obj.xcolor, "x2", plot_stream, true, mono, "border", |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1948 "", "", fontname, fontspec, obj.interpreter, obj.xscale); |
| 6809 | 1949 endif |
| 1950 if (strcmpi (obj.yaxislocation, "right")) | |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1951 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1952 obj.yticklabel, obj.ycolor, "y2", plot_stream, ymirror, mono, |
|
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
|
1953 "border", obj.tickdir, ticklength, fontname, fontspec, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1954 obj.interpreter, obj.yscale); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1955 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
1956 obj.ycolor, "y", plot_stream, ymirror, mono, "border", |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1957 "", "", fontname, fontspec, obj.interpreter, obj.yscale); |
|
8943
4a312440b262
__go_draw_axes__.m (do_tics): fix typo
Ben Abbott <bpabbott@mac.com>
parents:
8920
diff
changeset
|
1958 elseif (strcmpi (obj.yaxislocation, "zero")) |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1959 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1960 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, |
|
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
|
1961 "axis", obj.tickdir, ticklength, fontname, fontspec, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1962 obj.interpreter, obj.yscale); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1963 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
1964 obj.ycolor, "y2", plot_stream, ymirror, mono, "axis", |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1965 "", "", fontname, fontspec, obj.interpreter, obj.yscale); |
| 6809 | 1966 else |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1967 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1968 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, |
|
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
|
1969 "border", obj.tickdir, ticklength, fontname, fontspec, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1970 obj.interpreter, obj.yscale); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1971 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
1972 obj.ycolor, "y2", plot_stream, ymirror, mono, "border", |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1973 "", "", fontname, fontspec, obj.interpreter, obj.yscale); |
| 6809 | 1974 endif |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1975 do_tics_1 (obj.ztickmode, obj.ztick, obj.zminortick, obj.zticklabelmode, |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1976 obj.zticklabel, obj.zcolor, "z", plot_stream, true, mono, |
|
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
|
1977 "border", obj.tickdir, ticklength, fontname, fontspec, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1978 obj.interpreter, obj.yscale); |
| 6745 | 1979 endfunction |
| 1980 | |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
1981 function do_tics_1 (ticmode, tics, mtics, labelmode, labels, color, ax, |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
1982 plot_stream, mirror, mono, axispos, tickdir, ticklength, |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1983 fontname, fontspec, interpreter, scale) |
|
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1984 persistent warned_latex = false; |
|
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1985 if (strcmpi (interpreter, "tex")) |
|
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1986 for n = 1 : numel(labels) |
|
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1987 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
|
1988 endfor |
|
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1989 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
|
1990 if (! warned_latex) |
|
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1991 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
|
1992 warned_latex = true; |
|
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1993 endif |
|
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
1994 endif |
|
9302
5542c40e40ac
__go_draw_axes__.m: Change strncmpi(scale,'lo') -> strcmp(scale,'log').
Ben Abbott <bpabbott@mac.com>
parents:
9301
diff
changeset
|
1995 if (strcmp (scale, "log")) |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1996 fmt = "10^{%T}"; |
|
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
|
1997 num_mtics = 10; |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1998 else |
|
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
1999 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
|
2000 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
|
2001 endif |
| 7269 | 2002 colorspec = get_text_colorspec (color, mono); |
|
8112
31e86163b752
Add the datetick function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
2003 if (strcmpi (ticmode, "manual") || strcmpi (labelmode, "manual")) |
| 6745 | 2004 if (isempty (tics)) |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2005 fprintf (plot_stream, "unset %stics;\nunset m%stics;\n", ax, ax); |
|
8953
a6945f92b868
__go_draw_axes__.m: Unset the {x,y,z}ticks when initializing\n\teach axis. Set ticklabels when the ticklabels are empty and when\n\tticklabelmode=="manual".
Ben Abbott <bpabbott@mac.com>
parents:
8943
diff
changeset
|
2006 elseif (strcmpi (labelmode, "manual")) |
| 6751 | 2007 if (ischar (labels)) |
| 2008 labels = cellstr (labels); | |
| 2009 endif | |
|
8354
534fd216278c
__go_draw_axes__.m: xticklabel should accept a numeric vector.
Ben Abbott <bpabbott@mac.com>
parents:
8344
diff
changeset
|
2010 if (isnumeric (labels)) |
|
534fd216278c
__go_draw_axes__.m: xticklabel should accept a numeric vector.
Ben Abbott <bpabbott@mac.com>
parents:
8344
diff
changeset
|
2011 labels = num2str (real (labels(:))); |
|
534fd216278c
__go_draw_axes__.m: xticklabel should accept a numeric vector.
Ben Abbott <bpabbott@mac.com>
parents:
8344
diff
changeset
|
2012 endif |
|
534fd216278c
__go_draw_axes__.m: xticklabel should accept a numeric vector.
Ben Abbott <bpabbott@mac.com>
parents:
8344
diff
changeset
|
2013 if (ischar (labels)) |
|
534fd216278c
__go_draw_axes__.m: xticklabel should accept a numeric vector.
Ben Abbott <bpabbott@mac.com>
parents:
8344
diff
changeset
|
2014 labels = permute (cellstr (labels), [2, 1]); |
|
534fd216278c
__go_draw_axes__.m: xticklabel should accept a numeric vector.
Ben Abbott <bpabbott@mac.com>
parents:
8344
diff
changeset
|
2015 endif |
| 6745 | 2016 if (iscellstr (labels)) |
| 6751 | 2017 k = 1; |
| 2018 ntics = numel (tics); | |
| 2019 nlabels = numel (labels); | |
| 6745 | 2020 fprintf (plot_stream, "set format %s \"%%s\";\n", ax); |
| 7206 | 2021 if (mirror) |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2022 fprintf (plot_stream, "set %stics %s %s %s mirror (", ax, |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2023 tickdir, ticklength, axispos); |
| 7206 | 2024 else |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2025 fprintf (plot_stream, "set %stics %s %s %s nomirror (", ax, |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2026 tickdir, ticklength, axispos); |
| 7206 | 2027 endif |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2028 |
| 7228 | 2029 labels = regexprep(labels, "%", "%%"); |
| 6745 | 2030 for i = 1:ntics |
|
8112
31e86163b752
Add the datetick function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
2031 fprintf (plot_stream, " \"%s\" %.15g", labels{k++}, tics(i)); |
| 6745 | 2032 if (i < ntics) |
| 2033 fputs (plot_stream, ", "); | |
| 2034 endif | |
| 2035 if (k > nlabels) | |
| 2036 k = 1; | |
| 2037 endif | |
| 2038 endfor | |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
2039 fprintf (plot_stream, ") %s %s;\n", colorspec, fontspec); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2040 if (strcmp (mtics, "on")) |
|
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
|
2041 fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2042 else |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2043 fprintf (plot_stream, "unset m%stics;\n", ax); |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2044 endif |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2045 else |
| 6745 | 2046 error ("unsupported type of ticklabel"); |
| 2047 endif | |
| 2048 else | |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
2049 fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); |
| 7206 | 2050 if (mirror) |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2051 fprintf (plot_stream, "set %stics %s %s %s mirror (", ax, tickdir, |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2052 ticklength, axispos); |
| 7206 | 2053 else |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2054 fprintf (plot_stream, "set %stics %s %s %s nomirror (", ax, tickdir, |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2055 ticklength, axispos); |
| 7206 | 2056 endif |
|
8112
31e86163b752
Add the datetick function
David Bateman <dbateman@free.fr>
parents:
8102
diff
changeset
|
2057 fprintf (plot_stream, " %.15g,", tics(1:end-1)); |
|
8220
4e05ba66ead2
x/y/z-ticklabels respect axis font properties.
Ben Abbott <bpabbott@mac.com>
parents:
8218
diff
changeset
|
2058 fprintf (plot_stream, " %.15g) %s;\n", tics(end), fontspec); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2059 if (strcmp (mtics, "on")) |
|
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
|
2060 fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2061 else |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2062 fprintf (plot_stream, "unset m%stics;\n", ax); |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2063 endif |
| 6745 | 2064 endif |
| 2065 else | |
|
9301
f2152fad3563
__go_draw_axes__.m: For log-scale axes use format '10^{%T}'.
Ben Abbott <bpabbott@mac.com>
parents:
9281
diff
changeset
|
2066 fprintf (plot_stream, "set format %s \"%s\";\n", ax, fmt); |
| 7206 | 2067 if (mirror) |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2068 fprintf (plot_stream, "set %stics %s %s %s mirror %s %s;\n", ax, |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2069 axispos, tickdir, ticklength, colorspec, fontspec); |
| 7206 | 2070 else |
|
8740
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2071 fprintf (plot_stream, "set %stics %s %s %s nomirror %s %s;\n", ax, |
|
cb0ea772a4af
Initialize axes ticklength property.
Ben Abbott <bpabbott@mac.com>
parents:
8665
diff
changeset
|
2072 tickdir, ticklength, axispos, colorspec, fontspec); |
| 7206 | 2073 endif |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2074 if (strcmp (mtics, "on")) |
|
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
|
2075 fprintf (plot_stream, "set m%stics %d;\n", ax, num_mtics); |
|
8322
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2076 else |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2077 fprintf (plot_stream, "unset m%stics;\n", ax); |
|
f32a91d99156
Respect the minortick property of the axis objects
David Bateman <dbateman@free.fr>
parents:
8291
diff
changeset
|
2078 endif |
| 7194 | 2079 endif |
| 2080 endfunction | |
| 2081 | |
|
9281
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
2082 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
|
2083 if (isnumeric (ticklabel)) |
|
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2084 ## Use upto 5 significant digits |
|
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2085 ticklabel = num2str (ticklabel(:), 5); |
|
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2086 endif |
|
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2087 if (ischar (ticklabel)) |
|
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2088 if (size (ticklabel, 1) == 1 && any (ticklabel == "|")) |
|
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2089 n = setdiff (findstr (ticklabel, "|"), findstr (ticklabel, '\|')); |
|
9281
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
2090 ticklabel = strsplit (ticklabel, "|"); |
|
9280
40fb718a2e67
__go_draw_axes__.m: Add support for ticklabel separator '|'.
Ben Abbott <bpabbott@mac.com>
parents:
9272
diff
changeset
|
2091 else |
|
9281
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
2092 ticklabel = cellstr (ticklabel); |
|
9280
40fb718a2e67
__go_draw_axes__.m: Add support for ticklabel separator '|'.
Ben Abbott <bpabbott@mac.com>
parents:
9272
diff
changeset
|
2093 endif |
|
9472
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2094 elseif (isempty (ticklabel)) |
|
303f862a896d
__go_draw_axes__.m: Fix ticklabels specified as 2D character array.
Ben Abbott <bpabbott@mac.com>
parents:
9468
diff
changeset
|
2095 ticklabel = {""}; |
|
9280
40fb718a2e67
__go_draw_axes__.m: Add support for ticklabel separator '|'.
Ben Abbott <bpabbott@mac.com>
parents:
9272
diff
changeset
|
2096 else |
|
9281
02b16eeb3167
Fix yticklabels for log scale colorbar.
Ben Abbott <bpabbott@mac.com>
parents:
9280
diff
changeset
|
2097 ticklabel = ticklabel; |
|
8518
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2098 endif |
|
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2099 endfunction |
|
c2c018d7c501
__go_draw_axes__.m: __go_draw_axes__.m: Support non-cell ticklabels.
Ben Abbott <bpabbott@mac.com>
parents:
8510
diff
changeset
|
2100 |
| 7269 | 2101 function colorspec = get_text_colorspec (color, mono) |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
2102 if (mono) |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
2103 colorspec = ""; |
| 7194 | 2104 else |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
2105 colorspec = sprintf ("textcolor rgb \"#%02x%02x%02x\"", |
|
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
2106 round (255*color)); |
| 6745 | 2107 endif |
| 2108 endfunction | |
| 7163 | 2109 |
| 7189 | 2110 function [f, s, fnt, it, bld] = get_fontname_and_size (t) |
| 7163 | 2111 if (isempty (t.fontname)) |
| 7372 | 2112 fnt = "Helvetica"; |
| 7163 | 2113 else |
| 7372 | 2114 fnt = t.fontname; |
| 7168 | 2115 endif |
| 7189 | 2116 f = fnt; |
| 2117 it = false; | |
| 2118 bld = false; | |
| 7372 | 2119 if (! isempty (t.fontweight) && strcmpi (t.fontweight, "bold")) |
| 7168 | 2120 if (! isempty(t.fontangle) |
| 7372 | 2121 && (strcmpi (t.fontangle, "italic") |
| 2122 || strcmpi (t.fontangle, "oblique"))) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2123 f = cstrcat (f, "-bolditalic"); |
| 7189 | 2124 it = true; |
| 2125 bld = true; | |
| 7168 | 2126 else |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2127 f = cstrcat (f, "-bold"); |
| 7189 | 2128 bld = true; |
| 7168 | 2129 endif |
| 2130 elseif (! isempty(t.fontangle) | |
| 7372 | 2131 && (strcmpi (t.fontangle, "italic") |
| 2132 || strcmpi (t.fontangle, "oblique"))) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2133 f = cstrcat (f, "-italic"); |
| 7189 | 2134 it = true; |
| 7163 | 2135 endif |
| 2136 if (isempty (t.fontsize)) | |
| 2137 s = 10; | |
| 2138 else | |
| 2139 s = t.fontsize; | |
| 2140 endif | |
| 2141 endfunction | |
| 7189 | 2142 |
|
8164
0d37c99fc06f
__go_draw_axes__.m: eliminate have_newer_gnuplot variable
John W. Eaton <jwe@octave.org>
parents:
8112
diff
changeset
|
2143 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
|
2144 |
| 7189 | 2145 persistent warned_latex = false; |
| 2146 | |
| 2147 if (strcmp (fld, "string")) | |
| 2148 [f, s, fnt, it, bld] = get_fontname_and_size (obj); | |
| 2149 else | |
| 7372 | 2150 f = "Helvetica"; |
| 7189 | 2151 s = 10; |
| 2152 fnt = f; | |
| 2153 it = false; | |
| 2154 bld = false; | |
| 2155 endif | |
| 2156 | |
| 2157 str = getfield (obj, fld); | |
| 2158 if (enhanced) | |
|
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2159 if (strcmpi (obj.interpreter, "tex")) |
| 7189 | 2160 str = __tex2enhanced__ (str, fnt, it, bld); |
|
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2161 elseif (strcmpi (obj.interpreter, "latex")) |
| 7189 | 2162 if (! warned_latex) |
|
8222
11badf6c9e9f
__go_draw_axes__.m: Support axes interpreter poperty for tick labels.
Ben Abbott <bpabbott@mac.com>
parents:
8220
diff
changeset
|
2163 warning ("latex markup not supported for text objects"); |
| 7189 | 2164 warned_latex = true; |
| 2165 endif | |
| 2166 endif | |
| 2167 endif | |
| 2168 endfunction | |
| 2169 | |
| 2170 function str = __tex2enhanced__ (str, fnt, it, bld) | |
| 2171 persistent sym = __setup_sym_table__ (); | |
| 2172 persistent flds = fieldnames (sym); | |
| 2173 | |
| 2174 [s, e, m] = regexp(str,'\\([a-zA-Z]+|0)','start','end','matches'); | |
| 2175 | |
| 2176 for i = length (s) : -1 : 1 | |
| 2177 ## special case for "\0" and replace with "{/Symbol \306}' | |
| 2178 if (strncmp (m{i}, '\0', 2)) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2179 str = cstrcat (str(1:s(i) - 1), '{/Symbol \306}', str(s(i) + 2:end)); |
| 7189 | 2180 else |
| 2181 f = m{i}(2:end); | |
| 2182 if (isfield (sym, f)) | |
| 2183 g = getfield(sym, f); | |
| 2184 ## FIXME The symbol font doesn't seem to support bold or italic | |
| 2185 ##if (bld) | |
| 2186 ## if (it) | |
| 2187 ## g = regexprep (g, '/Symbol', '/Symbol-bolditalic'); | |
| 2188 ## else | |
| 2189 ## g = regexprep (g, '/Symbol', '/Symbol-bold'); | |
| 2190 ## endif | |
| 2191 ##elseif (it) | |
| 2192 ## g = regexprep (g, '/Symbol', '/Symbol-italic'); | |
| 2193 ##endif | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2194 str = cstrcat (str(1:s(i) - 1), g, str(e(i) + 1:end)); |
| 7189 | 2195 elseif (strncmp (f, "rm", 2)) |
| 2196 bld = false; | |
| 2197 it = false; | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2198 str = cstrcat (str(1:s(i) - 1), '/', fnt, ' ', str(s(i) + 3:end)); |
| 7189 | 2199 elseif (strncmp (f, "it", 2) || strncmp (f, "sl", 2)) |
| 2200 it = true; | |
| 2201 if (bld) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2202 str = cstrcat (str(1:s(i) - 1), '/', fnt, '-bolditalic ', |
| 7189 | 2203 str(s(i) + 3:end)); |
| 2204 else | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2205 str = cstrcat (str(1:s(i) - 1), '/', fnt, '-italic ', |
| 7189 | 2206 str(s(i) + 3:end)); |
| 2207 endif | |
| 2208 elseif (strncmp (f, "bf", 2)) | |
| 2209 bld = true; | |
| 2210 if (it) | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2211 str = cstrcat (str(1:s(i) - 1), '/', fnt, '-bolditalic ', |
| 7189 | 2212 str(2(i) + 3:end)); |
| 2213 else | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2214 str = cstrcat (str(1:s(i) - 1), '/', fnt, '-bold ', |
| 7189 | 2215 str(s(i) + 3:end)); |
| 2216 endif | |
|
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2217 elseif (strcmpi (f, "color")) |
| 7189 | 2218 ## FIXME Ignore \color but remove trailing {} block as well |
| 2219 d = strfind(str(e(i) + 1:end),'}'); | |
| 2220 if (isempty (d)) | |
| 2221 warning ('syntax error in \color argument'); | |
| 2222 else | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2223 str = cstrcat (str(1:s(i) - 1), str(e(i) + d + 1:end)); |
| 7189 | 2224 endif |
|
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2225 elseif(strcmpi (f, "fontname")) |
| 7189 | 2226 b1 = strfind(str(e(i) + 1:end),'{'); |
| 2227 b2 = strfind(str(e(i) + 1:end),'}'); | |
| 2228 if (isempty(b1) || isempty(b2)) | |
| 2229 warning ('syntax error in \fontname argument'); | |
| 2230 else | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2231 str = cstrcat (str(1:s(i) - 1), '/', |
| 7189 | 2232 str(e(i)+b1(1) + 1:e(i)+b2(1)-1), '{}', |
| 2233 str(e(i) + b2(1) + 1:end)); | |
| 2234 endif | |
|
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8171
diff
changeset
|
2235 elseif(strcmpi (f, "fontsize")) |
| 7189 | 2236 b1 = strfind(str(e(i) + 1:end),'{'); |
| 2237 b2 = strfind(str(e(i) + 1:end),'}'); | |
| 2238 if (isempty(b1) || isempty(b2)) | |
| 2239 warning ('syntax error in \fontname argument'); | |
| 2240 else | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2241 str = cstrcat (str(1:s(i) - 1), '/=', |
| 7189 | 2242 str(e(i)+b1(1) + 1:e(i)+b2(1)-1), '{}', |
| 2243 str(e(i) + b2(1) + 1:end)); | |
| 2244 endif | |
| 2245 else | |
| 2246 ## Last desperate attempt to treat the symbol. Look for things | |
| 2247 ## like \pix, that should be translated to the symbol Pi and x | |
| 2248 for j = 1 : length (flds) | |
| 2249 if (strncmp (flds{j}, f, length (flds{j}))) | |
| 2250 g = getfield(sym, flds{j}); | |
| 2251 ## FIXME The symbol font doesn't seem to support bold or italic | |
| 2252 ##if (bld) | |
| 2253 ## if (it) | |
| 2254 ## g = regexprep (g, '/Symbol', '/Symbol-bolditalic'); | |
| 2255 ## else | |
| 2256 ## g = regexprep (g, '/Symbol', '/Symbol-bold'); | |
| 2257 ## endif | |
| 2258 ##elseif (it) | |
| 2259 ## g = regexprep (g, '/Symbol', '/Symbol-italic'); | |
| 2260 ##endif | |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2261 str = cstrcat (str(1:s(i) - 1), g, |
| 7189 | 2262 str(s(i) + length (flds{j}) + 1:end)); |
| 2263 break; | |
| 2264 endif | |
| 2265 endfor | |
| 2266 endif | |
| 2267 endif | |
| 2268 endfor | |
| 2269 | |
| 8506 | 2270 ## Prepend @ to things things like _0^x or _{-100}^{100} for |
| 2271 ## alignment But need to put the shorter of the two arguments first. | |
| 2272 ## Carful of nested {} and unprinted characters when defining | |
| 2273 ## shortest.. Don't have to worry about things like ^\theta as they | |
| 2274 ## are already converted to ^{/Symbol q}. | |
| 7189 | 2275 |
| 8506 | 2276 ## FIXME -- This is a mess... Is it worth it just for a "@" character? |
| 7189 | 2277 |
| 2278 [s, m] = regexp(str,'[_\^]','start','matches'); | |
| 2279 i = 1; | |
| 2280 p = 0; | |
| 2281 while (i < length (s)) | |
| 2282 if (i < length(s)) | |
| 2283 if (str(s(i) + p + 1) == "{") | |
| 2284 s1 = strfind(str(s(i) + p + 2:end),'{'); | |
| 2285 si = 1; | |
| 2286 l1 = strfind(str(s(i) + p + 1:end),'}'); | |
| 2287 li = 1; | |
| 2288 while (li <= length (l1) && si <= length (s1)) | |
| 2289 if (l1(li) < s1(si)) | |
| 2290 if (li == si) | |
| 2291 break; | |
| 2292 endif | |
| 2293 li++; | |
| 2294 else | |
| 2295 si++; | |
| 2296 endif | |
| 2297 endwhile | |
| 2298 l1 = l1 (min (length(l1), si)); | |
| 2299 if (s(i) + l1 + 1 == s(i+1)) | |
| 2300 if (str(s(i + 1) + p + 1) == "{") | |
| 2301 s2 = strfind(str(s(i + 1) + p + 2:end),'{'); | |
| 2302 si = 1; | |
| 2303 l2 = strfind(str(s(i + 1) + p + 1:end),'}'); | |
| 2304 li = 1; | |
| 2305 while (li <= length (l2) && si <= length (s2)) | |
| 2306 if (l2(li) < s2(si)) | |
| 2307 if (li == si) | |
| 2308 break; | |
| 2309 endif | |
| 2310 li++; | |
| 2311 else | |
| 2312 si++; | |
| 2313 endif | |
| 2314 endwhile | |
| 2315 l2 = l2 (min (length(l2), si)); | |
| 2316 if (length_string (str(s(i)+p+2:s(i)+p+l1-1)) <= | |
| 2317 length_string(str(s(i+1)+p+2:s(i+1)+p+l2-1))) | |
| 8506 | 2318 ## Shortest already first! |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2319 str = cstrcat (str(1:s(i)+p-1), "@", str(s(i)+p:end)); |
| 7189 | 2320 else |
| 8506 | 2321 ## Have to swap sub/super-script to get shortest first. |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2322 str = cstrcat (str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+l2), |
| 7189 | 2323 str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+l2+1:end)); |
| 2324 endif | |
| 2325 else | |
| 8506 | 2326 ## Have to swap sub/super-script to get shortest first. |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2327 str = cstrcat (str(1:s(i)+p-1), "@", str(s(i+1)+p:s(i+1)+p+1), |
| 7189 | 2328 str(s(i)+p:s(i)+p+l1), str(s(i+1)+p+2:end)); |
| 2329 endif | |
| 2330 i += 2; | |
| 2331 p ++; | |
| 2332 else | |
| 2333 i++; | |
| 2334 endif | |
| 2335 else | |
| 2336 if (s(i+1) == s(i) + 2) | |
| 8506 | 2337 ## Shortest already first! |
|
7540
3422f39573b1
strcat.m: Matlab compatibility, with cstrcat.m replacing conventional strcat.m.
Ben Abbott <bpabbott@mac.com>
parents:
7513
diff
changeset
|
2338 str = cstrcat (str(1:s(i)+p-1), "@", str(s(i)+p:end)); |
| 7189 | 2339 p ++; |
| 2340 i += 2; | |
| 2341 else | |
| 2342 i ++; | |
| 2343 endif | |
| 2344 endif | |
| 2345 else | |
| 2346 i ++; | |
| 2347 endif | |
| 2348 endwhile | |
| 2349 | |
| 2350 endfunction | |
| 2351 | |
| 2352 function l = length_string (s) | |
| 2353 l = length (s) - length (strfind(s,'{')) - length (strfind(s,'}')); | |
| 2354 m = regexp (s, '/([\w\-]+|[\w\-]+=\d+)', 'matches'); | |
| 2355 if (!isempty (m)) | |
| 2356 l = l - sum (cellfun (@length, m)); | |
| 2357 endif | |
| 2358 endfunction | |
| 2359 | |
| 2360 function sym = __setup_sym_table__ () | |
| 2361 ## Setup the translation table for TeX to gnuplot enhanced mode. | |
| 2362 sym.forall = '{/Symbol \042}'; | |
| 2363 sym.exists = '{/Symbol \044}'; | |
| 2364 sym.ni = '{/Symbol \047}'; | |
| 2365 sym.cong = '{/Symbol \100}'; | |
| 2366 sym.Delta = '{/Symbol D}'; | |
| 2367 sym.Phi = '{/Symbol F}'; | |
|
7608
49810341db91
Correct typos in __go_draw_axes__.m and update Manual
godfrey@qss.Stanford.EDU
parents:
7603
diff
changeset
|
2368 sym.Gamma = '{/Symbol G}'; |
| 7190 | 2369 sym.vartheta = '{/Symbol J}'; |
| 7189 | 2370 sym.Lambda = '{/Symbol L}'; |
| 2371 sym.Pi = '{/Symbol P}'; | |
| 2372 sym.Theta = '{/Symbol Q}'; | |
| 2373 sym.Sigma = '{/Symbol S}'; | |
| 2374 sym.varsigma = '{/Symbol V}'; | |
| 7420 | 2375 sym.Omega = '{/Symbol W}'; |
| 7189 | 2376 sym.Xi = '{/Symbol X}'; |
| 2377 sym.Psi = '{/Symbol Y}'; | |
| 2378 sym.perp = '{/Symbol \136}'; | |
| 2379 sym.alpha = '{/Symbol a}'; | |
| 2380 sym.beta = '{/Symbol b}'; | |
| 2381 sym.chi = '{/Symbol c}'; | |
| 2382 sym.delta = '{/Symbol d}'; | |
| 2383 sym.epsilon = '{/Symbol e}'; | |
| 2384 sym.phi = '{/Symbol f}'; | |
|
7608
49810341db91
Correct typos in __go_draw_axes__.m and update Manual
godfrey@qss.Stanford.EDU
parents:
7603
diff
changeset
|
2385 sym.gamma = '{/Symbol g}'; |
| 7189 | 2386 sym.eta = '{/Symbol h}'; |
| 2387 sym.iota = '{/Symbol i}'; | |
|
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2388 sym.varphi = '{/Symbol j}'; |
| 7189 | 2389 sym.kappa = '{/Symbol k}'; |
| 2390 sym.lambda = '{/Symbol l}'; | |
| 2391 sym.mu = '{/Symbol m}'; | |
| 2392 sym.nu = '{/Symbol n}'; | |
| 2393 sym.o = '{/Symbol o}'; | |
| 2394 sym.pi = '{/Symbol p}'; | |
| 2395 sym.theta = '{/Symbol q}'; | |
| 2396 sym.rho = '{/Symbol r}'; | |
| 2397 sym.sigma = '{/Symbol s}'; | |
| 2398 sym.tau = '{/Symbol t}'; | |
| 2399 sym.upsilon = '{/Symbol u}'; | |
| 2400 sym.varpi = '{/Symbol v}'; | |
| 2401 sym.omega = '{/Symbol w}'; | |
| 2402 sym.xi = '{/Symbol x}'; | |
| 2403 sym.psi = '{/Symbol y}'; | |
| 2404 sym.zeta = '{/Symbol z}'; | |
| 2405 sym.sim = '{/Symbol \176}'; | |
| 2406 sym.Upsilon = '{/Symbol \241}'; | |
| 2407 sym.prime = '{/Symbol \242}'; | |
| 2408 sym.leq = '{/Symbol \243}'; | |
| 2409 sym.infty = '{/Symbol \245}'; | |
| 2410 sym.clubsuit = '{/Symbol \247}'; | |
| 2411 sym.diamondsuit = '{/Symbol \250}'; | |
| 2412 sym.heartsuit = '{/Symbol \251}'; | |
| 2413 sym.spadesuit = '{/Symbol \252}'; | |
| 2414 sym.leftrightarrow = '{/Symbol \253}'; | |
| 2415 sym.leftarrow = '{/Symbol \254}'; | |
| 2416 sym.uparrow = '{/Symbol \255}'; | |
| 2417 sym.rightarrow = '{/Symbol \256}'; | |
| 2418 sym.downarrow = '{/Symbol \257}'; | |
| 2419 sym.circ = '{/Symbol \260}'; | |
| 2420 sym.pm = '{/Symbol \261}'; | |
| 2421 sym.geq = '{/Symbol \263}'; | |
| 2422 sym.times = '{/Symbol \264}'; | |
| 2423 sym.propto = '{/Symbol \265}'; | |
| 2424 sym.partial = '{/Symbol \266}'; | |
| 2425 sym.bullet = '{/Symbol \267}'; | |
| 2426 sym.div = '{/Symbol \270}'; | |
| 2427 sym.neq = '{/Symbol \271}'; | |
| 2428 sym.equiv = '{/Symbol \272}'; | |
| 2429 sym.approx = '{/Symbol \273}'; | |
| 2430 sym.ldots = '{/Symbol \274}'; | |
| 2431 sym.mid = '{/Symbol \275}'; | |
| 2432 sym.aleph = '{/Symbol \300}'; | |
| 2433 sym.Im = '{/Symbol \301}'; | |
| 2434 sym.Re = '{/Symbol \302}'; | |
| 2435 sym.wp = '{/Symbol \303}'; | |
| 2436 sym.otimes = '{/Symbol \304}'; | |
| 2437 sym.oplus = '{/Symbol \305}'; | |
| 2438 sym.oslash = '{/Symbol \306}'; | |
| 2439 sym.cap = '{/Symbol \307}'; | |
| 2440 sym.cup = '{/Symbol \310}'; | |
| 2441 sym.supset = '{/Symbol \311}'; | |
| 2442 sym.supseteq = '{/Symbol \312}'; | |
| 2443 sym.subset = '{/Symbol \314}'; | |
| 2444 sym.subseteq = '{/Symbol \315}'; | |
| 2445 sym.in = '{/Symbol \316}'; | |
|
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2446 sym.notin = '{/Symbol \317}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2447 sym.angle = '{/Symbol \320}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2448 sym.bigtriangledown = '{/Symbol \321}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2449 sym.langle = '{/Symbol \341}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2450 sym.rangle = '{/Symbol \361}'; |
| 7189 | 2451 sym.nabla = '{/Symbol \321}'; |
|
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2452 sym.prod = '{/Symbol \325}'; |
| 7189 | 2453 sym.surd = '{/Symbol \326}'; |
| 2454 sym.cdot = '{/Symbol \327}'; | |
| 2455 sym.neg = '{/Symbol \330}'; | |
| 2456 sym.wedge = '{/Symbol \331}'; | |
| 2457 sym.vee = '{/Symbol \332}'; | |
|
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2458 sym.Leftrightarrow = '{/Symbol \333}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2459 sym.Leftarrow = '{/Symbol \334}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2460 sym.Uparrow = '{/Symbol \335}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2461 sym.Rightarrow = '{/Symbol \336}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2462 sym.Downarrow = '{/Symbol \337}'; |
|
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2463 sym.diamond = '{/Symbol \340}'; |
| 7189 | 2464 sym.copyright = '{/Symbol \343}'; |
|
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2465 sym.lfloor = '{/Symbol \353}'; |
| 7189 | 2466 sym.lceil = '{/Symbol \351}'; |
|
7593
fdb6ff523237
__go_draw_axes__: use correct symbol codes
Michael D. Godfrey
parents:
7592
diff
changeset
|
2467 sym.rfloor = '{/Symbol \373}'; |
| 7189 | 2468 sym.rceil = '{/Symbol \371}'; |
| 2469 sym.int = '{/Symbol \362}'; | |
| 2470 endfunction | |
| 2471 | |
| 7390 | 2472 function retval = __do_enhanced_option__ (enhanced, obj) |
| 2473 retval = ""; | |
| 2474 if (enhanced) | |
| 2475 if (strcmpi (obj.interpreter, "none")) | |
| 2476 retval = "noenhanced"; | |
| 2477 else | |
| 2478 retval = "enhanced"; | |
| 2479 endif | |
| 2480 endif | |
| 2481 endfunction | |
|
7542
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2482 |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2483 function typ = get_old_gnuplot_color (color) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2484 if (isequal (color, [0, 0, 0])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2485 typ = -1; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2486 elseif (isequal (color, [1, 0, 0])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2487 typ = 1; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2488 elseif (isequal (color, [0, 1, 0])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2489 typ = 2; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2490 elseif (isequal (color, [0, 0, 1])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2491 typ = 3; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2492 elseif (isequal (color, [1, 0, 1])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2493 typ = 4; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2494 elseif (isequal (color, [0, 1, 1])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2495 typ = 5; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2496 elseif (isequal (color, [1, 1, 1])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2497 typ = -1; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2498 elseif (isequal (color, [1, 1, 0])) |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2499 typ = 7; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2500 else |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2501 typ = -1; |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2502 endif |
|
b1ff001022af
__go_draw_axes__: eliminate repeated code with get_old_gnuplot_color subfunction
John W. Eaton <jwe@octave.org>
parents:
7541
diff
changeset
|
2503 endfunction |