octave-nkf: scripts/plot/private/__stem_

annotate scripts/plot/private/stem.m @ 17301:68bcac3c043a

Correct inversion accidentally introduced in cset 87ba70043bfc. * scripts/plot/area.m, scripts/plot/axis.m, scripts/plot/caxis.m, scripts/plot/comet.m, scripts/plot/comet3.m, scripts/plot/compass.m, scripts/plot/contour.m, scripts/plot/contour3.m, scripts/plot/contourf.m, scripts/plot/cylinder.m, scripts/plot/ellipsoid.m, scripts/plot/errorbar.m, scripts/plot/feather.m, scripts/plot/fill.m, scripts/plot/loglog.m, scripts/plot/loglogerr.m, scripts/plot/mesh.m, scripts/plot/meshc.m, scripts/plot/meshz.m, scripts/plot/pcolor.m, scripts/plot/pie.m, scripts/plot/pie3.m, scripts/plot/plot.m, scripts/plot/plot3.m, scripts/plot/polar.m, scripts/plot/private/__bar__.m, scripts/plot/private/__ezplot__.m, scripts/plot/private/__stem__.m, scripts/plot/quiver.m, scripts/plot/quiver3.m, scripts/plot/rectangle.m, scripts/plot/ribbon.m, scripts/plot/rose.m, scripts/plot/scatter.m, scripts/plot/scatter3.m, scripts/plot/semilogx.m, scripts/plot/semilogxerr.m, scripts/plot/semilogy.m, scripts/plot/semilogyerr.m, scripts/plot/slice.m, scripts/plot/sphere.m, scripts/plot/stairs.m, scripts/plot/surf.m, scripts/plot/surfc.m, scripts/plot/surfl.m, scripts/plot/surfnorm.m, scripts/time/datetick.m: check for (! isempty (hax)) before saving current figure.

author	Rik <rik@octave.org>
date	Tue, 20 Aug 2013 22:23:43 -0700
parents	87ba70043bfc
children	1c89599167a6

rev	line source
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 11589 diff changeset	1 ## Copyright (C) 2006-2012 Michel D. Schmid
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	2 ##
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	3 ## This file is part of Octave.
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	4 ##
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	5 ## Octave is free software; you can redistribute it and/or modify it
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	6 ## under the terms of the GNU General Public License as published by
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	7 ## the Free Software Foundation; either version 3 of the License, or (at
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	8 ## your option) any later version.
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	9 ##
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	10 ## Octave is distributed in the hope that it will be useful, but
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	13 ## General Public License for more details.
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	14 ##
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	15 ## You should have received a copy of the GNU General Public License
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	16 ## along with Octave; see the file COPYING. If not, see
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	17 ## <http://www.gnu.org/licenses/>.
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	18
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8507 diff changeset	19 ## -- texinfo --
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8507 diff changeset	20 ## @deftypefn {Function File} {@var{h} =} __stem__ (@var{have_z}, @var{varargin})
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8507 diff changeset	21 ## Undocumented internal function.
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8507 diff changeset	22 ## @end deftypefn
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	23
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	24 ## Author: Michel D. Schmid <michaelschmid@users.sourceforge.net>
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	25 ## Adapted-by: jwe
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	26
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	27 function h = __stem__ (have_z, varargin)
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	28
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	29 if (have_z)
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	30 caller = "stem3";
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	31 else
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	32 caller = "stem";
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	33 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	34
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	35 [hax, varargin, nargin] = __plt_get_axis_arg__ (caller, varargin{:});
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	36
8070 3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	37 [x, y, z, dofill, llc, ls, mmc, ms, varargin] = ...
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	38 check_stem_arg (have_z, varargin{:});
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	39
17211 87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations. Rik <rik@octave.org> parents: 17080 diff changeset	40 oldfig = [];
17301 68bcac3c043a Correct inversion accidentally introduced in cset 87ba70043bfc. Rik <rik@octave.org> parents: 17211 diff changeset	41 if (! isempty (hax))
17211 87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations. Rik <rik@octave.org> parents: 17080 diff changeset	42 oldfig = get (0, "currentfigure");
87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations. Rik <rik@octave.org> parents: 17080 diff changeset	43 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	44 unwind_protect
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	45 hax = newplot (hax);
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	46 hold_state = get (hax, "nextplot");
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	47 set (hax, "nextplot", "add");
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	48
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	49 h = [];
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	50 nx = rows (x);
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	51 for i = 1 : columns (x)
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	52 if (have_z)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	53 xt = x(:)';
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	54 xt = [xt; xt; NaN(1, nx)](:);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	55 yt = y(:)';
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	56 yt = [yt; yt; NaN(1, nx)](:);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	57 zt = z(:)';
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	58 zt = [zeros(1, nx); zt; NaN(1, nx)](:);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	59 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	60 xt = x(:, i)';
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	61 xt = [xt; xt; NaN(1, nx)](:);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	62 yt = y(:, i)';
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	63 yt = [zeros(1, nx); yt; NaN(1, nx)](:);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	64 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	65
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	66 hg = hggroup ();
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	67 h = [h; hg];
8075 a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8070 diff changeset	68 args = __add_datasource__ (caller, hg, {"x", "y", "z"}, varargin{:});
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	69
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	70 if (isempty (llc))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	71 lc = __next_line_color__ ();
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	72 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	73 lc = llc;
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	74 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	75
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	76 if (isempty (mmc))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	77 mc = lc;
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	78 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	79 mc = mmc;
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	80 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	81
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	82 if (dofill)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	83 fc = mc;
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	84 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	85 fc = "none";
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	86 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	87
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	88 if (have_z)
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	89 h_stems = plot3 (hax, xt, yt, zt, "color", lc, "linestyle", ls,
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	90 "parent", hg, x, y, z, "color", mc,
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	91 "marker", ms, "linestyle", "none",
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	92 "markerfacecolor", fc, "parent", hg);
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	93
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	94 h_baseline = [];
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	95 else
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	96 h_stems = plot (hax, xt, yt, "color", lc, "linestyle", ls,
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	97 "parent", hg, x(:,i), y(:, i), "color", mc, "marker",
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	98 ms, "linestyle", "none", "markerfacecolor",
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	99 fc, "parent", hg);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	100
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	101 x_axis_range = get (hax, "xlim");
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	102 h_baseline = line (hax, x_axis_range, [0, 0], "color", [0, 0, 0]);
11313 988d2bd6bacd __stem__.m: Each stem hggroup should have its own baseline. Ben Abbott <bpabbott@mac.com> parents: 10549 diff changeset	103 set (h_baseline, "handlevisibility", "off");
988d2bd6bacd __stem__.m: Each stem hggroup should have its own baseline. Ben Abbott <bpabbott@mac.com> parents: 10549 diff changeset	104 set (h_baseline, "xliminclude", "off");
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	105 addlistener (hax, "xlim", @update_xlim);
11313 988d2bd6bacd __stem__.m: Each stem hggroup should have its own baseline. Ben Abbott <bpabbott@mac.com> parents: 10549 diff changeset	106 addlistener (h_baseline, "ydata", @update_baseline);
988d2bd6bacd __stem__.m: Each stem hggroup should have its own baseline. Ben Abbott <bpabbott@mac.com> parents: 10549 diff changeset	107 addlistener (h_baseline, "visible", @update_baseline);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	108 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	109
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	110 ## Setup the hggroup and listeners.
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	111 addproperty ("showbaseline", hg, "radio", "{on}\|off");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	112 addproperty ("basevalue", hg, "data", 0);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	113 addproperty ("baseline", hg, "data", h_baseline);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	114
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	115 if (! have_z)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	116 addlistener (hg, "showbaseline", @show_baseline);
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	117 addlistener (hg, "basevalue", @move_baseline);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	118 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	119
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	120 addproperty ("color", hg, "linecolor", lc);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	121 addproperty ("linewidth", hg, "linelinewidth", 0.5);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	122 addproperty ("linestyle", hg, "linelinestyle", ls);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	123 addproperty ("marker", hg, "linemarker", ms);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	124 addproperty ("markerfacecolor", hg, "linemarkerfacecolor", fc);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	125 addproperty ("markersize", hg, "linemarkersize", 6);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	126
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	127 addlistener (hg, "color", @update_props);
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	128 addlistener (hg, "linewidth", @update_props);
c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	129 addlistener (hg, "linestyle", @update_props);
c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	130 addlistener (hg, "marker", @update_props);
c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	131 addlistener (hg, "markerfacecolor", @update_props);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	132 addlistener (hg, "markersize", @update_props);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	133
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	134 addproperty ("xdata", hg, "data", x(:, i));
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	135 addproperty ("ydata", hg, "data", y(:, i));
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	136 if (have_z)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	137 addproperty ("zdata", hg, "data", z(:, i));
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	138 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	139 addproperty ("zdata", hg, "data", []);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	140 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	141
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	142 addlistener (hg, "xdata", @update_data);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	143 addlistener (hg, "ydata", @update_data);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	144 addlistener (hg, "zdata", @update_data);
8075 a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8070 diff changeset	145
8079 082fa7859574 Additional do not call set with empty arguments fixes David Bateman <dbateman@free.fr> parents: 8075 diff changeset	146 if (! isempty (args))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	147 set (hg, args{:});
8079 082fa7859574 Additional do not call set with empty arguments fixes David Bateman <dbateman@free.fr> parents: 8075 diff changeset	148 endif
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	149 if (i == 1 && ! isempty (h_baseline))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	150 set (h_baseline, "parent", get (hg, "parent"));
8075 a028a5960e18 Fix for hold with no figures/axes. Set prop/val pairs to hggroups rather than underlying objects. Fix for equality test in array_property David Bateman <dbateman@free.fr> parents: 8070 diff changeset	151 endif
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	152 endfor
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	153
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	154 if (! strcmp (hold_state, "add") && have_z)
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	155 set (hax, "view", [-37.5 30]); # 3D view
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	156 endif
17080 58d3fba6df17 __stem__.m: Fix typo in set() command. Rik <rik@octave.org> parents: 17067 diff changeset	157 set (hax, "nextplot", hold_state);
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	158
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	159 unwind_protect_cleanup
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	160 if (! isempty (oldfig))
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	161 set (0, "currentfigure", oldfig);
b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	162 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	163 end_unwind_protect
17067 b2cbf369837e stem.m, stem3.m, __stem__.m: Upgrade to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16751 diff changeset	164
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	165 endfunction
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	166
8070 3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	167 function [x, y, z, dofill, lc, ls, mc, ms, newargs] = check_stem_arg (have_z, varargin)
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	168
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	169 ## FIXME -- there seems to be a lot of duplicated code in this
bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	170 ## function. It seems like it should be possible to simplify things
bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	171 ## by combining some of the nearly identical code sections into
bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	172 ## additional subfunctions.
bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	173
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	174 if (have_z)
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	175 caller = "stem3";
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	176 else
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	177 caller = "stem";
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	178 endif
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	179
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	180 ## Remove prop/val pairs from data to consider.
8070 3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	181 i = 2;
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	182 newargs = {};
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	183 while (i < length (varargin))
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	184 if (ischar (varargin{i}) && !(strcmpi ("fill", varargin{i})
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	185 \|\| strcmpi ("filled", varargin{i})))
8070 3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	186 newargs{end + 1} = varargin{i};
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	187 newargs{end + 1} = varargin{i + 1};
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	188 nargin = nargin - 2;
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	189 varargin(i:i+1) = [];
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	190 else
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	191 i++;
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	192 endif
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	193 endwhile
3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	194
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	195 ## set specifiers to default values.
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	196 [lc, ls, mc, ms] = set_default_values ();
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	197 dofill = 0;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	198 fill_2 = 0;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	199 linespec_2 = 0;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	200 z = [];
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	201
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	202 ## Check input arguments.
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	203 if (nargin == 2)
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	204 if (have_z)
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	205 z = varargin{1};
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	206 x = 1:rows (z);
02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	207 y = 1:columns (z);
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	208 else
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	209 y = varargin{1};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	210 if (isvector (y))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	211 x = 1:length (y);
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	212 elseif (ismatrix (y))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	213 x = 1:rows (y);
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	214 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	215 error ("stem: Y must be a matrix");
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	216 endif # in each case, x & y will be defined
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	217 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	218 elseif (nargin == 3)
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	219 ## Several possibilities
bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	220 ##
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	221 ## 1. the real y data
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	222 ## 2. 'filled'
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	223 ## 3. line spec
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	224 if (ischar (varargin{2}))
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	225 ## Only 2. or 3. possible.
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	226 if (strcmpi ("fill", varargin{2}) \|\| strcmpi ("filled", varargin{2}))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	227 dofill = 1;
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	228 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	229 ## Parse the linespec.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	230 [lc, ls, mc, ms] = stem_line_spec (caller, varargin{2});
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	231 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	232 if (have_z)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	233 z = varargin{1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	234 x = 1:rows (z);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	235 y = 1:columns (z);
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	236 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	237 y = varargin{1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	238 if (isvector (y))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	239 x = 1:length (y);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	240 elseif (ismatrix (y))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	241 x = 1:rows (y);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	242 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	243 error ("stem: Y must be a matrix");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	244 endif # in each case, x & y will be defined
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	245 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	246 else
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	247 if (have_z)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	248 error ("stem3: must define X, Y and Z");
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	249 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	250 ## Must be the real y data.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	251 x = varargin{1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	252 y = varargin{2};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	253 if (! (ismatrix (x) && ismatrix (y)))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	254 error ("stem: X and Y must be matrices");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	255 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	256 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	257 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	258 elseif (nargin == 4)
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	259 ## Again, several possibilities:
bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	260 ##
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	261 ## arg2 1. real y
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	262 ## arg2 2. 'filled' or linespec
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	263 ## arg3 1. real z
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	264 ## arg3 2. 'filled' or linespec
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	265 if (ischar (varargin{2}))
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	266 ## Only arg2 2. / arg3 1. & arg3 3. are possible.
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	267 if (strcmpi ("fill", varargin{2}) \|\| strcmpi ("filled", varargin{2}))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	268 dofill = 1;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	269 fill_2 = 1; # Be sure, no second "fill" is in the arguments.
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	270 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	271 ## Must be a linespec.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	272 [lc, ls, mc, ms] = stem_line_spec (caller, varargin{2});
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	273 linespec_2 = 1;
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	274 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	275 if (have_z)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	276 z = varargin{1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	277 x = 1:rows (z);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	278 y = 1:columns (z);
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	279 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	280 y = varargin{1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	281 if (isvector (y))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	282 x = 1:length (y);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	283 elseif (ismatrix (y))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	284 x = 1:rows (y);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	285 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	286 error ("stem: Y must be a matrix");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	287 endif # in each case, x & y will be defined
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	288 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	289 else
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	290 if (have_z)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	291 x = varargin{1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	292 y = varargin{2};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	293 z = varargin{3};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	294 if (! (ismatrix (x) && ismatrix (y) && ismatrix (z)))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	295 error ("stem3: X, Y and Z must be matrices");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	296 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	297 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	298 ## must be the real y data.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	299 x = varargin{1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	300 y = varargin{2};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	301 if (! (ismatrix (x) && ismatrix (y)))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	302 error ("stem: X and Y must be matrices");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	303 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	304 endif
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	305 endif # if ischar (varargin{2})
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	306 if (! have_z)
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	307 ## varargin{3} must be char.
bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	308 ## Check for "fill.
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	309 if ((strcmpi (varargin{3}, "fill") \|\| strcmpi (varargin{3}, "filled"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	310 && fill_2)
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	311 error ("stem: duplicate fill argument");
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	312 elseif (strcmpi ("fill", varargin{3}) && linespec_2)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	313 ## Must be "fill".
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	314 dofill = 1;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	315 fill_2 = 1;
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	316 elseif ((strcmpi (varargin{3}, "fill") \|\| strcmpi (varargin{3}, "filled"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	317 && !linespec_2)
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	318 ## Must be "fill".
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	319 dofill = 1;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	320 fill_2 = 1;
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	321 elseif (! linespec_2)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	322 ## Must be linespec.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	323 [lc, ls, mc, ms] = stem_line_spec (caller, varargin{3});
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	324 linespec_2 = 1;
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	325 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	326 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	327 elseif (nargin == 5)
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	328 if (have_z)
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	329 x = varargin{1};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	330 y = varargin{2};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	331 z = varargin{3};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	332 if (! (ismatrix (x) && ismatrix (y) && ismatrix (z)))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	333 error ("stem3: X, Y and Z must be matrices");
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	334 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	335 else
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	336 x = varargin{1};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	337 y = varargin{2};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	338 if (! (ismatrix (x) && ismatrix (y)))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	339 error ("stem: X and Y must be matrices");
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	340 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	341 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	342
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	343 if (! have_z)
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	344 if (strcmpi (varargin{3}, "fill") \|\| strcmpi (varargin{3}, "filled"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	345 dofill = 1;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	346 fill_2 = 1; # Be sure, no second "fill" is in the arguments.
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	347 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	348 ## Must be a linespec.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	349 [lc, ls, mc, ms] = stem_line_spec (caller, varargin{3});
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	350 linespec_2 = 1;
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	351 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	352 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	353
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	354 ## Check for "fill".
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	355 if ((strcmpi (varargin{4}, "fill") \|\| strcmpi (varargin{4}, "filled"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	356 && fill_2)
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	357 error ("%s: duplicate fill argument", caller);
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	358 elseif ((strcmpi (varargin{4}, "fill") \|\| strcmpi (varargin{4}, "filled"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	359 && linespec_2)
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	360 ## Must be "fill".
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	361 dofill = 1;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	362 fill_2 = 1;
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	363 elseif (!strcmpi (varargin{4}, "fill") && !strcmpi (varargin{4}, "filled")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	364 && !linespec_2)
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	365 ## Must be linespec.
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	366 [lc, ls, mc, ms] = stem_line_spec (caller, varargin{4});
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	367 linespec_2 = 1;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	368 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	369 elseif (nargin == 6 && have_z)
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	370 x = varargin{1};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	371 y = varargin{2};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	372 z = varargin{3};
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	373 if (! (ismatrix (x) && ismatrix (y) && ismatrix (z)))
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	374 error ("stem3: X, Y and Z must be matrices");
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	375 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	376
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	377 if (strcmpi (varargin{4}, "fill") \|\| strcmpi (varargin{4}, "filled"))
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	378 dofill = 1;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	379 fill_2 = 1; # be sure, no second "fill" is in the arguments
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	380 else
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	381 ## Must be a linespec.
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	382 [lc, ls, mc, ms] = stem_line_spec (caller, varargin{4});
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	383 linespec_2 = 1;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	384 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	385
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	386 ## check for "fill" ..
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	387 if ((strcmpi (varargin{5}, "fill") \|\| strcmpi (varargin{5}, "filled"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	388 && fill_2)
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	389 error ("stem3: duplicate fill argument");
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	390 elseif ((strcmpi (varargin{5}, "fill") \|\| strcmpi (varargin{5}, "filled"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	391 && linespec_2)
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	392 ## Must be "fill".
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	393 dofill = 1;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	394 fill_2 = 1;
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	395 elseif (!strcmpi (varargin{5}, "fill") && !strcmpi (varargin{5}, "filled")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	396 && !linespec_2)
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	397 ## Must be linespec.
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	398 [lc, ls, mc, ms] = stem_line_spec (caller, varargin{5});
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	399 linespec_2 = 1;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	400 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	401 else
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	402 error ("%s: incorrect number of arguments", caller);
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	403 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	404
8506 bc982528de11 comment style fixes John W. Eaton <jwe@octave.org> parents: 8315 diff changeset	405 ## Check sizes of x, y and z.
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	406 if (have_z)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	407 if (!size_equal (x, y, z))
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	408 error ("stem3: inconsistent size of x, y and z");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	409 else
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	410 x = x(:);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	411 y = y(:);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	412 z = z(:);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	413 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	414 else
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	415 if (isvector (x))
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	416 x = x(:);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	417 if (isvector (y))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	418 if (length (x) != length (y))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	419 error ("stem: inconsistent size of x and y");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	420 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	421 y = y(:);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	422 endif
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	423 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	424 if (length (x) == rows (y))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	425 x = repmat (x(:), 1, columns (y));
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	426 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	427 error ("stem: inconsistent size of x and y");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	428 endif
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	429 endif
8507 cadc73247d65 style fixes John W. Eaton <jwe@octave.org> parents: 8506 diff changeset	430 elseif (!size_equal (x, y))
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	431 error ("stem: inconsistent size of x and y");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	432 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	433 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	434
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	435 endfunction
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	436
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	437 function [lc, ls, mc, ms] = stem_line_spec (caller, str)
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	438 if (! ischar (str))
7218 02eb1619b857 [project @ 2007-11-29 21:10:55 by jwe] jwe parents: 7217 diff changeset	439 error ("%s: expecting argument to be \"fill\" or a string of specifiers",
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	440 caller);
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	441 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	442 [lc, ls, mc, ms] = set_default_values ();
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	443 ## Parse the line specifier string.
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	444 cur_props = __pltopt__ ("stem", str, false);
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	445 for i = 1:length (cur_props)
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	446 if (isfield (cur_props(i), "color") && ! isempty (cur_props(i).color)); # means line color
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	447 mc = lc = cur_props(i).color;
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	448 elseif (isfield (cur_props(i), "linestyle"))
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	449 ls = cur_props(i).linestyle;
10135 4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 9896 diff changeset	450 if (isempty (ls))
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 9896 diff changeset	451 ls = __next_line_style__ ();
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 9896 diff changeset	452 endif
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	453 elseif (isfield (cur_props(i), "marker") && ! strcmpi (cur_props(i).marker, "none"))
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	454 ms = cur_props(i).marker;
10135 4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 9896 diff changeset	455 if (isempty (ms))
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 9896 diff changeset	456 [dummy, ms] = __next_line_style__ ();
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter. David Bateman <dbateman@free.fr> parents: 9896 diff changeset	457 endif
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	458 endif
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	459 endfor
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	460 endfunction
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	461
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	462 function [lc, ls, mc, ms] = set_default_values ()
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	463 ## set default values
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	464 mc = [];
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	465 lc = [];
7217 c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	466 ls = "-";
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	467 ms = "o";
c8abc18322b7 [project @ 2007-11-29 20:50:24 by jwe] jwe parents: diff changeset	468 endfunction
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	469
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	470 function update_xlim (h, d)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	471 kids = get (h, "children");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	472 xlim = get (h, "xlim");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	473
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	474 for i = 1 : length (kids)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	475 obj = get (kids (i));
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	476 if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline"))
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 8052 diff changeset	477 if (any (get (obj.baseline, "xdata") != xlim))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	478 set (obj.baseline, "xdata", xlim);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	479 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	480 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	481 endfor
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	482 endfunction
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	483
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	484 function update_baseline (h, d)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	485 visible = get (h, "visible");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	486 ydata = get (h, "ydata")(1);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	487
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	488 kids = get (get (h, "parent"), "children");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	489 for i = 1 : length (kids)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	490 obj = get (kids (i));
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	491 if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline")
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	492 && obj.baseline == h)
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	493 ## Only alter if changed to avoid recursion of the listener functions
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	494 if (! strcmpi (get (kids(i), "showbaseline"), visible))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	495 set (kids (i), "showbaseline", visible);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	496 endif
8190 73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes John W. Eaton <jwe@octave.org> parents: 8079 diff changeset	497 if (! strcmpi (get (kids(i), "basevalue"), visible))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10135 diff changeset	498 set (kids (i), "basevalue", ydata);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	499 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	500 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	501 endfor
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	502 endfunction
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	503
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	504 function show_baseline (h, d)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	505 set (get (h, "baseline"), "visible", get (h, "showbaseline"));
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	506 endfunction
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	507
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	508 function move_baseline (h, d)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	509 b0 = get (h, "basevalue");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	510 bl = get (h, "baseline");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	511
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	512 if (get (bl, "ydata") != [b0, b0])
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	513 set (bl, "ydata", [b0, b0]);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	514 endif
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	515
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	516 kids = get (h, "children");
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	517 yt = get (h, "ydata")(:)';
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	518 ny = length (yt);
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	519 yt = [b0 * ones(1, ny); yt; NaN(1, ny)](:);
8315 e9687c313d5f Fix callbacks in stem and quiver for change in order of children. Fix for scaling in quiver for single arrow David Bateman <dbateman@free.fr> parents: 8238 diff changeset	520 set (kids(2), "ydata", yt);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	521 endfunction
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	522
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	523 function update_props (h, d)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	524 kids = get (h, "children");
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	525 set (kids(2), "color", get (h, "color"),
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	526 "linewidth", get (h, "linewidth"),
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	527 "linestyle", get (h, "linestyle"));
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	528 set (kids(1), "color", get (h, "color"),
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	529 "marker", get (h, "marker"),
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	530 "markerfacecolor", get (h, "markerfacecolor"),
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	531 "markersize", get (h, "markersize"));
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	532 endfunction
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	533
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	534 function update_data (h, d)
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	535 x = get (h, "xdata");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	536 y = get (h, "ydata");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	537 z = get (h, "zdata");
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	538
961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	539 if (!isempty (z) && size_equal (x, y, z))
16751 92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	540 sz = min ([size(x); size(y); size(z)]);
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	541 x = x(1:sz(1),1:sz(2));
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	542 y = y(1:sz(1),1:sz(2));
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	543 z = z(1:sz(1),1:sz(2));
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	544 elseif (numel (x) != numel (y));
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	545 sz = min ([size(x); size(y)]);
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	546 x = x(1:sz(1),1:sz(2));
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	547 y = y(1:sz(1),1:sz(2));
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	548 endif
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	549 bl = get (h, "basevalue");
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	550 nx = numel (x);
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	551 x = x(:)';
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	552 xt = [x; x; NaN(1, nx)](:);
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	553 if (! isempty (z))
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	554 y = y(:)';
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	555 yt = [y; y; NaN(1, nx)](:);
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	556 z = z(:)';
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	557 zt = [bl * ones(1, nx); z; NaN(1, nx)](:);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	558 else
16751 92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	559 y = y(:)';
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	560 yt = [bl * ones(1, nx); y; NaN(1, nx)](:);
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	561 zt = [];
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	562 endif
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	563
16751 92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	564 kids = get (h, "children");
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	565 set (kids(2), "xdata", xt, "ydata", yt, "zdata", zt);
92811d110839 Update copies consistent subset of {x,y,z}data to children of the stem hggoup. Ben Abbott <bpabbott@mac.com> parents: 14868 diff changeset	566 set (kids(1), "xdata", x, "ydata", y, "zdata", z);
8052 961d4c52ffae Convert stem and stem3 to use stem series objects David Bateman <dbateman@free.fr> parents: 7218 diff changeset	567 endfunction

Mercurial > hg > octave-nkf

annotate scripts/plot/private/__stem__.m @ 17301:68bcac3c043a

annotate scripts/plot/private/stem.m @ 17301:68bcac3c043a