Mercurial > hg > octave-lyh

annotate scripts/plot/cylinder.m @ 17069:1cbdd14711c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
scatter3.m, scatter.m: Update to use new __plt_get_axis_arg__. * scripts/plot/scatter3.m, scripts/plot/scatter.m: Update to use new __plt_get_axis_arg__.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Tue, 23 Jul 2013 18:31:22 +0200
parents 3e1b24a2454a
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: 14092
diff changeset
1 ## Copyright (C) 2007-2012 Michael Goffioul and Kai Habel
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
2 ##
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
3 ## This file is part of Octave.
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
4 ##
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
8 ## your option) any later version.
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
9 ##
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
13 ## General Public License for more details.
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
14 ##
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
17 ## <http://www.gnu.org/licenses/>.
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
18
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
19 ## -*- texinfo -*-
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
20 ## @deftypefn {Function File} {} cylinder
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
21 ## @deftypefnx {Function File} {} cylinder (@var{r})
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
22 ## @deftypefnx {Function File} {} cylinder (@var{r}, @var{n})
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
23 ## @deftypefnx {Function File} {[@var{x}, @var{y}, @var{z}] =} cylinder (@dots{})
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
24 ## @deftypefnx {Function File} {} cylinder (@var{ax}, @dots{})
12575
d0b799dafede Grammarcheck files for 3.4.1 release.
Rik <octave@nomad.inbox5.com>
parents: 12129
diff changeset
25 ## Generate three matrices in @code{meshgrid} format, such that
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
26 ## @code{surf (@var{x}, @var{y}, @var{z})} generates a unit cylinder.
11587
c792872f8942 all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
27 ## The matrices are of size @code{@var{n}+1}-by-@code{@var{n}+1}.
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
28 ## @var{r} is a vector containing the radius along the z-axis.
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
29 ## If @var{n} or @var{r} are omitted then default values of 20 or [1 1]
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
30 ## are assumed.
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
31 ##
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
32 ## Called with no return arguments, @code{cylinder} calls directly
9040
dbd0c77e575e Cleanup documentation file plot.texi
Rik <rdrider0-list@yahoo.com>
parents: 7245
diff changeset
33 ## @code{surf (@var{x}, @var{y}, @var{z})}. If an axes handle @var{ax}
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
34 ## is passed as the first argument, the surface is plotted to this set
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
35 ## of axes.
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
36 ##
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
37 ## Examples:
10821
693e22af08ae Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents: 10793
diff changeset
38 ##
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
39 ## @example
9051
1bf0ce0930be Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents: 9040
diff changeset
40 ## @group
14327
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
41 ## [x, y, z] = cylinder (10:-1:0, 50);
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
42 ## surf (x, y, z);
14327
4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
43 ## title ("a cone");
9051
1bf0ce0930be Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents: 9040
diff changeset
44 ## @end group
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
45 ## @end example
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
46 ## @seealso{sphere}
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
47 ## @end deftypefn
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
48
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
49 function [xx, yy, zz] = cylinder (varargin)
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
50
17051
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
51 [hax, args, nargs] = __plt_get_axis_arg__ ("cylinder", varargin{:});
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
52
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
53 if (nargs == 0)
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
54 n = 20;
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
55 r = [1, 1];
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
56 elseif (nargs == 1)
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
57 n = 20;
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
58 r = args{1};
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
59 elseif (nargs == 2)
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
60 r = args{1};
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
61 n = args{2};
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
62 else
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
63 print_usage ();
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
64 endif
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
65
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
66 if (length (r) < 2)
14868
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14335
diff changeset
67 error ("cylinder: length (R) must be larger than 2");
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
68 endif
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
69
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
70 phi = linspace (0, 2*pi, n+1);
14868
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14335
diff changeset
71 idx = 1:length (r);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14335
diff changeset
72 [phi, idx] = meshgrid (phi, idx);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents: 14335
diff changeset
73 z = (idx - 1) / (length (r) - 1);
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
74 r = r(idx);
7182
71579d54d4b9 [project @ 2007-11-26 18:16:40 by jwe]
jwe
parents: 7181
diff changeset
75 [x, y] = pol2cart (phi, r);
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
76
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
77 if (nargout > 0)
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
78 xx = x;
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
79 yy = y;
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
80 zz = z;
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
81 else
17051
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
82 oldfig = ifelse (isempty (hax), [], get (0, "currentfigure"));
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
83 unwind_protect
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
84 hax = newplot (hax);
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
85
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
86 surf (hax, x, y, z);
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
87
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
88 unwind_protect_cleanup
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
89 if (! isempty (oldfig))
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
90 set (0, "currentfigure", oldfig);
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
91 endif
3e1b24a2454a cylinder.m, ellipsoid.m, rectangle.m, sphere.m: Update to use new __plt_get_axis_arg__.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
92 end_unwind_protect
7181
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
93 endif
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
94
8d0e90d4caf6 [project @ 2007-11-26 18:14:52 by jwe]
jwe
parents:
diff changeset
95 endfunction
7245
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe]
jwe
parents: 7215
diff changeset
96
14237
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
97
7245
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe]
jwe
parents: 7215
diff changeset
98 %!demo
14237
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
99 %! clf;
14247
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo.
Rik <octave@nomad.inbox5.com>
parents: 14245
diff changeset
100 %! colormap ('default');
7245
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe]
jwe
parents: 7215
diff changeset
101 %! [x, y, z] = cylinder (10:-1:0,50);
d65670971cbc [project @ 2007-12-04 03:03:54 by jwe]
jwe
parents: 7215
diff changeset
102 %! surf (x, y, z);
14245
4506eade9f04 Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents: 14237
diff changeset
103 %! title ('a cone');
14237
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
104