Mercurial > octave-nkf
annotate scripts/plot/surface.m @ 13194:3e1871badab9
allow sscanf to accept character arrays with more than one row
* file-io.cc (get_sscanf_data): New function. Flatten character
arrays before extracting character data.
(Fsscanf): Use it.
* test_io.m: New sscanf test.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 19 Sep 2011 16:45:31 -0400 |
| parents | e81ddf9cacd5 |
| children | 5f0bb45e615c |
| rev | line source |
|---|---|
| 11523 | 1 ## Copyright (C) 1993-2011 John W. Eaton |
| 7109 | 2 ## |
| 3 ## This file is part of Octave. | |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7 ## the Free Software Foundation; either version 3 of the License, or (at | |
| 8 ## your option) any later version. | |
| 9 ## | |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 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 | |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 18 | |
| 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 | 21 ## @deftypefnx {Function File} {} surface (@var{x}, @var{y}, @var{z}) |
| 22 ## @deftypefnx {Function File} {} surface (@var{z}, @var{c}) | |
| 23 ## @deftypefnx {Function File} {} surface (@var{z}) | |
| 24 ## @deftypefnx {Function File} {} surface (@dots{}, @var{prop}, @var{val}) | |
| 25 ## @deftypefnx {Function File} {} surface (@var{h}, @dots{}) | |
| 7650 | 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 | 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 | 33 ## are missing, they are constructed from size of the matrix @var{z}. |
| 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. |
| 7109 | 36 ## @seealso{surf, mesh, patch, line} |
| 37 ## @end deftypefn | |
| 38 | |
| 39 ## Author: jwe | |
| 40 | |
| 7216 | 41 function retval = surface (varargin) |
| 7109 | 42 |
| 7215 | 43 [h, varargin] = __plt_get_axis_arg__ ("surface", varargin{:}); |
| 44 | |
| 45 oldh = gca (); | |
| 46 unwind_protect | |
| 47 axes (h); | |
| 48 [tmp, bad_usage] = __surface__ (h, varargin{:}); | |
| 49 unwind_protect_cleanup | |
| 50 axes (oldh); | |
| 51 end_unwind_protect | |
| 7109 | 52 |
| 7207 | 53 if (bad_usage) |
| 54 print_usage (); | |
| 55 endif | |
| 56 | |
| 57 if (nargout > 0) | |
| 7216 | 58 retval = tmp; |
| 7207 | 59 endif |
| 7216 | 60 |
| 7207 | 61 endfunction |
| 62 | |
| 63 function [h, bad_usage] = __surface__ (ax, varargin) | |
| 64 | |
| 65 bad_usage = false; | |
| 66 h = 0; | |
| 67 firststring = nargin; | |
| 68 for i = 2 : nargin | |
| 7208 | 69 if (ischar (varargin{i - 1})) |
| 7207 | 70 firststring = i - 1; |
| 7175 | 71 break; |
| 7109 | 72 endif |
| 7175 | 73 endfor |
| 74 | |
| 75 if (firststring > 5) | |
| 7207 | 76 bad_usage = true; |
| 7175 | 77 elseif (firststring == 5) |
| 78 x = varargin{1}; | |
| 79 y = varargin{2}; | |
| 80 z = varargin{3}; | |
| 81 c = varargin{4}; | |
| 82 | |
|
13194
3e1871badab9
allow sscanf to accept character arrays with more than one row
John W. Eaton <jwe@octave.org>
parents:
13141
diff
changeset
|
83 [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
|
84 [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
|
85 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
|
86 error ("surface: Z and C must have the same size"); |
| 7109 | 87 endif |
|
13194
3e1871badab9
allow sscanf to accept character arrays with more than one row
John W. Eaton <jwe@octave.org>
parents:
13141
diff
changeset
|
88 |
| 7109 | 89 if (isvector (x) && isvector (y) && ismatrix (z)) |
| 90 if (rows (z) == length (y) && columns (z) == length (x)) | |
| 91 x = x(:)'; | |
| 92 y = y(:); | |
| 93 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
|
94 error ("surface: rows (Z) must be the same as length (Y) and columns (Z) must be the same as length (X)"); |
| 7109 | 95 endif |
| 96 elseif (ismatrix (x) && ismatrix (y) && ismatrix (z)) | |
| 7292 | 97 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
|
98 error ("surface: X, Y, and Z must have the same dimensions"); |
| 7109 | 99 endif |
| 100 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
|
101 error ("surface: X and Y must be vectors and Z must be a matrix"); |
| 7109 | 102 endif |
| 7175 | 103 elseif (firststring == 4) |
| 104 x = varargin{1}; | |
| 105 y = varargin{2}; | |
| 106 z = varargin{3}; | |
| 107 c = z; | |
| 108 if (isvector (x) && isvector (y) && ismatrix (z)) | |
| 109 if (rows (z) == length (y) && columns (z) == length (x)) | |
| 110 x = x(:)'; | |
| 111 y = y(:); | |
| 112 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
|
113 error ("surface: rows (Z) must be the same as length (Y) and columns (Z) must be the same as length (X)"); |
| 7175 | 114 endif |
| 115 elseif (ismatrix (x) && ismatrix (y) && ismatrix (z)) | |
| 7292 | 116 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
|
117 error ("surface: X, Y, and Z must have the same dimensions"); |
| 7175 | 118 endif |
| 119 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
|
120 error ("surface: X and Y must be vectors and Z must be a matrix"); |
| 7175 | 121 endif |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
122 elseif (firststring == 3) |
| 7208 | 123 z = varargin{1}; |
| 124 c = varargin{2}; | |
|
10634
60542efcfa2c
Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
125 if (ismatrix (z) && !isvector (z) && !isscalar (z)) |
| 7175 | 126 [nr, nc] = size (z); |
| 127 x = 1:nc; | |
| 128 y = (1:nr)'; | |
| 129 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
|
130 error ("surface: Z argument must be a matrix"); |
| 7175 | 131 endif |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
132 elseif (firststring == 2) |
| 7208 | 133 z = varargin{1}; |
| 7175 | 134 c = z; |
|
10634
60542efcfa2c
Check input arguments for size and type (bug #29861).
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
135 if (ismatrix (z) && !isvector (z) && !isscalar (z)) |
| 7175 | 136 [nr, nc] = size (z); |
| 137 x = 1:nc; | |
| 138 y = (1:nr)'; | |
| 139 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
|
140 error ("surface: Z argument must be a matrix"); |
| 7175 | 141 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
|
142 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
|
143 x = 1:3; |
|
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
|
144 y = (x).'; |
|
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
|
145 c = z = eye(3); |
| 7109 | 146 else |
| 7207 | 147 bad_usage = true; |
| 7189 | 148 endif |
| 7109 | 149 |
| 7207 | 150 if (! bad_usage) |
| 151 ## Make a default surface object. | |
| 7277 | 152 other_args = {}; |
| 7207 | 153 if (firststring < nargin) |
| 7277 | 154 other_args = varargin(firststring:end); |
| 155 endif | |
| 156 h = __go_surface__ (ax, "xdata", x, "ydata", y, "zdata", z, "cdata", c, | |
| 10549 | 157 other_args{:}); |
| 7109 | 158 |
| 7277 | 159 if (! ishold ()) |
| 7298 | 160 set (ax, "view", [0, 90], "box", "off"); |
| 7277 | 161 endif |
| 162 endif | |
| 7109 | 163 |
| 164 endfunction | |
|
12817
e3e6079039c6
codesprint: 2 demos for pcolor.m dummy for surface.m
Kai Habel <kai.habel@gmx.de>
parents:
11587
diff
changeset
|
165 |
|
12819
66af8b914607
codesprint: Add comment for dummy test in surface.m, Fix typo in wavread.m
Kai Habel <kai.habel@gmx.de>
parents:
12817
diff
changeset
|
166 ## Mark file as being tested. Tests for surface are in |
|
66af8b914607
codesprint: Add comment for dummy test in surface.m, Fix typo in wavread.m
Kai Habel <kai.habel@gmx.de>
parents:
12817
diff
changeset
|
167 ## 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
|
168 |
|
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
|
169 %!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
|
170 %! 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
|
171 %! 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
|
172 %! 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
|
173 %! 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
|
174 %! 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
|
175 %! assert (get (h, "ydata"), (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
|
176 %! assert (get (h, "zdata"), eye(3)); |
|
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
|
177 %! assert (get (h, "cdata"), eye(3)); |
|
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
|
178 %! 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
|
179 %! 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
|
180 %! 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
|
181 %! 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
|
182 %! 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
|
183 %! 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
|
184 %! 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
|
185 %! end_unwind_protect |