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