Mercurial > octave-nkf

annotate scripts/plot/draw/fill.m @ 17609:ec31ca0a5812

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fill.m: Improve input validation to avoid endless loops (bug #38927). * scripts/plot/draw/fill.m: check input colorspec argument and apply option/value pair arguments to all patches. Simplify __find_patches__ subfunction to avoid endless loops. Add iscolorspec subfunction to check input arguments.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Thu, 09 May 2013 16:14:47 +0200
parents 7bb76a22cde1
children 3f8b3588a9f0
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) 2007-2012 David Bateman
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
2 ##
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
3 ## This file is part of Octave.
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
4 ##
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
8 ## your option) any later version.
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
9 ##
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
13 ## General Public License for more details.
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
14 ##
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
17 ## <http://www.gnu.org/licenses/>.
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
18
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
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} {} fill (@var{x}, @var{y}, @var{c})
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
21 ## @deftypefnx {Function File} {} fill (@var{x1}, @var{y1}, @var{c1}, @var{x2}, @var{y2}, @var{c2})
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
22 ## @deftypefnx {Function File} {} fill (@dots{}, @var{prop}, @var{val})
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
23 ## @deftypefnx {Function File} {} fill (@var{hax}, @dots{})
7650
eb7bdde776f2 Texinfo fixes
John W. Eaton <jwe@octave.org>
parents: 7216
diff changeset
24 ## @deftypefnx {Function File} {@var{h} =} fill (@dots{})
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
25 ## Create one or more filled 2-D polygons.
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
26 ##
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
27 ## The inputs @var{x} and @var{y} are the coordinates of the polygon vertices.
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
28 ## If the inputs are matrices then the rows represent different vertices and
17122
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17075
diff changeset
29 ## each column produces a different polygon. @code{fill} will close any open
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17075
diff changeset
30 ## polygons before plotting.
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
31 ##
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
32 ## The input @var{c} determines the color of the polygon. The simplest form
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
33 ## is a single color specification such as a @code{plot} format or an
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
34 ## RGB-triple. In this case the polygon(s) will have one unique color. If
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
35 ## @var{c} is a vector or matrix then the color data is first scaled using
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
36 ## @code{caxis} and then indexed into the current colormap. A row vector will
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
37 ## color each polygon (a column from matrices @var{x} and @var{y}) with a
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
38 ## single computed color. A matrix @var{c} of the same size as @var{x} and
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
39 ## @var{y} will compute the color of each vertex and then interpolate the face
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
40 ## color between the vertices.
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
41 ##
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
42 ## Multiple property/value pairs for the underlying patch object may be
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
43 ## specified, but they must appear in pairs.
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
44 ##
17122
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17075
diff changeset
45 ## If the first argument @var{hax} is an axes handle, then plot into this axis,
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17075
diff changeset
46 ## rather than the current axes returned by @code{gca}.
14001
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
47 ##
17122
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17075
diff changeset
48 ## The optional return value @var{h} is a vector of graphics handles to
14001
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
49 ## the created patch objects.
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
50 ##
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
51 ## Example: red square
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
52 ##
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
53 ## @example
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
54 ## @group
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
55 ## vertices = [0 0
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
56 ## 1 0
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
57 ## 1 1
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
58 ## 0 1];
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
59 ## fill (vertices(:,1), vertices(:,2), "r");
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
60 ## axis ([-0.5 1.5, -0.5 1.5])
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
61 ## axis equal
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
62 ## @end group
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
63 ## @end example
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
64 ##
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
65 ## @seealso{patch, caxis, colormap}
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
66 ## @end deftypefn
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
67
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
68 function h = fill (varargin)
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
69
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
70 [hax, varargin] = __plt_get_axis_arg__ ("fill", varargin{:});
7216
5389a52df87b [project @ 2007-11-29 19:07:29 by jwe]
jwe
parents: 7215
diff changeset
71
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
72 hlist = [];
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
73 iargs = __find_patches__ (varargin{:});
7216
5389a52df87b [project @ 2007-11-29 19:07:29 by jwe]
jwe
parents: 7215
diff changeset
74
17609
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
75 opts = {};
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
76 if (numel (varargin) > iargs(end) + 2)
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
77 opts = varargin(iargs(end) + (3:end));
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
78 endif
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
79
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
80 if (! all (cellfun (@(x) iscolorspec (x), varargin(iargs + 2))))
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
81 print_usage ();
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
82 endif
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
83
17211
87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents: 17122
diff changeset
84 oldfig = [];
17301
68bcac3c043a Correct inversion accidentally introduced in cset 87ba70043bfc.
Rik <rik@octave.org>
parents: 17211
diff changeset
85 if (! isempty (hax))
17211
87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents: 17122
diff changeset
86 oldfig = get (0, "currentfigure");
87ba70043bfc Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents: 17122
diff changeset
87 endif
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
88 unwind_protect
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
89 hax = newplot (hax);
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
90 old_nxtplt = get (hax, "nextplot");
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
91 set (hax, "nextplot", "add");
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
92
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
93 for i = 1 : length (iargs)
17609
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
94 args = [varargin(iargs(i) + (0:2)) opts];
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
95
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
96 [htmp, fail] = __patch__ (hax, args{:});
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
97 if (fail)
14230
fe65588c31b8 fill.m: Return column vector of graphics handles
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
98 print_usage ();
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
99 endif
17609
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
100 hlist(end+1, 1) = htmp;
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
101 endfor
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
102
17405
3f0ed69d21c6 Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents: 17301
diff changeset
103 if (strcmp (old_nxtplt, "replace"))
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
104 set (hax, "nextplot", old_nxtplt);
11306
262c365eb71c fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11149
diff changeset
105 endif
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
106
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
107 unwind_protect_cleanup
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
108 if (! isempty (oldfig))
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
109 set (0, "currentfigure", oldfig);
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
110 endif
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
111 end_unwind_protect
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
112
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
113 if (nargout > 0)
17075
806f48d8a577 fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents: 14237
diff changeset
114 h = hlist;
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
115 endif
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
116
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
117 endfunction
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
118
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
119 function iargs = __find_patches__ (varargin)
17609
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
120 iargs = 1:3:nargin;
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
121 optidx = find (! cellfun (@isnumeric, varargin(iargs)), 1);
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
122 iargs(optidx:end) = [];
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
123 endfunction
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
124
17609
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
125 function retval = iscolorspec (arg)
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
126 retval = false;
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
127 if (ischar (arg))
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
128 persistent colors = {"y", "yellow", "r", "red", "m", "magenta", ...
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
129 "c", "cyan", "g", "green", "b", "blue", ...
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
130 "w", "white", "k", "black"};
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
131 if (any (strcmpi (arg, colors)))
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
132 retval = true;
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
133 endif
17609
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
134 elseif (isvector (arg))
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
135 if (length (arg) == 3 || all (arg >= 0 && arg <=1))
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
136 retval = true;
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
137 endif
ec31ca0a5812 fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
138 endif
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
139 endfunction
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
140
14001
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
141
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
142 %!demo
14237
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14230
diff changeset
143 %! clf;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14230
diff changeset
144 %! t1 = (1/16:1/8:1) * 2*pi;
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents: 14230
diff changeset
145 %! t2 = ((1/16:1/8:1) + 1/32) * 2*pi;
14001
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
146 %! x1 = sin (t1) - 0.8;
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
147 %! y1 = cos (t1);
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
148 %! x2 = sin (t2) + 0.8;
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
149 %! y2 = cos (t2);
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
150 %! h = fill (x1,y1,'r', x2,y2,'g');
5f0bb45e615c doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents: 11523
diff changeset
151