jwe/octave: scripts/plot/draw/private/__ezplot_

annotate scripts/plot/draw/private/ezplot.m @ 28432:7a8c69c4eb55 stable

convert obsolete octave_fcn_inline object to @inline class Use a legacy @class object to provide inline function objects instead of using a built-in class derived from the octave_function_handle class. * scripts/legacy/@inline: New directory containing the following files: argnames.m, char.m, feval.m, formula.m, inline.m, subsref.m, vectorize.m. * scripts/legacy/@inline/module.mk: New file. * scripts/legacy/module.mk, scripts/module.mk: Update. * test/inline-fcn.tst: New tests. * test/module.mk: Update. * ov-fcn-inline.h, ov-fcn-inline.cc: Delete. Remove all uses. * libinterp/octave-value/module.mk: Update. * external.txi, func.txi, octave.texi, plot.txi, quad.txi: Eliminate discusion of inline function objects. * fplot.m, __ezplot__.m: Use isa to identify inline objects instead of instead of checking typeinfo. * ov-fcn-handle.cc, ov-typeinfo.cc: Fix tests. * ov-base.h, ov-base.cc (octave_base_value::fcn_inline_value): Delete. * ov.h, ov.cc (octave_value::fcn_inline_value): Delete. (octave_value::xfcn_inline_value): Delete value extractor. * ov-class.cc, ov-class.h (octave_inline, octave_inline_fcn): New classes that allow us to preserve the is_inline_function and function_value methods that were previously available in the octave_fcn_inline class. (F__inline_ctor__): New function for final construction of inline objects. * ls-hdf5.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc: Handle loading of inline function objects from old files as special cases. New inline function objects will be saved and loaded as ordinary @class objects.

author	John W. Eaton <jwe@octave.org>
date	Mon, 23 Mar 2020 15:29:49 -0400
parents	bd51beb6205e
children	e3a337a57588 0a5b15007766

rev	line source
27928 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	1 ########################################################################
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	2 ##
27924 1891570abac8 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	3 ## Copyright (C) 2007-2020 The Octave Project Developers
27923 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26671 diff changeset	4 ##
27928 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	5 ## See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	6 ## distribution or <https://octave.org/copyright/>.
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	7 ##
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	8 ## This file is part of Octave.
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	9 ##
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	10 ## Octave is free software: you can redistribute it and/or modify it
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	11 ## under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	12 ## the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22351 diff changeset	13 ## (at your option) any later version.
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	14 ##
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	15 ## Octave is distributed in the hope that it will be useful, but
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	16 ## WITHOUT ANY WARRANTY; without even the implied warranty of
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22351 diff changeset	17 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22351 diff changeset	18 ## GNU General Public License for more details.
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	19 ##
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	20 ## You should have received a copy of the GNU General Public License
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	21 ## along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	22 ## <https://www.gnu.org/licenses/>.
27928 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	23 ##
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27924 diff changeset	24 ########################################################################
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	25
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8046 diff changeset	26 ## -- texinfo --
20852 516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	27 ## @deftypefn {} {[@var{h}, @var{needusage}] =} __ezplot__ (@var{pltfunc}, @var{varargin})
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8046 diff changeset	28 ## Undocumented internal function.
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8046 diff changeset	29 ## @end deftypefn
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	30
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	31 ## Overview: This function is the back-end for the 9 ez* plot functions.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	32 ## As such, most of the function is actually dedicated to sorting
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	33 ## out the inputs and verifying that the particular ez* function
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	34 ## called was called correctly. The actual plotting occurs near
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	35 ## the end in an unwind_protect block.
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	36
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	37 function [h, needusage] = __ezplot__ (pltfunc, varargin)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	38
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	39 ezfunc = ["ez" pltfunc];
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	40
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	41 [hax, varargin, nargin] = __plt_get_axis_arg__ (ezfunc, varargin{:});
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	42
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	43 ## Define outputs early in case of shorting out of function with return;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	44 h = [];
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	45 needusage = false;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	46 if (nargin < 1)
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	47 needusage = true;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	48 return;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	49 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	50
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	51 iscontour = strncmp (pltfunc, "contour", 7);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	52
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	53 ## Defaults for ezplot
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	54 isplot = true;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	55 isplot3 = false;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	56 ispolar = false;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	57 nargs = 1;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	58 switch (pltfunc)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	59 case "plot"
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	60 ## defaults already set
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	61
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	62 case "plot3"
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	63 isplot = false;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	64 isplot3 = true;
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	65
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	66 case "polar"
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	67 isplot = false;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	68 ispolar = true;
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	69
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	70 otherwise
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	71 ## contour, mesh, surf plots
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	72 isplot = false;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	73 nargs = 2;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	74
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	75 endswitch
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	76
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	77 parametric = false;
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	78 fun = varargin{1};
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	79 if (ischar (fun))
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	80 if (exist (fun, "file") \|\| exist (fun, "builtin"))
20499 c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	81 fun = str2func (fun); # convert to function handle
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	82 else
20499 c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	83 fun = vectorize (inline (fun)); # convert to inline function
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	84 endif
20499 c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	85 endif
c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	86
28432 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	87 if (isa (fun, "inline"))
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	88 argids = argnames (fun);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	89 if (isplot && length (argids) == 2)
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	90 nargs = 2;
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	91 elseif (numel (argids) != nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	92 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	93 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	94 fun = vectorize (fun);
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	95 fstr = formula (fun);
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	96 if (isplot)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	97 xarg = argids{1};
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	98 if (nargs == 2)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	99 yarg = argids{2};
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	100 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	101 yarg = "";
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	102 endif
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	103 elseif (isplot3)
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	104 xarg = "x";
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	105 yarg = "y";
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	106 elseif (isplot \|\| ispolar)
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	107 xarg = "";
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	108 yarg = "";
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	109 else
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	110 xarg = argids{1};
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	111 yarg = argids{2};
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	112 endif
25806 23483673ba43 Use is_function_handle instead of isa (x, "function_handle"). Rik <rik@octave.org> parents: 25054 diff changeset	113 elseif (is_function_handle (fun))
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	114 fstr = func2str (fun);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	115 idx = index (fstr, ')');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	116 if (idx != 0)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	117 args = regexp (fstr(3:(idx-1)), '\w+', 'match');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	118 fstr = fstr(idx+2:end); # remove '@(x) ' from string name
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	119 else
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	120 args = {"x"};
20499 c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	121 try
c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	122 if (builtin ("nargin", fun) == 2)
c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	123 args{2} = "y";
c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	124 endif
c0566df8cde3 Generate correct ezplot for 2-input functions (bug #46004). Rik <rik@octave.org> parents: 19697 diff changeset	125 end_try_catch
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	126 endif
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	127 if (isplot && length (args) == 2)
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	128 nargs = 2;
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	129 elseif (numel (args) != nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	130 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	131 endif
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	132 if (isplot)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	133 xarg = args{1};
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	134 if (nargs == 2)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	135 yarg = args{2};
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	136 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	137 yarg = "";
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	138 endif
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	139 elseif (isplot3)
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	140 xarg = "x";
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	141 yarg = "y";
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	142 elseif (ispolar)
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	143 xarg = "";
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	144 yarg = "";
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	145 else
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	146 xarg = args{1};
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	147 yarg = args{2};
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	148 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	149 else
28432 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	150 error ("%s: F must be a string or function handle", ezfunc);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	151 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	152
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	153 if (nargin > 2 \|\| (nargin == 2 && isplot))
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	154 funx = fun;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	155 fstrx = fstr;
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	156 funy = varargin{2};
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	157 if (ischar (funy) && ! strcmp (funy, "circ") && ! strcmp (funy, "animate"))
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	158 parametric = true;
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	159 if (exist (funy, "file") \|\| exist (funy, "builtin"))
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	160 funy = inline ([funy "(t)"]);
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	161 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	162 funy = vectorize (inline (funy));
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	163 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	164 if (numel (argnames (funy)) != nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	165 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	166 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	167 fstry = formula (funy);
28432 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	168 elseif (isa (funy, "inline"))
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	169 parametric = true;
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	170 if (numel (argnames (funy)) != nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	171 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	172 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	173 funy = vectorize (funy);
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	174 fstry = formula (funy);
25806 23483673ba43 Use is_function_handle instead of isa (x, "function_handle"). Rik <rik@octave.org> parents: 25054 diff changeset	175 elseif (is_function_handle (funy))
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	176 parametric = true;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	177 fstry = func2str (funy);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	178 idx = index (fstry, ')');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	179 if (idx != 0)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	180 args = regexp (fstry(3:(idx-1)), '\w+', 'match');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	181 fstry = fstry(idx+2:end); # remove '@(x) ' from string name
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	182 else
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	183 args = {"y"};
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	184 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	185 if (numel (args) != nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	186 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	187 endif
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	188 endif
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	189
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	190 if (! parametric && isplot3)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	191 needusage = true; # Can't call non-parametric ezplot3
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	192 return;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	193 elseif (parametric && isplot)
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	194 if (nargs == 2)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	195 error ("%s: can not define a parametric function in this manner", ezfunc);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	196 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	197 xarg = "x";
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	198 yarg = "y";
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	199 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	200 elseif (parametric)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	201 funz = varargin{3};
11149 fe3c3dfc07eb style fix: break lines before && and \|\|, not after John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	202 if (ischar (funz) && ! strcmp (funz, "circ")
fe3c3dfc07eb style fix: break lines before && and \|\|, not after John W. Eaton <jwe@octave.org> parents: 11032 diff changeset	203 && ! strcmp (funz, "animate"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	204 if (exist (funz, "file") \|\| exist (funz, "builtin"))
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	205 funz = inline ([funz "(t)"]);
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	206 else
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	207 funz = vectorize (inline (funz));
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	208 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	209 if (numel (argnames (funz)) > nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	210 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	211 endif
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	212 fstrz = formula (funz);
28432 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27928 diff changeset	213 elseif (isa (funz, "inline"))
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	214 if (numel (argnames (funz)) != nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	215 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	216 endif
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	217 funz = vectorize (funz);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	218 fstrz = formula (funz);
25806 23483673ba43 Use is_function_handle instead of isa (x, "function_handle"). Rik <rik@octave.org> parents: 25054 diff changeset	219 elseif (is_function_handle (funz))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	220 fstrz = func2str (funz);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	221 idx = index (fstrz, ')');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	222 if (idx != 0)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	223 args = regexp (fstrz(3:(idx-1)), '\w+', 'match');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	224 fstrz = fstrz(idx+2:end); # remove '@(x) ' from string name
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	225 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	226 args = {"z"};
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	227 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	228 if (numel (args) != nargs)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	229 error ("%s: expecting a function of %d arguments", ezfunc, nargs);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	230 endif
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	231 else
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20499 diff changeset	232 error ("%s: parametric plots require 3 functions", ezfunc);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	233 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	234 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	235 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	236
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	237 if ((isplot && nargs != 2) \|\| isplot3 \|\| ispolar)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	238 n = 500; # default for point-style functions like plot
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	239 else
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	240 n = 60; # default for meshgrid style functions like contour, surf
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	241 endif
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	242 domain = [];
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	243 circ = false;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	244 animate = false;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	245 if (parametric)
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	246 if (isplot)
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	247 iarg = 3;
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	248 else
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	249 iarg = 4;
c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	250 endif
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	251 else
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	252 iarg = 2;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	253 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	254 while (iarg <= nargin)
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	255 arg = varargin{iarg++};
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	256 if (ischar (arg) && strcmp (arg, "circ"))
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	257 circ = true;
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	258 elseif (ischar (arg) && strcmp (arg, "animate"))
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	259 animate = true;
21560 96c768d898f0 Use stricter input validation for ezplot N, DOM inputs (bug #46952). Rik <rik@octave.org> parents: 21385 diff changeset	260 elseif (isscalar (arg) && (n == 60 \|\| n == 500))
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	261 n = arg;
21560 96c768d898f0 Use stricter input validation for ezplot N, DOM inputs (bug #46952). Rik <rik@octave.org> parents: 21385 diff changeset	262 elseif (numel (arg) == 2 && isempty (domain))
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	263 domain = [arg(1) arg(2) arg(1) arg(2)];
21560 96c768d898f0 Use stricter input validation for ezplot N, DOM inputs (bug #46952). Rik <rik@octave.org> parents: 21385 diff changeset	264 elseif (numel (arg) == 4 && isempty (domain))
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	265 domain = arg(:).';
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	266 else
21560 96c768d898f0 Use stricter input validation for ezplot N, DOM inputs (bug #46952). Rik <rik@octave.org> parents: 21385 diff changeset	267 error ("%s: expecting scalar N, or 2-/4-element vector DOM", ezfunc);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	268 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	269 endwhile
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	270
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	271 if (circ && (iscontour \|\| isplot3 \|\| isplot))
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	272 needusage = true;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	273 return;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	274 elseif (circ && parametric)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	275 error ("%s: can not have both circular domain and parametric function",
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	276 ezfunc);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	277 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	278
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	279 if (animate && ! isplot3)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	280 error ("%s: animate option only valid for ezplot3", ezfunc);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	281 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	282
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	283 if (parametric)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	284 ## Make the label strings pretty by removing extra spaces between base
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	285 ## and exponent, the '.' in vectorized code, and the '*' for multiply.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	286 fstrx = regexprep (regexprep (regexprep (fstrx,
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	287 '\s\.?(?:\^\|\\)\s','^'), '\.([/+-])', '$1'), '\s\.?\\s*', ' ');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	288 fstry = regexprep (regexprep (regexprep (fstry,
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	289 '\s\.?(?:\^\|\\)\s','^'), '\.([/+-])', '$1'), '\s\.?\\s*', ' ');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	290 if (isplot)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	291 fstr = ["x = " fstrx ", y = " fstry];
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	292 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	293 fstrz = regexprep (regexprep (regexprep (fstrz,
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	294 '\s\.?(?:\^\|\\)\s','^'), '\.([/+-])', '$1'), '\s\.?\\s*', ' ');
22308 b756cea4fdea __ezplot__.m: Fix Matlab incompatibilities. Rik <rik@octave.org> parents: 21561 diff changeset	295 fstr = ["x = " fstrx ", y = " fstry ", z = " fstrz];
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	296 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	297 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	298 fstr = regexprep (regexprep (regexprep (fstr,
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	299 '\s\.?(?:\^\|\\)\s','^'), '\.([/+-])', '$1'), '\s\.?\\s*', ' ');
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	300 if (isplot && nargs == 2)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	301 fstr = [fstr " = 0"]; # make title string of implicit function
22309 46d39db0c571 __ezplot__.m: Add 'r = ' to the title string for ezpolar plots. Rik <rik@octave.org> parents: 22308 diff changeset	302 elseif (ispolar)
46d39db0c571 __ezplot__.m: Add 'r = ' to the title string for ezpolar plots. Rik <rik@octave.org> parents: 22308 diff changeset	303 fstr = ["r = " fstr];
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	304 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	305 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	306
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	307 if (isempty (domain))
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	308 auto_domain = true;
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	309 if (isplot3 \|\| ispolar)
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	310 domain = [0, 2pi, 0, 2pi];
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	311 else
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	312 domain = [-2pi, 2pi, -2pi, 2pi];
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	313 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	314 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	315 auto_domain = false;
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	316 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	317
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	318 auto_domain_done = false;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	319 do
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	320 domain_ok = true;
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	321
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	322 if ((isplot && nargs == 1) \|\| isplot3 \|\| ispolar)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	323 X = linspace (domain(1), domain(2), n);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	324 elseif (isplot && numel (domain) == 2)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	325 x = linspace (domain(1), domain(2), n);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	326 [X, Y] = meshgrid (x, x);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	327 elseif (circ)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	328 ## To plot on circular domain develop grid in polar coordinates
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	329 ## and then switch these to Cartesian coordinates.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	330 cent = [domain(1) + domain(2), domain(3) + domain(4)] / 2;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	331 rmax = sqrt ((domain(2) - cent(1))^2 + (domain(4) - cent(2))^2);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	332 r = linspace (0, rmax, n);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	333 t = linspace (0, 2*pi, n);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	334 [T, R] = meshgrid (t, r);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	335 X = R .* cos (T) + cent(1);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	336 Y = R .* sin (T) + cent(2);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	337 domain = [-rmax+cent(1), +rmax+cent(1), -rmax+cent(2), +rmax+cent(2)];
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	338 else # contour, mesh, surf plots
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	339 x = linspace (domain(1), domain(2), n);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	340 y = linspace (domain(3), domain(4), n);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	341 [X, Y] = meshgrid (x, y);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	342 endif
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	343
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	344 if (parametric)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	345 if (isplot)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	346 XX = feval (funx, X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	347 Z = feval (funy, X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	348 X = XX;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	349 elseif (isplot3)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	350 Z = feval (funz, X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	351 XX = feval (funx, X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	352 YY = feval (funy, X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	353 X = XX;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	354 Y = YY;
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	355 else
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	356 Z = feval (funz, X, Y);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	357 XX = feval (funx, X, Y);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	358 YY = feval (funy, X, Y);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	359 X = XX;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	360 Y = YY;
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	361
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	362 ## Eliminate the singularities
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	363 X = __eliminate_sing__ (X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	364 Y = __eliminate_sing__ (Y);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	365 Z = __eliminate_sing__ (Z);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	366 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	367 else ## non-parametric plots
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	368 if (isplot && nargs == 2)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	369 Z = feval (fun, X, Y);
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	370
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	371 ## Matlab returns line objects for this case and so can't call
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	372 ## contour directly as it returns patch objects to allow colormaps
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	373 ## to work with contours. Therefore recreate the lines from the
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	374 ## output for contourc, and store in cell arrays.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	375 [c, ~] = contourc (X, Y, Z, [0, 0]);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	376
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	377 i = 1;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	378 XX = YY = {};
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	379 while (i < length (c))
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	380 clev = c(1,i);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	381 clen = c(2,i);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	382 XX = [XX, {c(1, i+1:i+clen)}];
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	383 YY = [YY, {c(2, i+1:i+clen)}];
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	384 i += clen+1;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	385 endwhile
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	386 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	387 if (ispolar)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	388 Z = feval (fun, X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	389 ## FIXME: Why aren't singularities eliminated for polar plots?
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	390 elseif (isplot)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	391 Z = feval (fun, X);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	392 ## Eliminate the singularities
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	393 Z = __eliminate_sing__ (Z);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	394 domain = find_valid_domain (X, [], Z);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	395 elseif (iscontour)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	396 Z = feval (fun, X, Y);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	397 Z = __eliminate_sing__ (Z);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	398 else # mesh, surf plots
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	399 Z = feval (fun, X, Y);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	400 Z = __eliminate_sing__ (Z);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	401 if (circ)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	402 ## Use domain calculated at the start.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	403 ## The X, Y grids are non-monotonic after conversion from polar
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	404 ## coordinates and find_valid_domain fails.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	405
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	406 elseif (auto_domain && ! auto_domain_done)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	407 valid_domain = find_valid_domain (X, Y, Z);
22882 9b096bffc10d Fix plotting of constant functions with ezplot (bug #49766). Rik <rik@octave.org> parents: 22767 diff changeset	408 domain_ok = all (domain == valid_domain);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	409 domain = valid_domain;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	410 auto_domain_done = true; # ensures only 1 round of do loop done
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	411 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	412 if (! auto_domain_done)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	413 domain = find_valid_domain (X, Y, Z);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	414 endif
17306 09543e9c8f40 Use explicit form of end (endif, endfor, etc.) in core m-files. Rik <rik@octave.org> parents: 17301 diff changeset	415 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	416 endif
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	417 endif
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	418 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	419 until (domain_ok)
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	420
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	421 ## Now, actually call the correct plot function with valid data and domain.
17211 87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations. Rik <rik@octave.org> parents: 17167 diff changeset	422 oldfig = [];
17301 68bcac3c043a Correct inversion accidentally introduced in cset 87ba70043bfc. Rik <rik@octave.org> parents: 17211 diff changeset	423 if (! isempty (hax))
17211 87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations. Rik <rik@octave.org> parents: 17167 diff changeset	424 oldfig = get (0, "currentfigure");
87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations. Rik <rik@octave.org> parents: 17167 diff changeset	425 endif
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	426 unwind_protect
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	427 hax = newplot (hax);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	428 if (iscontour)
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	429 [~, h] = feval (pltfunc, hax, X, Y, Z);
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	430 elseif (isplot && nargs == 2)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	431 h = zeros (length (XX), 1);
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	432 hold_state = get (hax, "nextplot");
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	433 for i = 1 : length (XX)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	434 if (i == 1)
22308 b756cea4fdea __ezplot__.m: Fix Matlab incompatibilities. Rik <rik@octave.org> parents: 21561 diff changeset	435 h(1) = plot (hax, XX{1}, YY{1});
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	436 set (hax, "nextplot", "add");
22308 b756cea4fdea __ezplot__.m: Fix Matlab incompatibilities. Rik <rik@octave.org> parents: 21561 diff changeset	437 color = get (h(1), "color");
b756cea4fdea __ezplot__.m: Fix Matlab incompatibilities. Rik <rik@octave.org> parents: 21561 diff changeset	438 else
b756cea4fdea __ezplot__.m: Fix Matlab incompatibilities. Rik <rik@octave.org> parents: 21561 diff changeset	439 h(i) = plot (hax, XX{i}, YY{i}, "color", color);
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9896 diff changeset	440 endif
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	441 endfor
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	442 set (hax, "nextplot", hold_state);
27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	443 axis (hax, domain);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	444 elseif (isplot \|\| ispolar)
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	445 h = feval (pltfunc, hax, X, Z);
18718 a50d0d85dc73 Set axis equal for 2D parametric plots done with ezplot. Rik <rik@octave.org> parents: 17744 diff changeset	446 if (isplot)
a50d0d85dc73 Set axis equal for 2D parametric plots done with ezplot. Rik <rik@octave.org> parents: 17744 diff changeset	447 if (! parametric)
a50d0d85dc73 Set axis equal for 2D parametric plots done with ezplot. Rik <rik@octave.org> parents: 17744 diff changeset	448 axis (hax, domain);
a50d0d85dc73 Set axis equal for 2D parametric plots done with ezplot. Rik <rik@octave.org> parents: 17744 diff changeset	449 else
a50d0d85dc73 Set axis equal for 2D parametric plots done with ezplot. Rik <rik@octave.org> parents: 17744 diff changeset	450 axis ("equal");
a50d0d85dc73 Set axis equal for 2D parametric plots done with ezplot. Rik <rik@octave.org> parents: 17744 diff changeset	451 endif
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	452 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	453 elseif (isplot3)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	454 if (animate)
26671 fec69a310833 __ezplot__.m: for ezplot3, draw "animate" plot just once. Rik <rik@octave.org> parents: 26379 diff changeset	455 comet3 (hax, X, Y, Z);
fec69a310833 __ezplot__.m: for ezplot3, draw "animate" plot just once. Rik <rik@octave.org> parents: 26379 diff changeset	456 else
fec69a310833 __ezplot__.m: for ezplot3, draw "animate" plot just once. Rik <rik@octave.org> parents: 26379 diff changeset	457 h = feval (pltfunc, hax, X, Y, Z);
8046 c4482fc30c7f Add the ezplot function David Bateman <dbateman@free.fr> parents: 7540 diff changeset	458 endif
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	459 grid (hax, "on");
27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	460 zlabel (hax, "z");
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	461 else # mesh and surf plots
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	462 h = feval (pltfunc, hax, X, Y, Z);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	463 ## FIXME: surf, mesh should really do a better job of setting zlim
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	464 if (! parametric)
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	465 axis (hax, domain);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	466 endif
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	467 endif
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	468 xlabel (hax, xarg);
27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	469 ylabel (hax, yarg);
27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	470 title (hax, fstr);
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	471 unwind_protect_cleanup
17054 27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	472 if (! isempty (oldfig))
27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	473 set (0, "currentfigure", oldfig);
27b3a675ea6b __ezplot__.m: Update to use new __plt_get_axis_arg__. Rik <rik@octave.org> parents: 16993 diff changeset	474 endif
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	475 end_unwind_protect
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	476
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	477 endfunction
e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	478
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	479 ## Eliminate bad data (complex values, infinities, singularities)
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	480 function x = __eliminate_sing__ (x)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	481 if (iscomplex (x))
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	482 x(imag (x) != 0) = NaN;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	483 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	484 x(isinf (x)) = NaN;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	485 ## High rates of curvature are treated as singularities
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	486 threshold = 0.2 * (max (x(:)) - min (x(:)));
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	487 x(abs (del2 (x)) > threshold) = NaN;
7337 e70789e0cd92 [project @ 2007-12-28 21:04:44 by jwe] jwe parents: diff changeset	488 endfunction
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	489
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	490 ## Find: 1) range of function where there are not NaN values,
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	491 ## 2) function is changing (not just flat surface)
22767 212333a97d8d maint: Remove dangling ';' from m-file function declarations. Rik <rik@octave.org> parents: 22755 diff changeset	492 function domain = find_valid_domain (X, Y, Z)
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	493
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	494 if (isvector (Z))
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	495 ## 2-D data for isplot
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	496 domain = [X(1) X(end)];
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	497
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	498 ## Guess a range which includes the "mass" of the data by using a
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	499 ## median-based approach. The center 3/4 of the data is used to
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	500 ## determine the range of the data.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	501 ## This seems to be vaguely what Matlab does, but can't be sure.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	502 XX = sort (Z(isfinite (Z)));
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	503 if (length (X) > 4)
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	504 irlo = XX(fix (1/8 * length (XX)));
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	505 irhi = XX(fix (7/8 * length (XX)));
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	506 d = irhi - irlo;
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	507 domain(3) = max (XX(1) - d/8, irlo - d);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	508 domain(4) = min (XX(end) + d/8, irhi + d);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	509 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	510 domain(3:4) = [XX(1), XX(end)];
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	511 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	512
22882 9b096bffc10d Fix plotting of constant functions with ezplot (bug #49766). Rik <rik@octave.org> parents: 22767 diff changeset	513 ## Handle exceptional case of constant function
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22882 diff changeset	514 if (domain(3) == domain(4))
22882 9b096bffc10d Fix plotting of constant functions with ezplot (bug #49766). Rik <rik@octave.org> parents: 22767 diff changeset	515 domain(3) -= 1;
9b096bffc10d Fix plotting of constant functions with ezplot (bug #49766). Rik <rik@octave.org> parents: 22767 diff changeset	516 domain(4) += 1;
9b096bffc10d Fix plotting of constant functions with ezplot (bug #49766). Rik <rik@octave.org> parents: 22767 diff changeset	517 endif
9b096bffc10d Fix plotting of constant functions with ezplot (bug #49766). Rik <rik@octave.org> parents: 22767 diff changeset	518
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	519 else
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	520 ## 3-D data such as mesh, surf
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	521 Zfinite = ! isnan (Z);
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	522 Zrows = any (Zfinite, 2);
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	523 rmin = find (Zrows, 1, "first");
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	524 rmax = find (Zrows, 1, "last");
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	525 Zcols = any (Zfinite, 1);
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	526 cmin = find (Zcols, 1, "first");
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	527 cmax = find (Zcols, 1, "last");
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	528
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	529 ## Handle nasty case of all NaNs
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	530 if (isempty (rmin))
21385 89fa0694aa2e Fix check-missing-semicolon QA target (bug #47277). Rik <rik@octave.org> parents: 20852 diff changeset	531 rmin = 1; rmax = rows (Z);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	532 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	533 if (isempty (cmin))
21385 89fa0694aa2e Fix check-missing-semicolon QA target (bug #47277). Rik <rik@octave.org> parents: 20852 diff changeset	534 cmin = 1; cmax = columns (Z);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	535 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	536
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	537 if ( ! any (isnan (Z([rmin, rmax],:)(:)))
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	538 && ! any (isnan (Z(:, [cmin, cmax])(:))))
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	539 ## Exclude surfaces along borders which are flat (gradient =~ 0).
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	540 ## Technically, this calculation might be better done with actual
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	541 ## deltaX, deltaY values. But, data is usually meshgridded
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	542 ## (constant spacing) so working with deltaROW#, deltaCOL# is fine.
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	543 [Zx, Zy] = gradient (Z(rmin:rmax, cmin:cmax));
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	544 Zgrad = sqrt (Zx.^2 + Zy.^2);
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	545 slope = ((max (Z(:)) - min (Z(:)))
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	546 / sqrt ((rmax - rmin)^2 + (cmax - cmin)^2));
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	547 slope /= 125; # threshold for discarding points.
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	548 Zrows = any (Zgrad > slope, 2);
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	549 rmin += find (Zrows, 1, "first") - 1;
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	550 rmax += find (Zrows, 1, "last") - rows (Zrows);
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	551 Zcols = any (Zgrad > slope, 1);
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	552 cmin += find (Zcols, 1, "first") - 1;
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	553 cmax += find (Zcols, 1, "last") - columns (Zcols);
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	554 endif
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	555
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	556 domain = [X(1,cmin) X(1,cmax) Y(rmin,1) Y(rmax,1)];
78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	557 endif
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	558
16993 78f57b14535c Overhaul ez* family of plot functions. Rik <rik@octave.org> parents: 14868 diff changeset	559 endfunction

Mercurial > jwe > octave

annotate scripts/plot/draw/private/__ezplot__.m @ 28432:7a8c69c4eb55 stable

annotate scripts/plot/draw/private/ezplot.m @ 28432:7a8c69c4eb55 stable