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