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