Mercurial > octave
annotate scripts/plot/draw/private/__bar__.m @ 29072:a0be96cd13c5
Fix thinko in cset d2f7fb06bce3.
* __bar__.m: Delete re-definition of ypos, yneg variables.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 19 Nov 2020 08:30:13 -0800 |
parents | d2f7fb06bce3 |
children | 8bb14f4979ca |
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 ## |
27919
1891570abac8
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
27918
diff
changeset
|
3 ## Copyright (C) 1996-2020 The Octave Project Developers |
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
27898
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/>. |
6540 | 7 ## |
8 ## This file is part of Octave. | |
9 ## | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24145
diff
changeset
|
10 ## Octave is free software: you can redistribute it and/or modify it |
6540 | 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:
24145
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:
22488
diff
changeset
|
13 ## (at your option) any later version. |
6540 | 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:
22488
diff
changeset
|
17 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22488
diff
changeset
|
18 ## GNU General Public License for more details. |
6540 | 19 ## |
20 ## You should have received a copy of the GNU General Public License | |
7016 | 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:
24145
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 ######################################################################## |
6540 | 25 |
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8664
diff
changeset
|
26 ## -*- texinfo -*- |
20852
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
20735
diff
changeset
|
27 ## @deftypefn {} {} __bar__ (@var{vertical}, @var{func}, @dots{}) |
6895 | 28 ## Undocumented internal function. |
8812
7d48766c21a5
use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents:
8664
diff
changeset
|
29 ## @end deftypefn |
6540 | 30 |
31 function varargout = __bar__ (vertical, func, varargin) | |
6886 | 32 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
33 [hax, varargin, nargin] = __plt_get_axis_arg__ (func, varargin{:}); |
7189 | 34 |
24145
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
35 if (! isnumeric (varargin{1})) |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
36 error ("%s: Y must be numeric", func); |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
37 endif |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
38 |
22488
a666e3ee6af8
Require gnuplot 4.4 as mininimum supported version.
Rik <rik@octave.org>
parents:
22367
diff
changeset
|
39 width = 0.8; |
6540 | 40 group = true; |
29071
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
41 stacked = false; |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
42 histc = NA; |
22930
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
43 ## BaseValue |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
44 if (strcmp (get (hax, "yscale"), "log")) |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
45 bv = 1; |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
46 else |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
47 bv = 0; |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
48 endif |
6540 | 49 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
50 if (nargin > 1 && isnumeric (varargin{2})) |
6540 | 51 x = varargin{1}; |
6886 | 52 if (isvector (x)) |
6540 | 53 x = x(:); |
54 endif | |
55 y = varargin{2}; | |
6886 | 56 if (isvector (y)) |
6540 | 57 y = y(:); |
58 endif | |
24145
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
59 if (isscalar (y) && ! isscalar (x)) |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
60 ## "y" is actually "width" argument |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
61 y = x; |
14872
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
62 x = [1:rows(y)]'; |
6540 | 63 idx = 2; |
64 else | |
6886 | 65 if (! isvector (x)) |
17058
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
66 error ("%s: X must be a vector", func); |
24145
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
67 elseif (numel (unique (x)) != numel (x)) |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
68 error ("%s: X vector values must be unique", func); |
6540 | 69 endif |
70 idx = 3; | |
71 endif | |
72 else | |
73 y = varargin{1}; | |
6886 | 74 if (isvector (y)) |
6540 | 75 y = y(:); |
76 endif | |
14872
c2dbdeaa25df
maint: use rows() and columns() to clarify m-files.
Rik <octave@nomad.inbox5.com>
parents:
14868
diff
changeset
|
77 x = [1:rows(y)]'; |
6540 | 78 idx = 2; |
79 endif | |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
80 |
6540 | 81 newargs = {}; |
6886 | 82 have_line_spec = false; |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
83 while (idx <= nargin) |
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8056
diff
changeset
|
84 if (ischar (varargin{idx}) && strcmpi (varargin{idx}, "grouped")) |
6540 | 85 group = true; |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
86 idx += 1; |
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8056
diff
changeset
|
87 elseif (ischar (varargin{idx}) && strcmpi (varargin{idx}, "stacked")) |
29071
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
88 stacked = true; |
6540 | 89 group = false; |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
90 idx += 1; |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
91 elseif (ischar (varargin{idx}) && strcmpi (varargin{idx}, "histc")) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
92 group = true; |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19284
diff
changeset
|
93 histc = true; |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
94 idx += 1; |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
95 elseif (ischar (varargin{idx}) && strcmpi (varargin{idx}, "hist")) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
96 group = true; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
97 histc = false; |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
98 idx += 1; |
6540 | 99 else |
17462
177147bf7b55
Overhaul use of __pltopt__.m to correctly check for cellstr, not just cell.
Rik <rik@octave.org>
parents:
17301
diff
changeset
|
100 if ((ischar (varargin{idx}) || iscellstr (varargin{idx})) |
10549 | 101 && ! have_line_spec) |
102 [linespec, valid] = __pltopt__ (func, varargin{idx}, false); | |
103 if (valid) | |
104 have_line_spec = true; | |
14388
b5b49f400f9b
__bar__.m: Add missing semicolon to stop internal results being printed.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
105 ## FIXME: strange parse error requires semicolon to be spaced |
b5b49f400f9b
__bar__.m: Add missing semicolon to stop internal results being printed.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
106 ## away from closing ']' on next line. |
b5b49f400f9b
__bar__.m: Add missing semicolon to stop internal results being printed.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
107 newargs = [{"facecolor", linespec.color}, newargs] ; |
20735
418ae0cb752f
Replace ++,-- with in-place operators for performance.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
108 idx += 1; |
10549 | 109 continue; |
110 endif | |
6540 | 111 endif |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14388
diff
changeset
|
112 if (isscalar (varargin{idx})) |
10549 | 113 width = varargin{idx++}; |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
114 elseif (idx == nargin) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
115 newargs = [newargs, varargin(idx++)]; |
8190
73d6b71788c0
use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents:
8056
diff
changeset
|
116 elseif (ischar (varargin{idx}) |
10549 | 117 && strcmpi (varargin{idx}, "basevalue") |
118 && isscalar (varargin{idx+1})) | |
7325 | 119 bv = varargin{idx+1}; |
120 idx += 2; | |
6540 | 121 else |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
122 newargs = [newargs, varargin(idx:idx+1)]; |
10549 | 123 idx += 2; |
6540 | 124 endif |
125 endif | |
126 endwhile | |
127 | |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
128 ngrp = rows (x); |
24145
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
129 |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
130 if (isvector (y) && ngrp != rows (y)) |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
131 y = y.'; |
196ea1ee99b8
Revamp input validation for bar functions (bug #52135).
Rik <rik@octave.org>
parents:
23947
diff
changeset
|
132 endif |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
133 if (ngrp != rows (y)) |
17058
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
134 error ("%s: length of X and Y must be equal", func); |
6540 | 135 endif |
136 | |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
137 nbars = columns (y); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
138 |
18776
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
139 ## Column width is 1 for 'hist*' styles (bars touch). |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
140 if (islogical (histc)) |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
141 cwidth = 1; |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
142 if (nbars == 1) |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
143 gwidth = 1; |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
144 else |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
145 gwidth = width^2; |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
146 endif |
d99475e26c78
Fix regression in width of bars for hist() (bug #42401).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
147 elseif (nbars == 1) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
148 cwidth = 1; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
149 gwidth = width; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
150 else |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
151 cwidth = gwidth = width; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
152 endif |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
153 |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
154 ## Complicated algorithm sizes bars with unitless parameter width. |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
155 ## If width is 1.0, adjacent bars in a group are touching. |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
156 ## Otherwise, bar size is cwidth and the remaining space is split evenly on |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
157 ## either side of the bar. For the default 0.8, spacing is [0.1 0.8 0.1]. |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
158 ## Groups of bars are spaced by gwidth. If gwidth is 1.0 then adjacent |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
159 ## groups will just touch. |
11202
1840a0ecf1fb
__bar__.m: Permit bar() to be called with scalar inputs.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
160 if (numel (x) > 1) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14388
diff
changeset
|
161 cutoff = min (diff (double (x))) / 2; |
11202
1840a0ecf1fb
__bar__.m: Permit bar() to be called with scalar inputs.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
162 else |
1840a0ecf1fb
__bar__.m: Permit bar() to be called with scalar inputs.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
163 cutoff = 1; |
1840a0ecf1fb
__bar__.m: Permit bar() to be called with scalar inputs.
Ben Abbott <bpabbott@mac.com>
parents:
10549
diff
changeset
|
164 endif |
6540 | 165 if (group) |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19284
diff
changeset
|
166 gdelta = cutoff * gwidth / nbars; |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
167 cdelta = repmat ((1 - ((1 - cwidth) / 2)) * gdelta, size (x)); |
8056
9a6f4713f765
Add area, bar, quiver and stair series graphics objects. Document them
David Bateman <dbateman@free.fr>
parents:
7768
diff
changeset
|
168 else |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
169 cdelta = repmat (cutoff * gwidth, size (x)); |
6540 | 170 endif |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
171 x1 = (x - cdelta)(:)'; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
172 x2 = (x + cdelta)(:)'; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
173 xb = repmat ([x1; x1; x2; x2](:), 1, nbars); |
6540 | 174 |
175 if (group) | |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
176 if (islogical (histc) && histc) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
177 offset = 2*cdelta * [0:(nbars-1)] + cdelta(1); # not centered |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
178 else |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
179 offset = 2*cdelta * [-(nbars - 1) / 2 : (nbars - 1) / 2]; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
180 endif |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
181 |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
182 xb(1:4:4*ngrp,:) += offset + (1-cwidth) / 2 * (2 * gdelta); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
183 xb(2:4:4*ngrp,:) += offset + (1-cwidth) / 2 * (2 * gdelta); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
184 xb(3:4:4*ngrp,:) += offset - (1-cwidth) / 2 * (2 * gdelta); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
185 xb(4:4:4*ngrp,:) += offset - (1-cwidth) / 2 * (2 * gdelta); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
186 |
7325 | 187 y0 = zeros (size (y)) + bv; |
6540 | 188 y1 = y; |
189 else | |
29071
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
190 if (stacked && any (y(:) < 0)) |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
191 ypos = (y >= 0); |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
192 yneg = (y < 0); |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
193 |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
194 y1p = cumsum (y .* ypos, 2); |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
195 y1n = cumsum (y .* yneg, 2); |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
196 y1 = y1p .* ypos + y1n .* yneg; |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
197 |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
198 y0p = [zeros(ngrp,1)+bv, y1p(:,1:end-1)]; |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
199 y0n = [zeros(ngrp,1)+bv, y1n(:,1:end-1)]; |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
200 y0 = y0p .* ypos + y0n .* yneg; |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
201 |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
202 else |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
203 y1 = cumsum (y,2); |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
204 y0 = [zeros(ngrp,1)+bv, y1(:,1:end-1)]; |
d2f7fb06bce3
Fixed stacked bar chart handling of negative values (bug #58216)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
27923
diff
changeset
|
205 endif |
6540 | 206 endif |
207 | |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
208 yb = zeros (4*ngrp, nbars); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
209 yb(1:4:4*ngrp,:) = y0; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
210 yb(2:4:4*ngrp,:) = y1; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
211 yb(3:4:4*ngrp,:) = y1; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
212 yb(4:4:4*ngrp,:) = y0; |
6885 | 213 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
214 xb = reshape (xb, [4, ngrp, nbars]); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
215 yb = reshape (yb, [4, ngrp, nbars]); |
6885 | 216 |
7189 | 217 if (nargout < 2) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
218 oldfig = []; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
219 if (! isempty (hax)) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
220 oldfig = get (0, "currentfigure"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
221 endif |
7215 | 222 unwind_protect |
17058
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
223 hax = newplot (hax); |
7215 | 224 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
225 htmp = bars (hax, vertical, x, y, xb, yb, gwidth, group, |
17058
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
226 have_line_spec, bv, newargs{:}); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
227 |
22367
459545bc9019
Use ishold () rather than ishold (hax) for performance.
Rik <rik@octave.org>
parents:
22366
diff
changeset
|
228 if (! ishold ()) |
23947
d837f7f6e4aa
Don't label all values on bar plot when there are more than 15 bars (bug #51773).
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
229 if (numel (x(:,1)) <= 15 && all (x(:,1) == fix (x(:,1)))) |
d837f7f6e4aa
Don't label all values on bar plot when there are more than 15 bars (bug #51773).
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
230 ## Set manual ticks, rather than relying on autoselection, |
d837f7f6e4aa
Don't label all values on bar plot when there are more than 15 bars (bug #51773).
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
231 ## when ticks are a small number of integers. |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
232 if (vertical) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
233 set (hax, "xtick", x(:,1)); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
234 else |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
235 set (hax, "ytick", x(:,1)); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
236 endif |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
237 endif |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
238 ## Hack prevents color and xlim setting changes when basevalue changes. |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
239 if (vertical) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
240 set (hax, "clim", [0 1], "xlimmode", "manual"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
241 else |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
242 set (hax, "clim", [0 1], "ylimmode", "manual"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
243 endif |
26548
58ad6355ece8
Enable axes ticks on top of bars of bar plots for Matlab compatiblity (bug #55481).
Rik <rik@octave.org>
parents:
26376
diff
changeset
|
244 set (hax, "box", "on", "layer", "top"); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
245 endif |
17058
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
246 unwind_protect_cleanup |
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
247 if (! isempty (oldfig)) |
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
248 set (0, "currentfigure", oldfig); |
7215 | 249 endif |
250 end_unwind_protect | |
17058
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
251 if (nargout == 1) |
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
252 varargout{1} = htmp; |
95c6cada5067
__bar__.m: Update to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
17032
diff
changeset
|
253 endif |
7189 | 254 else |
255 if (vertical) | |
6540 | 256 varargout{1} = xb; |
257 varargout{2} = yb; | |
258 else | |
259 varargout{1} = yb; | |
260 varargout{2} = xb; | |
261 endif | |
6886 | 262 endif |
7191 | 263 |
6540 | 264 endfunction |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
265 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
266 function hglist = bars (hax, vertical, x, y, xb, yb, width, group, have_color_spec, base_value, varargin) |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
267 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
268 nbars = columns (y); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
269 clim = get (hax, "clim"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
270 hglist = []; |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
271 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
272 for i = 1:nbars |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
273 hg = hggroup (); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
274 hglist = [hglist; hg]; |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
275 args = __add_datasource__ ("bar", hg, {"x", "y"}, varargin{:}); |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
276 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
277 if (vertical) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
278 if (! have_color_spec) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
279 if (nbars == 1) |
10549 | 280 lev = clim(1); |
281 else | |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
282 lev = (i - 1) * (clim(2) - clim(1)) / (nbars - 1) - clim(1); |
10549 | 283 endif |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
284 h = patch (hax, xb(:,:,i), yb(:,:,i), |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
285 "FaceColor", "flat", "cdata", lev, "parent", hg); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
286 else |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
287 h = patch (hax, xb(:,:,i), yb(:,:,i), "parent", hg); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
288 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
289 else |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
290 if (! have_color_spec) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
291 if (nbars == 1) |
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
292 lev = clim(1); |
10549 | 293 else |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
294 lev = (i - 1) * (clim(2) - clim(1)) / (nbars - 1) - clim(1); |
10549 | 295 endif |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
296 h = patch (hax, yb(:,:,i), xb(:,:,i), |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
297 "FaceColor", "flat", "cdata", lev, "parent", hg); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
298 else |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
299 h = patch (hax, yb(:,:,i), xb(:,:,i), "parent", hg); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
300 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
301 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
302 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
303 if (i == 1) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
304 ## Add baseline object the first time through loop |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
305 x_axis_range = get (hax, "xlim"); |
26217
31267a10f8a9
Use __go_line__ directly in plot scripts for performance.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
306 h_baseline = __go_line__ (hax, "xdata", x_axis_range, |
31267a10f8a9
Use __go_line__ directly in plot scripts for performance.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
307 "ydata", [base_value, base_value], |
31267a10f8a9
Use __go_line__ directly in plot scripts for performance.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
308 "color", [0, 0, 0]); |
27106
6bfd3a890185
Consolidate separate calls to set() in to one call for interpreter efficiency.
Rik <rik@octave.org>
parents:
26548
diff
changeset
|
309 set (h_baseline, "handlevisibility", "off", "xliminclude", "off", |
6bfd3a890185
Consolidate separate calls to set() in to one call for interpreter efficiency.
Rik <rik@octave.org>
parents:
26548
diff
changeset
|
310 "parent", get (hg, "parent")); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
311 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
312 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
313 ## Setup the hggroup and listeners |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
314 addproperty ("showbaseline", hg, "radio", "{on}|off"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
315 addproperty ("basevalue", hg, "data", base_value); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
316 addproperty ("baseline", hg, "data", h_baseline); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
317 |
15484
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
318 addlistener (hg, "showbaseline", {@show_baseline, "showbl"}); |
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
319 addlistener (hg, "visible", {@show_baseline, "visib"}); |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
320 addlistener (hg, "basevalue", @move_baseline); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
321 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
322 addproperty ("barwidth", hg, "data", width); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
323 if (group) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
324 addproperty ("barlayout", hg, "radio", "stacked|{grouped}", "grouped"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
325 else |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
326 addproperty ("barlayout", hg, "radio", "{stacked}|grouped", "stacked"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
327 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
328 if (vertical) |
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
329 addproperty ("horizontal", hg, "radio", "on|{off}", "off"); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
330 else |
11589
b0084095098e
missing semicolons in script files
John W. Eaton <jwe@octave.org>
parents:
11587
diff
changeset
|
331 addproperty ("horizontal", hg, "radio", "{on}|off", "on"); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
332 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
333 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
334 addlistener (hg, "barwidth", @update_group); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
335 addlistener (hg, "barlayout", @update_group); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
336 addlistener (hg, "horizontal", @update_group); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
337 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
338 addproperty ("edgecolor", hg, "patchedgecolor", get (h, "edgecolor")); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
339 addproperty ("facecolor", hg, "patchfacecolor", get (h, "facecolor")); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
340 addproperty ("linestyle", hg, "patchlinestyle", get (h, "linestyle")); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
341 addproperty ("linewidth", hg, "patchlinewidth", get (h, "linewidth")); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
342 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
343 addlistener (hg, "edgecolor", @update_props); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
344 addlistener (hg, "facecolor", @update_props); |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
345 addlistener (hg, "linestyle", @update_props); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
346 addlistener (hg, "linewidth", @update_props); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
347 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
348 if (isvector (x)) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
349 addproperty ("xdata", hg, "data", x); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
350 else |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
351 addproperty ("xdata", hg, "data", x(:, i)); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
352 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
353 addproperty ("ydata", hg, "data", y(:, i)); |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
354 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
355 addlistener (hg, "xdata", @update_data); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
356 addlistener (hg, "ydata", @update_data); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
357 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
358 addproperty ("bargroup", hg, "data"); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
359 set (hglist, "bargroup", hglist); |
17527
76614e624818
Add "HitTestArea" property to certain hggroups for Matlab compatibility
Rik <rik@octave.org>
parents:
17519
diff
changeset
|
360 |
76614e624818
Add "HitTestArea" property to certain hggroups for Matlab compatibility
Rik <rik@octave.org>
parents:
17519
diff
changeset
|
361 ## Matlab property, although Octave does not implement it. |
76614e624818
Add "HitTestArea" property to certain hggroups for Matlab compatibility
Rik <rik@octave.org>
parents:
17519
diff
changeset
|
362 addproperty ("hittestarea", hg, "radio", "on|{off}", "off"); |
76614e624818
Add "HitTestArea" property to certain hggroups for Matlab compatibility
Rik <rik@octave.org>
parents:
17519
diff
changeset
|
363 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
364 if (! isempty (args)) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
365 set (hg, args{:}); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
366 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
367 endfor |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
368 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
369 update_xlim (hax, []); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
370 ## Add listeners outside of for loop to prevent constant updating during |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
371 ## creation of plot when patch objects are added. |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
372 addlistener (hax, "xlim", @update_xlim); |
22930
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
373 addlistener (hax, "yscale", {@update_basevalue_logscale, hg}); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
374 addlistener (h_baseline, "ydata", @update_baseline); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
375 addlistener (h_baseline, "visible", @update_baseline); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
376 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
377 endfunction |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
378 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
379 function update_xlim (h, ~) |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
380 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
381 kids = get (h, "children"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
382 xlim = get (h, "xlim"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
383 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
384 for i = 1 : length (kids) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
385 obj = get (kids(i)); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
386 if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline")) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
387 if (any (get (obj.baseline, "xdata") != xlim)) |
10549 | 388 set (obj.baseline, "xdata", xlim); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
389 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
390 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
391 endfor |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
392 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
393 endfunction |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
394 |
22930
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
395 function update_basevalue_logscale (hax, ~, hg) |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
396 if (strcmp (get (hax, "yscale"), "log")) |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
397 warning ("off", "Octave:negative-data-log-axis", "local"); |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
398 if (get (hg, "basevalue") == 0) |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
399 set (hg, "basevalue", 1); |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
400 endif |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
401 else |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
402 if (get (hg, "basevalue") == 1) |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
403 set (hg, "basevalue", 0); |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
404 endif |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
405 endif |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
406 endfunction |
f2d2edab5c66
Change basevalue of bar charts when axes scale changed to log (bug #41944).
Rik <rik@octave.org>
parents:
22755
diff
changeset
|
407 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
408 function update_baseline (h, ~) |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
409 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
410 visible = get (h, "visible"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
411 ydata = get (h, "ydata")(1); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
412 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
413 ## Search axis for a bargroup that contains this baseline handle |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
414 kids = get (get (h, "parent"), "children"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
415 for i = 1 : length (kids) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
416 obj = get (kids(i)); |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
417 if (strcmp (obj.type, "hggroup") && isfield (obj, "baseline") |
10549 | 418 && obj.baseline == h) |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
419 set (obj.bargroup, "showbaseline", visible, "basevalue", ydata); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
420 break; |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
421 endif |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
422 endfor |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
423 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
424 endfunction |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
425 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
426 function show_baseline (h, ~, prop = "") |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
427 persistent recursion = false; |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
19284
diff
changeset
|
428 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
429 ## Don't allow recursion |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
430 if (! recursion) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
431 unwind_protect |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
432 recursion = true; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
433 hlist = get (h, "bargroup"); |
15484
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
434 if (strcmp (prop, "showbl")) |
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
435 showbaseline = get (h, "showbaseline"); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
436 hlist = hlist(hlist != h); # remove current handle being updated |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
437 set (hlist, "showbaseline", showbaseline); |
15484
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
438 elseif (strcmp (prop, "visib")) |
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
439 showbaseline = "on"; |
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
440 if (all (strcmp (get (hlist, "visible"), "off"))) |
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
441 showbaseline = "off"; |
10549 | 442 endif |
15484
0133339a51c3
hide baseline when bar group is made invisible
Pantxo <pantxo.diribarne@gmail.com>
parents:
15483
diff
changeset
|
443 endif |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
444 set (get (h, "baseline"), "visible", showbaseline); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
445 unwind_protect_cleanup |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
446 recursion = false; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
447 end_unwind_protect |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
448 endif |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
449 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
450 endfunction |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
451 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
452 function move_baseline (h, ~) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
453 persistent recursion = false; |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
454 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
455 ## Don't allow recursion |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
456 if (! recursion) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
457 recursion = true; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
458 unwind_protect |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
459 b0 = get (h, "basevalue"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
460 bl = get (h, "baseline"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
461 set (bl, "ydata", [b0, b0]); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
462 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
463 if (strcmp (get (h, "barlayout"), "grouped")) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
464 update_data (h); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
465 endif |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
466 unwind_protect_cleanup |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
467 recursion = false; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
468 end_unwind_protect |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
469 endif |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
470 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
471 endfunction |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
472 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
473 function update_props (h, ~) |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
474 kids = get (h, "children"); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
475 set (kids, {"edgecolor", "linewidth", "linestyle", "facecolor"}, |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
476 get (h, {"edgecolor", "linewidth", "linestyle", "facecolor"})); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
477 endfunction |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
478 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
479 function update_data (h, ~) |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
480 persistent recursion = false; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
481 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
482 ## Don't allow recursion |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
483 if (! recursion) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
484 unwind_protect |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
485 recursion = true; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
486 hlist = get (h, "bargroup"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
487 x = get (h, "xdata"); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
488 if (! isvector (x)) |
10549 | 489 x = x(:); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
490 endif |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
491 ydat = get (hlist, "ydata"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
492 if (iscell (ydat)) |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
493 y = cell2mat (ydat.'); |
19284
f96495e88a70
Allow setting horizontal vector of "ydata" in bar plots (bug #43468).
Rik <rik@octave.org>
parents:
18776
diff
changeset
|
494 elseif (isvector (ydat)) |
f96495e88a70
Allow setting horizontal vector of "ydata" in bar plots (bug #43468).
Rik <rik@octave.org>
parents:
18776
diff
changeset
|
495 y = ydat(:); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
496 else |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
497 y = ydat; |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
498 endif |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
499 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
500 [xb, yb] = bar (x, y, get (h, "barwidth"), get (h, "barlayout"), |
10549 | 501 "basevalue", get (h, "basevalue")); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
502 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
503 vertical = strcmp (get (h, "horizontal"), "off"); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
504 for i = 1:columns (y) |
10549 | 505 hp = get (hlist(i), "children"); |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
506 if (vertical) |
10549 | 507 set (hp, "xdata", xb(:,:,i), "ydata", yb(:,:,i)); |
508 else | |
509 set (hp, "xdata", yb(:,:,i), "ydata", xb(:,:,i)); | |
510 endif | |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
511 endfor |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
512 unwind_protect_cleanup |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
513 recursion = false; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
514 end_unwind_protect |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
515 endif |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
516 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
517 endfunction |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
518 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
519 function update_group (h, ~) |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
520 persistent recursion = false; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
521 |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
522 ## Don't allow recursion |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
523 if (! recursion) |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
524 unwind_protect |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
525 recursion = true; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
526 hlist = get (h, "bargroup"); |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14388
diff
changeset
|
527 barwidth = get (h, "barwidth"); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
528 barlayout = get (h, "barlayout"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
529 horizontal = get (h, "horizontal"); |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
530 |
17519
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
531 hlist = hlist(hlist != h); # remove current handle being updated |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
532 set (hlist, "barwidth", barwidth, "barlayout", barlayout, |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
533 "horizontal", horizontal); |
cc9befe5d271
Overhaul bar family of plot functions.
Rik <rik@octave.org>
parents:
17462
diff
changeset
|
534 update_data (h); |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
535 unwind_protect_cleanup |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
536 recursion = false; |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
537 end_unwind_protect |
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
538 endif |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
539 |
9896
1aeb39118764
convert some plot functions to subfunctions or make some them private
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
540 endfunction |