annotate scripts/plot/fill.m @ 12462:e4dbfe3019b1

Use PCRE regular expressions throughout Octave.
author Rik <octave@nomad.inbox5.com>
date Sat, 19 Feb 2011 18:21:58 -0800
parents fd0a3ac60b0e
children 5f0bb45e615c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11523
fd0a3ac60b0e update copyright notices
John W. Eaton <jwe@octave.org>
parents: 11325
diff changeset
1 ## Copyright (C) 2007-2011 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})
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
23 ## @deftypefnx {Function File} {} fill (@var{h}, @dots{})
7650
eb7bdde776f2 Texinfo fixes
John W. Eaton <jwe@octave.org>
parents: 7216
diff changeset
24 ## @deftypefnx {Function File} {@var{h} =} fill (@dots{})
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
25 ## Create one or more filled patch objects, returning a patch object for each.
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
26 ## @end deftypefn
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
27
7216
5389a52df87b [project @ 2007-11-29 19:07:29 by jwe]
jwe
parents: 7215
diff changeset
28 function retval = fill (varargin)
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
29
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
30 [h, varargin] = __plt_get_axis_arg__ ("fill", varargin{:});
7216
5389a52df87b [project @ 2007-11-29 19:07:29 by jwe]
jwe
parents: 7215
diff changeset
31
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
32 htmp = [];
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
33 iargs = __find_patches__ (varargin{:});
7216
5389a52df87b [project @ 2007-11-29 19:07:29 by jwe]
jwe
parents: 7215
diff changeset
34
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
35 oldh = gca ();
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
36 unwind_protect
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
37 axes (h);
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
38
11306
262c365eb71c fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11149
diff changeset
39 nextplot = get (h, "nextplot");
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
40 for i = 1 : length (iargs)
11325
56c8a00a269f fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11306
diff changeset
41 if (i > 1 && strncmp (nextplot, "replace", 7))
56c8a00a269f fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11306
diff changeset
42 set (h, "nextplot", "add");
56c8a00a269f fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11306
diff changeset
43 endif
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
44 if (i == length (iargs))
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
45 args = varargin (iargs(i):end);
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
46 else
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
47 args = varargin (iargs(i):iargs(i+1)-1);
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
48 endif
7041
32da63705bf9 [project @ 2007-10-19 19:05:21 by dbateman]
dbateman
parents: 7020
diff changeset
49 newplot ();
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
50 [tmp, fail] = __patch__ (h, args{:});
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
51 if (fail)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
52 print_usage();
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
53 endif
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
54 htmp (end + 1) = tmp;
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
55 endfor
11306
262c365eb71c fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11149
diff changeset
56 if (strncmp (nextplot, "replace", 7))
262c365eb71c fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11149
diff changeset
57 set (h, "nextplot", nextplot);
262c365eb71c fill.m: Allow multiple filled polygons.
Ben Abbott <bpabbott@mac.com>
parents: 11149
diff changeset
58 endif
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
59 unwind_protect_cleanup
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
60 axes (oldh);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
61 end_unwind_protect
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
62
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
63 if (nargout > 0)
7216
5389a52df87b [project @ 2007-11-29 19:07:29 by jwe]
jwe
parents: 7215
diff changeset
64 retval = htmp;
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
65 endif
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7208
diff changeset
66
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
67 endfunction
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
68
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
69 function iargs = __find_patches__ (varargin)
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
70 iargs = [];
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
71 i = 1;
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
72 while (i < nargin)
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
73 iargs (end + 1) = i;
8190
73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents: 7650
diff changeset
74 if (ischar (varargin{i})
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
75 && (strcmpi (varargin{i}, "faces")
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
76 || strcmpi (varargin{i}, "vertices")))
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
77 i += 4;
7208
a730e47fda4d [project @ 2007-11-28 02:32:41 by jwe]
jwe
parents: 7041
diff changeset
78 elseif (isnumeric (varargin{i}))
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
79 i += 2;
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
80 endif
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
81
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
82 if (i <= nargin)
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
83 while (true);
11149
fe3c3dfc07eb style fix: break lines before && and ||, not after
John W. Eaton <jwe@octave.org>
parents: 10793
diff changeset
84 if (ischar (varargin{i})
fe3c3dfc07eb style fix: break lines before && and ||, not after
John W. Eaton <jwe@octave.org>
parents: 10793
diff changeset
85 && (strcmpi (varargin{i}, "faces")
fe3c3dfc07eb style fix: break lines before && and ||, not after
John W. Eaton <jwe@octave.org>
parents: 10793
diff changeset
86 || strcmpi (varargin{i}, "vertices")))
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
87 break;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
88 elseif (isnumeric (varargin{i}))
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
89 ## Assume its the colorspec
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
90 i++;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
91 break;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
92 elseif (ischar (varargin{i}))
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
93 colspec = tolower (varargin{i});
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
94 collen = length (colspec);
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
95
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
96 if (strncmp (colspec, "blue", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
97 || strncmp (colspec, "black", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
98 || strncmp (colspec, "k", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
99 || strncmp (colspec, "black", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
100 || strncmp (colspec, "red", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
101 || strncmp (colspec, "green", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
102 || strncmp (colspec, "yellow", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
103 || strncmp (colspec, "magenta", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
104 || strncmp (colspec, "cyan", collen)
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
105 || strncmp (colspec, "white", collen))
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
106 i++;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
107 break;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
108 endif
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
109 else
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
110 i += 2;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 8920
diff changeset
111 endif
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
112 endwhile
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
113 endif
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
114 endwhile
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
115 endfunction
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
116
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
117 %!demo
8790
a013ff655ca4 Trivial changes to demos to produce a more pleasant output for octave+gnuplot+aquaterm.
Ben Abbott <bpabbott@mac.com>
parents: 8243
diff changeset
118 %! clf
7020
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
119 %! t1 = (1/16:1/8:1)'*2*pi;
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
120 %! t2 = ((1/16:1/8:1)' + 1/32)*2*pi;
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
121 %! x1 = sin(t1) - 0.8;
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
122 %! y1 = cos(t1);
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
123 %! x2 = sin(t2) + 0.8;
e31f12bb9194 [project @ 2007-10-13 05:13:28 by dbateman]
dbateman
parents:
diff changeset
124 %! y2 = cos(t2);
8243
ec4d9d657b17 Treat line style argument in stairs
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
125 %! h = fill(x1,y1,'r',x2,y2,'g');