Mercurial > octave
changeset 30821:7a647311ba8a
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 06 Mar 2022 18:20:05 -0800 |
parents | 96a3c5548546 (current diff) 620607ec6608 (diff) |
children | 0826c503f294 |
files | |
diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/util/hdl2struct.m Sun Mar 06 13:53:15 2022 -0300 +++ b/scripts/plot/util/hdl2struct.m Sun Mar 06 18:20:05 2022 -0800 @@ -58,13 +58,19 @@ hnot = findobj (h, "-depth", 1, "tag", "legend", "-or", "tag", "colorbar", "-or", "type", "uimenu"); kids = allkids(! ismember (allkids, hnot)); + if (strcmp (s.type, "axes")) + ## Check for polar plots with special "polar_grid" object + ## FIXME: A hack to fix bug #62093. + kids = [kids; findall(h, "tag", "polar_grid")]; + endif + nkids = length (kids); for i = nkids:-1:1 s.children(++ii) = hdl2struct (kids(i)); endfor endif - ## add non "children" children objects (title, xlabel, ...) and + ## Add non "children" children objects (title, xlabel, ...) and ## hggroup children and tag them in "special" if (strcmp (s.type, "hggroup")) special = allkids;
--- a/scripts/plot/util/struct2hdl.m Sun Mar 06 13:53:15 2022 -0300 +++ b/scripts/plot/util/struct2hdl.m Sun Mar 06 18:20:05 2022 -0800 @@ -441,9 +441,9 @@ function [h, sout, pout] = createhg (s, p, par, hilev) ## Here we infer from properties the type of hggroup we should build - ## an call corresponding high level functions + ## and call the corresponding high level functions. ## We manually set "hold on" to avoid next hggroup be deleted - ## the proper value of axes "nextplot" will finally be recovered + ## the proper value of axes "nextplot" will finally be recovered. hold on; if (hilev) @@ -475,6 +475,12 @@ s.special = []; endif + ## Check for polar plots with special "polar_grid" object + ## FIXME: A hack to fix bug #62093. + if (strcmp (s.properties.tag, "polar_grid")) + s.properties.handlevisibility = "off"; + endif + sout = s; pout = p;