Mercurial > octave
annotate scripts/plot/draw/private/__pie__.m @ 31220:5b021ecc8bfe stable
pie3: Fix "Too many input" args error.
* __pie__.m (update_text_pos): Change prototype to match the expected number of
input arguments.
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Wed, 31 Aug 2022 22:01:39 +0200 |
| parents | 796f54d4ddbf |
| children | 597f3ee61a48 |
| rev | line source |
|---|---|
|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 ######################################################################## |
|
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 ## |
|
30564
796f54d4ddbf
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
30379
diff
changeset
|
3 ## Copyright (C) 2007-2022 The Octave Project Developers |
|
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
4 ## |
|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 ## See the file COPYRIGHT.md in the top-level directory of this |
|
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 ## distribution or <https://octave.org/copyright/>. |
| 11330 | 7 ## |
| 8 ## This file is part of Octave. | |
| 9 ## | |
|
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
10 ## Octave is free software: you can redistribute it and/or modify it |
| 11330 | 11 ## under the terms of the GNU General Public License as published by |
|
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
12 ## the Free Software Foundation, either version 3 of the License, or |
|
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
13 ## (at your option) any later version. |
| 11330 | 14 ## |
| 15 ## Octave is distributed in the hope that it will be useful, but | |
| 16 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
|
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
17 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
18 ## GNU General Public License for more details. |
| 11330 | 19 ## |
| 20 ## You should have received a copy of the GNU General Public License | |
| 21 ## along with Octave; see the file COPYING. If not, see | |
|
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
22 ## <https://www.gnu.org/licenses/>. |
|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 ## |
|
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 ######################################################################## |
| 11330 | 25 |
| 26 ## -*- texinfo -*- | |
|
20852
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20711
diff
changeset
|
27 ## @deftypefn {} {@var{hlist} =} __pie__ (caller, @dots{}) |
| 11330 | 28 ## Undocumented internal function. |
| 29 ## @end deftypefn | |
| 30 | |
| 31 function hlist = __pie__ (caller, varargin) | |
| 32 | |
| 33 h = varargin{1}; | |
| 34 x = abs (varargin{2}); | |
| 35 iarg = 3; | |
| 36 | |
| 37 if (! isvector (x)) | |
|
20711
7b608fadc663
Make error messages more specific about the variable and problem encountered.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
38 error ("%s: X must be a vector", caller); |
| 11330 | 39 endif |
| 40 | |
| 41 len = length (x); | |
| 42 | |
| 43 have_explode = false; | |
| 44 have_labels = false; | |
| 45 | |
| 46 while (iarg <= nargin - 1) | |
| 47 arg = varargin{iarg++}; | |
| 48 if (iscell (arg)) | |
| 49 labels = arg; | |
| 50 have_labels = true; | |
| 51 if (numel (x) != numel (labels)) | |
|
11338
892ef3688ccf
__pie__.m: improve error messages
John W. Eaton <jwe@octave.org>
parents:
11332
diff
changeset
|
52 error ("%s: mismatch in number of labels and data", caller); |
| 11330 | 53 endif |
|
11338
892ef3688ccf
__pie__.m: improve error messages
John W. Eaton <jwe@octave.org>
parents:
11332
diff
changeset
|
54 elseif (isnumeric (arg) || islogical (arg)) |
| 11330 | 55 explode = arg; |
| 56 have_explode = true; | |
| 57 if (! size_equal (x, explode)) | |
|
11338
892ef3688ccf
__pie__.m: improve error messages
John W. Eaton <jwe@octave.org>
parents:
11332
diff
changeset
|
58 error ("%s: mismatch in number of elements in explode and data", |
|
892ef3688ccf
__pie__.m: improve error messages
John W. Eaton <jwe@octave.org>
parents:
11332
diff
changeset
|
59 caller); |
| 11330 | 60 endif |
|
11338
892ef3688ccf
__pie__.m: improve error messages
John W. Eaton <jwe@octave.org>
parents:
11332
diff
changeset
|
61 else |
|
892ef3688ccf
__pie__.m: improve error messages
John W. Eaton <jwe@octave.org>
parents:
11332
diff
changeset
|
62 error ("%s: %s is invalid as an optional argument", caller, class (arg)); |
| 11330 | 63 endif |
| 64 endwhile | |
| 65 | |
| 66 if (! have_explode) | |
| 67 explode = zeros (size (x)); | |
| 68 endif | |
| 69 | |
|
11341
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
70 normalize = true; |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
71 if (sum (x(:)) < 1) |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
72 normalize = false; |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
73 endif |
|
11341
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
74 |
| 11330 | 75 if (! have_labels) |
|
11341
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
76 if (normalize) |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
77 xp = round (100 * x ./ sum (x)); |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
78 else |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
79 xp = round (100 * x); |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
80 endif |
| 11330 | 81 for i = 1:len |
| 82 labels{i} = sprintf ("%d%%", xp(i)); | |
| 83 endfor | |
| 84 endif | |
| 85 | |
| 86 hlist = []; | |
| 87 refinement = 90; | |
| 88 phi = 0:refinement:360; | |
|
11341
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
89 if (normalize) |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
90 xphi = cumsum (x / sum (x) * 360); |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
91 else |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
92 xphi = cumsum (x * 360); |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
93 endif |
|
3c7ba1e3dc21
Add missing option slice for pie and pie3
Kai Habel <kai.habel@gmx.de>
parents:
11338
diff
changeset
|
94 |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
95 for i = 1:len |
| 11330 | 96 if (i == 1) |
| 97 xn = 0 : 360 / refinement : xphi(i); | |
| 98 else | |
| 99 xn = xphi(i-1) : 360 / refinement : xphi(i); | |
| 100 endif | |
| 101 | |
| 102 if (xn(end) != xphi(i)) | |
| 103 xn = [xn, xphi(i)]; | |
| 104 endif | |
| 105 | |
| 106 xn2 = (xn(1) + xn(end)) / 2; | |
| 107 if (explode (i)) | |
| 108 xoff = - 0.1 * sind (xn2); | |
| 109 yoff = 0.1 * cosd (xn2); | |
| 110 else | |
| 111 xoff = 0; | |
| 112 yoff = 0; | |
| 113 endif | |
| 114 xt = - 1.2 * sind (xn2); | |
| 115 yt = 1.2 * cosd (xn2); | |
|
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
116 |
| 11330 | 117 if (len == 1) |
| 118 set (h, "clim", [1, 2]); | |
| 119 else | |
| 120 set (h, "clim", [1, len]); | |
| 121 endif | |
| 122 | |
|
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
123 if (strcmp (caller, "pie3")) |
| 11330 | 124 ln = length (xn); |
| 125 zlvl = 0.35; | |
|
15201
efac5593b1de
* __pie__.m: Avoid syntax errors in matrix lists.
John W. Eaton <jwe@octave.org>
parents:
14868
diff
changeset
|
126 sx = repmat (xoff + [0, -sind(xn), 0], [2, 1]); |
|
efac5593b1de
* __pie__.m: Avoid syntax errors in matrix lists.
John W. Eaton <jwe@octave.org>
parents:
14868
diff
changeset
|
127 sy = repmat (yoff + [0, cosd(xn), 0], [2, 1]); |
| 11330 | 128 sz = [zeros(1, ln + 2); zlvl * ones(1, ln + 2)]; |
| 129 sc = i * ones (size (sz)); | |
| 130 | |
| 131 hlist = [hlist; | |
|
15201
efac5593b1de
* __pie__.m: Avoid syntax errors in matrix lists.
John W. Eaton <jwe@octave.org>
parents:
14868
diff
changeset
|
132 patch(xoff + [0, -sind(xn)], yoff + [0, cosd(xn)], zeros (1, ln + 1), i); |
|
29725
80f31f0a51fa
fix syntax error in __pie__.m
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
133 surface(sx, sy, sz, sc); |
|
15201
efac5593b1de
* __pie__.m: Avoid syntax errors in matrix lists.
John W. Eaton <jwe@octave.org>
parents:
14868
diff
changeset
|
134 patch(xoff + [0, -sind(xn)], yoff + [0, cosd(xn)], zlvl * ones (1, ln + 1), i); |
| 11330 | 135 text(xt, yt, zlvl, labels{i})]; |
| 136 | |
|
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
137 elseif (strcmp (caller, "pie")) |
| 11330 | 138 if (xt > 0) |
| 139 align = "left"; | |
|
25198
5251de3c34d7
Center label if only one value is given for a pie chart.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
140 elseif (xt < 0) |
|
5251de3c34d7
Center label if only one value is given for a pie chart.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
141 align = "right"; |
| 11330 | 142 else |
|
25198
5251de3c34d7
Center label if only one value is given for a pie chart.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
143 align = "center"; |
| 11330 | 144 endif |
| 145 | |
|
15201
efac5593b1de
* __pie__.m: Avoid syntax errors in matrix lists.
John W. Eaton <jwe@octave.org>
parents:
14868
diff
changeset
|
146 hlist = [hlist; patch(xoff + [0, -sind(xn)], yoff + [0, cosd(xn)], i); |
| 11330 | 147 text(xt, yt, labels{i}, "horizontalalignment", align)]; |
| 148 | |
| 149 else | |
|
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
150 error ("__pie__: unknown caller '%s'", caller); |
| 11330 | 151 endif |
| 152 endfor | |
| 153 | |
|
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
154 addlistener (gca, "view", {@update_text_pos, hlist}); |
| 11330 | 155 |
|
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
156 if (strcmp (caller, "pie3")) |
|
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
157 axis ([-1.25, 1.25, -1.25, 1.25, -0.05, 0.4], "equal", "off"); |
| 11330 | 158 view (-37.5, 30); |
|
17405
3f0ed69d21c6
Replace unnecessary instances of strncmp with strcmp.
Rik <rik@octave.org>
parents:
17338
diff
changeset
|
159 elseif (strcmp (caller, "pie")) |
| 11330 | 160 axis ([-1.5, 1.5, -1.5, 1.5], "square", "off"); |
| 161 endif | |
|
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
162 |
| 11330 | 163 endfunction |
| 164 | |
|
31220
5b021ecc8bfe
pie3: Fix "Too many input" args error.
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
30564
diff
changeset
|
165 function update_text_pos (~, ~, all_handles) |
|
30379
363fb10055df
maint: Style check m-files ahead of 7.1 release.
Rik <rik@octave.org>
parents:
29725
diff
changeset
|
166 |
| 11330 | 167 ## Text objects in the foreground should be at the base level. |
| 168 ## Text objects in the background should be at the top level. | |
| 169 ## Text objects on the right side should be aligned to the right | |
| 170 ## and on the left side to the left. | |
| 171 tobj = findobj (all_handles, "type", "text"); | |
| 172 | |
| 173 ## check if we are called from pie3 | |
| 174 s = findobj (all_handles, "type", "surface"); | |
| 175 is_pie3 = false; | |
| 176 if (length (s) > 0) | |
| 177 is_pie3 = true; | |
| 178 endif | |
| 179 | |
| 180 if (length (tobj) > 0) | |
| 181 ax = get (tobj(1), "parent"); | |
| 182 azel = get (ax, "view"); | |
| 183 pos = get (tobj, "position"); | |
| 184 if (iscell (pos)) | |
| 185 pos = cell2mat (pos); | |
| 186 endif | |
| 187 phi = atand (pos(:,1) ./ pos(:,2)); | |
| 188 [theta, r] = cart2pol (pos(:,1), pos(:,2)); | |
| 189 theta *= 180/pi; | |
| 190 theta -= azel(1); | |
| 191 theta = mod (theta, 360); | |
| 192 ud_mask = (theta > 180); | |
| 193 lr_mask = (theta > 90) & (theta < 270); | |
| 194 for i = 1 : length (tobj) | |
| 195 if (is_pie3) | |
| 196 if (ud_mask(i)) | |
|
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
197 set (tobj(i), "position", [pos(i,1), pos(i,2), -0.05]); |
| 11330 | 198 else |
|
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
199 set (tobj(i), "position", [pos(i,1), pos(i,2), 0.40]); |
| 11330 | 200 endif |
| 201 endif | |
| 202 | |
| 203 if (lr_mask(i)) | |
|
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
204 set (tobj(i), "horizontalalignment", "right"); |
| 11330 | 205 else |
|
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
206 set (tobj(i), "horizontalalignment", "left"); |
| 11330 | 207 endif |
| 208 endfor | |
| 209 endif | |
|
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
210 |
| 11330 | 211 endfunction |