octave: scripts/plot/stairs.m annotate

annotate scripts/plot/stairs.m @ 12099:b8fa8cba212f release-3-2-x

stairs.m (__stairs__): correct nargin check; new demos

author	John W. Eaton <jwe@octave.org>
date	Fri, 20 Nov 2009 10:49:17 +0100
parents	eb63fbe60fab
children	95c3e38098bf

rev	line source
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	1 ## Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2004,
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8244 diff changeset	2 ## 2005, 2006, 2007, 2008 John W. Eaton
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	3 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	4 ## This file is part of Octave.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	5 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	6 ## Octave is free software; you can redistribute it and/or modify it
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	7 ## under the terms of the GNU General Public License as published by
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	8 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	9 ## your option) any later version.
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	10 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	11 ## Octave is distributed in the hope that it will be useful, but
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	14 ## General Public License for more details.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	15 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2311 diff changeset	16 ## You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	17 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6895 diff changeset	18 ## <http://www.gnu.org/licenses/>.
245 16a24e76d6e0 [project @ 1993-12-03 02:00:15 by jwe] jwe parents: 131 diff changeset	19
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	20 ## -- texinfo --
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	21 ## @deftypefn {Function File} {} stairs (@var{x}, @var{y})
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	22 ## @deftypefnx {Function File} {} stairs (@dots{}, @var{style})
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	23 ## @deftypefnx {Function File} {} stairs (@dots{}, @var{prop}, @var{val})
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	24 ## @deftypefnx {Function File} {} stairs (@var{h}, @dots{})
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	25 ## @deftypefnx {Function File} {@var{h} =} stairs (@dots{})
6895 76e3d985ae56 [project @ 2007-09-13 18:22:38 by jwe] jwe parents: 6448 diff changeset	26 ## Produce a stairstep plot. The arguments may be vectors or matrices.
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3408 diff changeset	27 ##
2311 2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	28 ## If only one argument is given, it is taken as a vector of y-values
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	29 ## and the x coordinates are taken to be the indices of the elements.
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3408 diff changeset	30 ##
2311 2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	31 ## If two output arguments are specified, the data are generated but
2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	32 ## not plotted. For example,
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3408 diff changeset	33 ##
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	34 ## @example
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	35 ## stairs (x, y);
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	36 ## @end example
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3408 diff changeset	37 ##
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	38 ## @noindent
2311 2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	39 ## and
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3408 diff changeset	40 ##
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	41 ## @example
6895 76e3d985ae56 [project @ 2007-09-13 18:22:38 by jwe] jwe parents: 6448 diff changeset	42 ## @group
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	43 ## [xs, ys] = stairs (x, y);
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	44 ## plot (xs, ys);
6895 76e3d985ae56 [project @ 2007-09-13 18:22:38 by jwe] jwe parents: 6448 diff changeset	45 ## @end group
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	46 ## @end example
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3408 diff changeset	47 ##
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	48 ## @noindent
2311 2b5788792cad [project @ 1996-07-11 20:18:38 by jwe] jwe parents: 2303 diff changeset	49 ## are equivalent.
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5307 diff changeset	50 ## @seealso{plot, semilogx, semilogy, loglog, polar, mesh, contour,
6448 2110cc251779 [project @ 2007-03-24 02:47:36 by jwe] jwe parents: 6257 diff changeset	51 ## bar, xlabel, ylabel, title}
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 2847 diff changeset	52 ## @end deftypefn
4 b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	53
2314 949ab8eba8bc [project @ 1996-07-12 03:58:02 by jwe] jwe parents: 2313 diff changeset	54 ## Author: jwe
949ab8eba8bc [project @ 1996-07-12 03:58:02 by jwe] jwe parents: 2313 diff changeset	55
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	56 function [xs, ys] = stairs (varargin)
4 b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	57
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	58 [ax, varargin, nargin] = __plt_get_axis_arg__ ("stairs", varargin{:});
4 b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	59
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	60 if (nargin < 1)
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	61 print_usage ();
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	62 else
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	63 if (nargout > 1)
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	64 [h, xs, ys] = __stairs__ (false, varargin{:});
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	65 else
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	66 oldax = gca ();
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	67 unwind_protect
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	68 axes (ax);
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	69 newplot ();
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	70 [h, xxs, yys] = __stairs__ (true, varargin{:});
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	71 unwind_protect_cleanup
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	72 axes (oldax);
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	73 end_unwind_protect
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	74 endif
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	75 if (nargout == 1)
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	76 xs = h;
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	77 endif
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	78 endif
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	79 endfunction
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	80
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	81 function [h, xs, ys] = __stairs__ (doplot, varargin)
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	82
12099 b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	83 if (nargin == 2 \|\| ischar (varargin{2}))
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	84 y = varargin {1};
8070 3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	85 varargin(1) = [];
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	86 if (ismatrix (y))
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	87 if (isvector (y))
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	88 y = y(:);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	89 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	90 x = 1:rows (y);
4 b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	91 endif
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	92 else
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	93 x = varargin{1};
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	94 y = varargin{2};
8070 3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	95 varargin(1:2) = [];
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	96 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	97
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	98 if (ndims (x) > 2 \|\| ndims (y) > 2)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	99 error ("stairs: expecting 2-d arguments");
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	100 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	101
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	102 vec_x = isvector (x);
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	103
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	104 if (vec_x)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	105 x = x(:);
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	106 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	107
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	108 if (isvector (y))
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	109 y = y(:);
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	110 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	111
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	112 if (ismatrix (y))
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	113 [nr, nc] = size (y);
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	114 if (vec_x)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	115 x = repmat (x, [1, nc]);
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	116 else
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	117 [x_nr, x_nc] = size (x);
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	118 if (x_nr != nr \|\| x_nc != nc)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	119 error ("stairs: argument size mismatch");
4 b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	120 endif
b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	121 endif
b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	122 endif
b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	123
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	124 len = 2*nr - 1;
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	125
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	126 xs = ys = zeros (len, nc);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	127
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	128 xs(1,:) = x(1,:);
95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	129 ys(1,:) = y(1,:);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	130
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	131 xtmp = x(2:nr,:);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	132 ridx = 2:2:len-1;
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	133 xs(ridx,:) = xtmp;
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	134 ys(ridx,:) = y(1:nr-1,:);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	135
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	136 ridx = 3:2:len;
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	137 xs(ridx,:) = xtmp;
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	138 ys(ridx,:) = y(2:nr,:);
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6046 diff changeset	139
8243 ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	140 have_line_spec = false;
8244 ca410b015910 Opps with previous patch David Bateman <dbateman@free.fr> parents: 8243 diff changeset	141 for i = 1 : length (varargin)
8243 ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	142 arg = varargin {i};
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	143 if ((ischar (arg) \|\| iscell (arg)) && ! have_line_spec)
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	144 [linespec, valid] = __pltopt__ ("stairs", arg, false);
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	145 if (valid)
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	146 have_line_spec = true;
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	147 varargin(i) = [];
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	148 break;
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	149 endif
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	150 endif
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	151 endfor
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	152
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	153 if (doplot)
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	154 h = [];
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	155 unwind_protect
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	156 hold_state = get (gca (), "nextplot");
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	157 for i = 1 : size(y, 2)
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	158 hg = hggroup ();
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	159 h = [h; hg];
8070 3b53b25e2550 Add data sources and line series David Bateman <dbateman@free.fr> parents: 8056 diff changeset	160 args = __add_datasource__ ("stairs", hg, {"x", "y"}, varargin{:});
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	161
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	162 addproperty ("xdata", hg, "data", x(:,i).');
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	163 addproperty ("ydata", hg, "data", y(:,i).');
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	164
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	165 addlistener (hg, "xdata", @update_data);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	166 addlistener (hg, "ydata", @update_data);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	167
8243 ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	168 if (have_line_spec)
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	169 tmp = line (xs(:,i).', ys(:,i).', "color", linespec.color,
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	170 "parent", hg);
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	171 else
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	172 tmp = line (xs(:,i).', ys(:,i).', "color", __next_line_color__ (),
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	173 "parent", hg);
ec4d9d657b17 Treat line style argument in stairs David Bateman <dbateman@free.fr> parents: 8079 diff changeset	174 endif
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	175
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	176 addproperty ("color", hg, "linecolor", get (tmp, "color"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	177 addproperty ("linewidth", hg, "linelinewidth", get (tmp, "linewidth"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	178 addproperty ("linestyle", hg, "linelinestyle", get (tmp, "linestyle"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	179
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	180 addproperty ("marker", hg, "linemarker", get (tmp, "marker"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	181 addproperty ("markerfacecolor", hg, "linemarkerfacecolor",
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	182 get (tmp, "markerfacecolor"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	183 addproperty ("markeredgecolor", hg, "linemarkeredgecolor",
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	184 get (tmp, "markeredgecolor"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	185 addproperty ("markersize", hg, "linemarkersize",
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	186 get (tmp, "markersize"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	187
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	188 addlistener (hg, "color", @update_props);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	189 addlistener (hg, "linewidth", @update_props);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	190 addlistener (hg, "linestyle", @update_props);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	191 addlistener (hg, "marker", @update_props);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	192 addlistener (hg, "markerfacecolor", @update_props);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	193 addlistener (hg, "markeredgecolor", @update_props);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	194 addlistener (hg, "markersize", @update_props);
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	195
8079 082fa7859574 Additional do not call set with empty arguments fixes David Bateman <dbateman@free.fr> parents: 8075 diff changeset	196 if (! isempty (args))
082fa7859574 Additional do not call set with empty arguments fixes David Bateman <dbateman@free.fr> parents: 8075 diff changeset	197 set (hg, args{:});
082fa7859574 Additional do not call set with empty arguments fixes David Bateman <dbateman@free.fr> parents: 8075 diff changeset	198 endif
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	199 endfor
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	200 unwind_protect_cleanup
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	201 set (gca (), "nextplot", hold_state);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	202 end_unwind_protect
736 c8f88bd3202b [project @ 1994-09-24 03:28:05 by jwe] jwe parents: 245 diff changeset	203 else
7746 95dce69538ec Allow additional options to stairs plots David Bateman <dbateman@free.fr> parents: 7245 diff changeset	204 h = 0;
4 b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	205 endif
b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	206
b4df021f796c [project @ 1993-08-08 01:26:08 by jwe] jwe parents: diff changeset	207 endfunction
7245 d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	208
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	209 %!demo
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	210 %! x = 1:10;
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	211 %! y = rand (1, 10);
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	212 %! stairs (x, y);
7245 d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	213
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	214 %!demo
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	215 %! x = 1:10;
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	216 %! y = rand (1, 10);
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	217 %! [xs, ys] = stairs (x, y);
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe] jwe parents: 7017 diff changeset	218 %! plot (xs, ys);
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	219
12099 b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	220 %!demo
b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	221 %! stairs (1:9);
b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	222
b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	223 %!demo
b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	224 %! [xs, ys] = stairs (9:-1:1);
b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	225 %! plot (xs, ys);
b8fa8cba212f stairs.m (__stairs__): correct nargin check; new demos John W. Eaton <jwe@octave.org> parents: 8920 diff changeset	226
8056 9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	227 function update_props (h, d)
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	228 set (get (h, "children"), "color", get (h, "color"),
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	229 "linewidth", get (h, "linewidth"),
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	230 "linestyle", get (h, "linestyle"),
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	231 "marker", get (h, "marker"),
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	232 "markerfacecolor", get (h, "markerfacecolor"),
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	233 "markeredgecolor", get (h, "markeredgecolor"),
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	234 "markersize", get (h, "markersize"));
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	235 endfunction
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	236
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	237 function update_data (h, d)
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	238 x = get (h, "xdata");
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	239 y = get (h, "ydata");
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	240
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	241 nr = length (x);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	242 len = 2 * nr - 1;
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	243 xs = ys = zeros (1, len);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	244
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	245 xs(1) = x(1);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	246 ys(1) = y(1);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	247
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	248 xtmp = x(2:nr);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	249 ridx = 2:2:len-1;
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	250 xs(ridx) = xtmp;
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	251 ys(ridx) = y(1:nr-1);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	252
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	253 ridx = 3:2:len;
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	254 xs(ridx) = xtmp;
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	255 ys(ridx) = y(2:nr);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	256
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	257 set (get (h, "children"), "xdata", xs, "ydata", ys);
9a6f4713f765 Add area, bar, quiver and stair series graphics objects. Document them David Bateman <dbateman@free.fr> parents: 7746 diff changeset	258 endfunction

Mercurial > octave

annotate scripts/plot/stairs.m @ 12099:b8fa8cba212f release-3-2-x