Mercurial > hg > octave-nkf
diff scripts/plot/__plt2vv__.m @ 6146:1a6d826e92b5
[project @ 2006-11-09 03:13:11 by jwe]
author | jwe |
---|---|
date | Thu, 09 Nov 2006 03:15:23 +0000 |
parents | 34f96dd5441b |
children | 44c91c5dfe1d |
line wrap: on
line diff
--- a/scripts/plot/__plt2vv__.m +++ b/scripts/plot/__plt2vv__.m @@ -23,14 +23,26 @@ ## Author: jwe -function [data, fmtstr] = __plt2vv__ (x, y, fmt) +function [data, fmtstr, key] = __plt2vv__ (x, y, fmt, keystr) - if (nargin < 2 || nargin > 3 || nargout != 2) + if (nargin < 2 || nargin > 4 || nargout < 2 || nargout > 3) print_usage (); - elseif (nargin == 2) - fmt = ""; - elseif (rows (fmt) > 1) - fmt = fmt (1, :); + endif + + if (nargin < 3) + fmt = {""}; + endif + + if (nargin < 4) + keystr = {""}; + endif + + if (rows (fmt) > 1) + fmt = fmt(1); + endif + + if (rows (keystr) > 1) + keystr = keystr(1); endif [x_nr, x_nc] = size (x); @@ -54,7 +66,8 @@ error ("__plt2vv__: vector lengths must match"); endif - data = [x, y]; + data = {[x, y]}; fmtstr = fmt; + key = keystr; endfunction