Mercurial > hg > octave-terminal
changeset 7431:1edef460c5fe
[project @ 2008-01-30 08:13:52 by jwe]
author | jwe |
---|---|
date | Wed, 30 Jan 2008 08:13:52 +0000 |
parents | 8b7c7998d78f |
children | 3c999b2b5de8 |
files | scripts/ChangeLog scripts/plot/Makefile.in scripts/plot/__plt2sv__.m scripts/plot/__plt2vs__.m |
diffstat | 4 files changed, 127 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,8 @@ 2008-01-30 John W. Eaton <jwe@octave.org> + * plot/Makefile.in (SOURCES): Include __plt2sv__.m and + __plt2vs__.m in the list. + * miscellaneous/tempdir.m: Append filesep to name for compatibility. Warn if not a directory or directory does not exist.
--- a/scripts/plot/Makefile.in +++ b/scripts/plot/Makefile.in @@ -58,7 +58,9 @@ __plt2mm__.m \ __plt2mv__.m \ __plt2ss__.m \ + __plt2sv__.m \ __plt2vm__.m \ + __plt2vs__.m \ __plt2vv__.m \ __plt__.m \ __plt_get_axis_arg__.m \
new file mode 100644 --- /dev/null +++ b/scripts/plot/__plt2sv__.m @@ -0,0 +1,61 @@ +## Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2003, 2005, +## 2006, 2007 John W. Eaton +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +## Undocumented internal function. + +## Author: jwe + +function retval = __plt2sv__ (h, x, y, options, properties) + + if (nargin < 3 || nargin > 5) + print_usage (); + endif + + if (nargin < 4 || isempty (options)) + options = __default_plot_options__ (); + endif + + if (nargin < 5) + properties = {}; + endif + + if (isscalar (x) && isvector (y)) + len = numel (y); + if (numel (options) == 1) + options = repmat (options(:), len, 1); + endif + retval = zeros (len, 1); + for i = 1:len + tkey = options(i).key; + if (! isempty (tkey)) + set (h, "key", "on"); + endif + color = options(i).color; + if (isempty (color)) + color = __next_line_color__ (); + endif + retval(i) = line (x, y(i), "keylabel", tkey, "color", color, + "linestyle", options(i).linestyle, + "marker", options(i).marker, properties{:}); + endfor + else + error ("__plt2sv__: first arg must be scalar, second arg must be vector"); + endif + +endfunction
new file mode 100644 --- /dev/null +++ b/scripts/plot/__plt2vs__.m @@ -0,0 +1,61 @@ +## Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2003, 2005, +## 2006, 2007 John W. Eaton +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +## Undocumented internal function. + +## Author: jwe + +function retval = __plt2vs__ (h, x, y, options, properties) + + if (nargin < 3 || nargin > 5) + print_usage (); + endif + + if (nargin < 4 || isempty (options)) + options = __default_plot_options__ (); + endif + + if (nargin < 5) + properties = {}; + endif + + if (isvector (x) && isscalar (y)) + len = numel (x); + if (numel (options) == 1) + options = repmat (options(:), len, 1); + endif + retval = zeros (len, 1); + for i = 1:len + tkey = options(i).key; + if (! isempty (tkey)) + set (h, "key", "on"); + endif + color = options(i).color; + if (isempty (color)) + color = __next_line_color__ (); + endif + retval(i) = line (x(i), y, "keylabel", tkey, "color", color, + "linestyle", options(i).linestyle, + "marker", options(i).marker, properties{:}); + endfor + else + error ("__plt2vs__: first arg must be vector, second arg must be scalar"); + endif + +endfunction