Mercurial > hg > octave-lyh

annotate scripts/plot/surface.m @ 17059:c935a0db31c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errorbar.m: Update to use new __plt_get_axis_arg__. * scripts/plot/errorbar.m: Update to use new __plt_get_axis_arg__.
author Rik <rik@octave.org>
date Wed, 24 Jul 2013 23:12:46 -0700
parents 55b76fd1244b
children eaab03308c0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 14001
diff changeset
1 ## Copyright (C) 1993-2012 John W. Eaton
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
2 ##
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
3 ## This file is part of Octave.
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
4 ##
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
8 ## your option) any later version.
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
9 ##
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
13 ## General Public License for more details.
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
14 ##
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
17 ## <http://www.gnu.org/licenses/>.
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
18
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
19 ## -*- texinfo -*-
10634
60542efcfa2c Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
20 ## @deftypefn {Function File} {} surface (@var{x}, @var{y}, @var{z}, @var{c})
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
21 ## @deftypefnx {Function File} {} surface (@var{x}, @var{y}, @var{z})
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
22 ## @deftypefnx {Function File} {} surface (@var{z}, @var{c})
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
23 ## @deftypefnx {Function File} {} surface (@var{z})
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
24 ## @deftypefnx {Function File} {} surface (@dots{}, @var{prop}, @var{val})
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
25 ## @deftypefnx {Function File} {} surface (@var{h}, @dots{})
7650
eb7bdde776f2 Texinfo fixes
John W. Eaton <jwe@octave.org>
parents: 7298
diff changeset
26 ## @deftypefnx {Function File} {@var{h} =} surface (@dots{})
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
27 ## Plot a surface graphic object given matrices @var{x}, and @var{y} from
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
28 ## @code{meshgrid} and a matrix @var{z} corresponding to the @var{x} and
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
29 ## @var{y} coordinates of the surface. If @var{x} and @var{y} are vectors,
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
30 ## then a typical vertex is (@var{x}(j), @var{y}(i), @var{z}(i,j)). Thus,
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
31 ## columns of @var{z} correspond to different @var{x} values and rows of
9040
dbd0c77e575e Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents: 8920
diff changeset
32 ## @var{z} correspond to different @var{y} values. If @var{x} and @var{y}
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
33 ## are missing, they are constructed from size of the matrix @var{z}.
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
34 ##
8347
fa78cb8d8a5c corrections for typos
Brian Gough<bjg@network-theory.co.uk>
parents: 7650
diff changeset
35 ## Any additional properties passed are assigned to the surface.
14001
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 13194
diff changeset
36 ##
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 13194
diff changeset
37 ## The optional return value @var{h} is a graphics handle to the created
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 13194
diff changeset
38 ## surface object.
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
39 ## @seealso{surf, mesh, patch, line}
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
40 ## @end deftypefn
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
41
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
42 ## Author: jwe
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
43
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
44 function h = surface (varargin)
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
45
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
46 [hax, varargin] = __plt_get_axis_arg__ ("surface", varargin{:});
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
47
17040
55b76fd1244b surface.m: Update to use new __plt_get_axis_arg__ without using "axes" function.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 16986
diff changeset
48 if (isempty (hax))
55b76fd1244b surface.m: Update to use new __plt_get_axis_arg__ without using "axes" function.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 16986
diff changeset
49 hax = gca ();
55b76fd1244b surface.m: Update to use new __plt_get_axis_arg__ without using "axes" function.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 16986
diff changeset
50 endif
55b76fd1244b surface.m: Update to use new __plt_get_axis_arg__ without using "axes" function.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 16986
diff changeset
51
55b76fd1244b surface.m: Update to use new __plt_get_axis_arg__ without using "axes" function.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 16986
diff changeset
52 [htmp, bad_usage] = __surface__ (hax, varargin{:});
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
53
7207
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
54 if (bad_usage)
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
55 print_usage ();
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
56 endif
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
57
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
58 if (nargout > 0)
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
59 h = htmp;
7207
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
60 endif
7216
5389a52df87b [project @ 2007-11-29 19:07:29 by jwe]
jwe
parents: 7215
diff changeset
61
7207
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
62 endfunction
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
63
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
64 function [h, bad_usage] = __surface__ (ax, varargin)
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
65
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
66 h = 0;
7207
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
67 bad_usage = false;
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
68 firststring = nargin;
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
69 for i = 1 : (nargin - 1)
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
70 if (ischar (varargin{i}))
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
71 firststring = i;
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
72 break;
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
73 endif
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
74 endfor
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
75
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
76 if (firststring > 5)
7207
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
77 bad_usage = true;
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
78 return;
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
79 elseif (firststring == 5)
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
80 x = varargin{1};
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
81 y = varargin{2};
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
82 z = varargin{3};
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
83 c = varargin{4};
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
84
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
85 if (iscomplex (x) || iscomplex (y) || iscomplex (z) || iscomplex (c))
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
86 error ("mesh: X, Y, Z, C arguments must be real");
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
87 endif
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
88
13194
3e1871badab9 allow sscanf to accept character arrays with more than one row
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
89 [z_nr, z_nc] = size (z);
3e1871badab9 allow sscanf to accept character arrays with more than one row
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
90 [c_nr, c_nc, c_np] = size (c);
3e1871badab9 allow sscanf to accept character arrays with more than one row
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
91 if (! (z_nr == c_nr && z_nc == c_nc && (c_np == 1 || c_np == 3)))
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
92 error ("surface: Z and C must have the same size");
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
93 endif
13194
3e1871badab9 allow sscanf to accept character arrays with more than one row
John W. Eaton <jwe@octave.org>
parents: 13141
diff changeset
94
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
95 if (isvector (x) && isvector (y) && ismatrix (z))
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
96 if (rows (z) == length (y) && columns (z) == length (x))
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
97 x = x(:)';
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
98 y = y(:);
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
99 else
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
100 error ("surface: rows (Z) must be the same as length (Y) and columns (Z) must be the same as length (X)");
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
101 endif
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
102 elseif (ismatrix (x) && ismatrix (y) && ismatrix (z))
7292
5e90111a28b3 [project @ 2007-12-11 18:13:34 by jwe]
jwe
parents: 7284
diff changeset
103 if (! size_equal (x, y, z))
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
104 error ("surface: X, Y, and Z must have the same dimensions");
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
105 endif
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
106 else
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
107 error ("surface: X and Y must be vectors and Z must be a matrix");
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
108 endif
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
109 elseif (firststring == 4)
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
110 x = varargin{1};
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
111 y = varargin{2};
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
112 z = varargin{3};
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
113 c = z;
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
114
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
115 if (iscomplex (x) || iscomplex (y) || iscomplex (z))
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
116 error ("mesh: X, Y, Z arguments must be real");
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
117 endif
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
118
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
119 if (isvector (x) && isvector (y) && ismatrix (z))
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
120 if (rows (z) == length (y) && columns (z) == length (x))
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
121 x = x(:)';
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
122 y = y(:);
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
123 else
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
124 error ("surface: rows (Z) must be the same as length (Y) and columns (Z) must be the same as length (X)");
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
125 endif
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
126 elseif (ismatrix (x) && ismatrix (y) && ismatrix (z))
7292
5e90111a28b3 [project @ 2007-12-11 18:13:34 by jwe]
jwe
parents: 7284
diff changeset
127 if (! size_equal (x, y, z))
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
128 error ("surface: X, Y, and Z must have the same dimensions");
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
129 endif
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
130 else
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
131 error ("surface: X and Y must be vectors and Z must be a matrix");
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
132 endif
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
133 elseif (firststring == 3)
7208
a730e47fda4d [project @ 2007-11-28 02:32:41 by jwe]
jwe
parents: 7207
diff changeset
134 z = varargin{1};
a730e47fda4d [project @ 2007-11-28 02:32:41 by jwe]
jwe
parents: 7207
diff changeset
135 c = varargin{2};
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
136
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
137 if (iscomplex (z) || iscomplex (c))
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
138 error ("mesh: X, C arguments must be real");
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
139 endif
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
140
10634
60542efcfa2c Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
141 if (ismatrix (z) && !isvector (z) && !isscalar (z))
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
142 [nr, nc] = size (z);
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
143 x = 1:nc;
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
144 y = (1:nr)';
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
145 else
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
146 error ("surface: Z argument must be a matrix");
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
147 endif
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
148 elseif (firststring == 2)
7208
a730e47fda4d [project @ 2007-11-28 02:32:41 by jwe]
jwe
parents: 7207
diff changeset
149 z = varargin{1};
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
150 c = z;
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
151
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
152 if (iscomplex (z))
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
153 error ("mesh: Z argument must be real");
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
154 endif
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
155
10634
60542efcfa2c Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
156 if (ismatrix (z) && !isvector (z) && !isscalar (z))
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
157 [nr, nc] = size (z);
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
158 x = 1:nc;
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
159 y = (1:nr)';
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
160 else
11472
1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents: 10634
diff changeset
161 error ("surface: Z argument must be a matrix");
7175
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe]
jwe
parents: 7146
diff changeset
162 endif
13115
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
163 elseif (firststring == 1)
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
164 x = 1:3;
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
165 y = x';
14868
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14223
diff changeset
166 c = z = eye (3);
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
167 else
7207
71c03c7239fb [project @ 2007-11-28 02:19:25 by jwe]
jwe
parents: 7191
diff changeset
168 bad_usage = true;
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
169 return;
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents: 7175
diff changeset
170 endif
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
171
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
172 if (firststring < nargin)
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
173 other_args = varargin(firststring:end);
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
174 else
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
175 other_args = {}; # make a default surface object.
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
176 endif
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
177 h = __go_surface__ (ax, "xdata", x, "ydata", y, "zdata", z, "cdata", c,
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
178 other_args{:});
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
179
16986
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
180 if (! ishold ())
df66488b8d43 surface.m: Validate inputs are not complex.
Rik <rik@octave.org>
parents: 14868
diff changeset
181 set (ax, "view", [0, 90], "box", "off");
7277
0c733917b6c8 [project @ 2007-12-10 20:14:39 by jwe]
jwe
parents: 7216
diff changeset
182 endif
7109
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
183
5436efbf35e3 [project @ 2007-11-06 22:16:25 by jwe]
jwe
parents:
diff changeset
184 endfunction
12817
e3e6079039c6 codesprint: 2 demos for pcolor.m dummy for surface.m
Kai Habel <kai.habel@gmx.de>
parents: 11587
diff changeset
185
14223
ba7a26030214 Use Octave spacing convention in %!test blocks of surface plot functions.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
186
14001
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 13194
diff changeset
187 ## Functional tests for surface() are in surf.m, surfc.m, surfl.m, and pcolor.m
13115
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
188 %!test
13124
2ea1658ad049 Don't use explicit figure number for tests to avoid interference with any figures opened by user.
Kai Habel <kai.habel@gmx.de>
parents: 13115
diff changeset
189 %! hf = figure ("visible", "off");
13141
e81ddf9cacd5 maint: untabify and remove trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 13124
diff changeset
190 %! unwind_protect
13115
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
191 %! h = surface;
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
192 %! assert (findobj (hf, "type", "surface"), h);
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
193 %! assert (get (h, "xdata"), 1:3, eps);
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
194 %! assert (get (h, "ydata"), (1:3)', eps);
14868
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14223
diff changeset
195 %! assert (get (h, "zdata"), eye (3));
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14223
diff changeset
196 %! assert (get (h, "cdata"), eye (3));
13115
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
197 %! assert (get (h, "type"), "surface");
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
198 %! assert (get (h, "linestyle"), get (0, "defaultsurfacelinestyle"));
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
199 %! assert (get (h, "linewidth"), get (0, "defaultsurfacelinewidth"), eps);
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
200 %! assert (get (h, "marker"), get (0, "defaultsurfacemarker"));
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
201 %! assert (get (h, "markersize"), get (0, "defaultsurfacemarkersize"));
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
202 %! unwind_protect_cleanup
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
203 %! close (hf);
cd808de114c1 Allow surface and patch to be called w/o arguments. Adding and fixing tests.
Kai Habel <kai.habel@gmx.de>
parents: 12819
diff changeset
204 %! end_unwind_protect
14001
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 13194
diff changeset
205