Mercurial > hg > octave-lyh
view scripts/plot/cylinder.m @ 13816:7ee18dc46bbb
new and improved non-integer figure handles
* waitbar.m: Pass NaN and "integerhandle" property to __go_figure__.
* __init_fltk__.cc (OpenGL_fltk::renumber, plot_window::renumber,
figure_manager::renumber_figure, figure_manager::do_renumber_figure):
New functions.
(figure_manager::hnd2idx): Don't declare double arg as const.
Include figure number in error message.
(fltk_graphics_toolkit::update): Handle ID_INTEGERHANDLE.
* graphics.h.in, graphics.cc (gh_manager::do_get_handle): Rename from
gh_manager::get_handle.
(gh_manager::get_handle): New static function.
(gh_manager::renumber_figure): New static function.
(gh_manager::do_renumber_figure): New function.
(figure::properties::set_integerhandle): New function.
(figure::properties::integerhandle): Tag property declaration with S.
(F__go_figure__): Intercept and handle integerhandle property here.
* graphics.h.in (children_property::renumber): New function.
(base_properties::init_integerhandle): New virtual function.
(figure::properties::init_integerhandle): New function.
(base_properties::renumber_child, base_properties::renumber_parent):
New functions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 04 Nov 2011 06:25:13 -0400 |
parents | d0b799dafede |
children | 22c50cbad2ce |
line wrap: on
line source
## Copyright (C) 2007-2011 Michael Goffioul and Kai Habel ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} cylinder ## @deftypefnx {Function File} {} cylinder (@var{r}) ## @deftypefnx {Function File} {} cylinder (@var{r}, @var{n}) ## @deftypefnx {Function File} {[@var{x}, @var{y}, @var{z}] =} cylinder (@dots{}) ## @deftypefnx {Function File} {} cylinder (@var{ax}, @dots{}) ## Generate three matrices in @code{meshgrid} format, such that ## @code{surf (@var{x}, @var{y}, @var{z})} generates a unit cylinder. ## The matrices are of size @code{@var{n}+1}-by-@code{@var{n}+1}. ## @var{r} is a vector containing the radius along the z-axis. ## If @var{n} or @var{r} are omitted then default values of 20 or [1 1] ## are assumed. ## ## Called with no return arguments, @code{cylinder} calls directly ## @code{surf (@var{x}, @var{y}, @var{z})}. If an axes handle @var{ax} ## is passed as the first argument, the surface is plotted to this set ## of axes. ## ## Examples: ## ## @example ## @group ## [x, y, z] = cylinder (10:-1:0,50); ## surf (x, y, z); ## title ("a cone") ## @end group ## @end example ## @seealso{sphere} ## @end deftypefn function [xx, yy, zz] = cylinder (varargin) [ax, args, nargs] = __plt_get_axis_arg__ ((nargout > 0), "cylinder", varargin{:}); if (nargs == 0) n = 20; r = [1, 1]; elseif (nargs == 1) n = 20; r = args{1}; elseif (nargs == 2) r = args{1}; n = args{2}; else print_usage (); endif if (length (r) < 2) error ("cylinder: length(R) must be larger than 2"); endif phi = linspace (0, 2*pi, n+1); idx = 1:length(r); [phi, idx] = meshgrid(phi, idx); z = (idx - 1) / (length(r) - 1); r = r(idx); [x, y] = pol2cart (phi, r); if (nargout > 0) xx = x; yy = y; zz = z; else surf (ax, x, y, z); endif endfunction %!demo %! [x, y, z] = cylinder (10:-1:0,50); %! surf (x, y, z); %! title ("a cone")