Mercurial > octave
annotate scripts/plot/util/newplot.m @ 30682:fdd58773ac02 stable
newplot.m: Don't change currentaxes when provided an axes handle (bug #61945)
* newplot.m: If an axes handle is provided don't make the corresponding axes
current.
author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
---|---|
date | Fri, 28 Jan 2022 18:28:44 +0100 |
parents | 796f54d4ddbf |
children | 7d5cb3dd312d |
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:
30551
diff
changeset
|
3 ## Copyright (C) 2005-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/>. |
6257 | 7 ## |
8 ## This file is part of Octave. | |
9 ## | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24432
diff
changeset
|
10 ## Octave is free software: you can redistribute it and/or modify it |
6257 | 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:
24432
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. |
6257 | 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. |
6257 | 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:
24432
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 ######################################################################## |
6257 | 25 |
26 ## -*- texinfo -*- | |
20852
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
19833
diff
changeset
|
27 ## @deftypefn {} {} newplot () |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
19833
diff
changeset
|
28 ## @deftypefnx {} {} newplot (@var{hfig}) |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
19833
diff
changeset
|
29 ## @deftypefnx {} {} newplot (@var{hax}) |
516bb87ea72e
2015 Code Sprint: remove class of function from docstring for all m-files.
Rik <rik@octave.org>
parents:
19833
diff
changeset
|
30 ## @deftypefnx {} {@var{hax} =} newplot (@dots{}) |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
31 ## Prepare graphics engine to produce a new plot. |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
32 ## |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
33 ## This function is called at the beginning of all high-level plotting |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
34 ## functions. It is not normally required in user programs. @code{newplot} |
24431
0c6cedafc71e
doc: Use 'axes' rather than 'axis' appropriately in docstrings.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
35 ## queries the @qcode{"NextPlot"} field of the current figure and axes to |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
36 ## determine what to do. |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
37 ## |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
38 ## @multitable @columnfractions .25 .75 |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
39 ## @headitem Figure NextPlot @tab Action |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
40 ## @item @qcode{"new"} @tab Create a new figure and make it the current figure. |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
41 ## |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
42 ## @item @qcode{"add"} (default) @tab Add new graphic objects to the current |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
43 ## figure. |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
44 ## |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
45 ## @item @qcode{"replacechildren"} @tab Delete child objects whose |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
46 ## HandleVisibility is set to @qcode{"on"}. Set NextPlot property to |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
47 ## @qcode{"add"}. This typically clears a figure, but leaves in place hidden |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
48 ## objects such as menubars. This is equivalent to @code{clf}. |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
49 ## |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
50 ## @item @qcode{"replace"} @tab Delete all child objects of the figure and |
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
51 ## reset all figure properties to their defaults. However, the following |
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
52 ## four properties are not reset: Position, Units, PaperPosition, PaperUnits. |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
53 ## This is equivalent to @code{clf reset}. |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
54 ## @end multitable |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
55 ## |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
56 ## @multitable @columnfractions .25 .75 |
24431
0c6cedafc71e
doc: Use 'axes' rather than 'axis' appropriately in docstrings.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
57 ## @headitem Axes NextPlot @tab Action |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
58 ## @item @qcode{"add"} @tab Add new graphic objects to the current axes. This |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
59 ## is equivalent to @code{hold on}. |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
60 ## |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
61 ## @item @qcode{"replacechildren"} @tab Delete child objects whose |
24431
0c6cedafc71e
doc: Use 'axes' rather than 'axis' appropriately in docstrings.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
62 ## HandleVisibility is set to @qcode{"on"}, but leave axes properties |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
63 ## unmodified. This typically clears a plot, but preserves special settings |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19712
diff
changeset
|
64 ## such as log scaling for axes. This is equivalent to @code{cla}. |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
65 ## |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
66 ## @item @qcode{"replace"} (default) @tab Delete all child objects of the |
24431
0c6cedafc71e
doc: Use 'axes' rather than 'axis' appropriately in docstrings.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
67 ## axes and reset all axes properties to their defaults. However, the |
17281
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
68 ## following properties are not reset: Position, Units. This is equivalent |
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
69 ## to @code{cla reset}. |
bc924baa2c4e
doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents:
17204
diff
changeset
|
70 ## @end multitable |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
71 ## |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
72 ## If the optional input @var{hfig} or @var{hax} is given then prepare the |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
73 ## specified figure or axes rather than the current figure and axes. |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
74 ## |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
75 ## The optional return value @var{hax} is a graphics handle to the created |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
76 ## axes object (not figure). |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
77 ## |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
78 ## @strong{Caution:} Calling @code{newplot} may change the current figure and |
24431
0c6cedafc71e
doc: Use 'axes' rather than 'axis' appropriately in docstrings.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
79 ## current axes. |
6257 | 80 ## @end deftypefn |
81 | |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
82 ## FIXME: The Matlab function takes an optional list of file handles, hsave, |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
83 ## which are not deleted when the figure and axes are prepared. |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
84 ## I'm sure there is a good reason for that, but coding such |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
85 ## compatibility is really tricky and doesn't serve much purpose since |
17122
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17036
diff
changeset
|
86 ## newplot is nearly exclusively used by Octave's internal plotting |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
87 ## functions. In Octave's case the argument is almost always null, |
24431
0c6cedafc71e
doc: Use 'axes' rather than 'axis' appropriately in docstrings.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
88 ## or occasionally the axes handle to plot into. |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
89 |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
90 function hax = newplot (hsave = []) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
91 |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
92 cf = []; |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
93 ca = []; |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
94 |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
95 if (! isempty (hsave)) |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
96 ## Find the first valid axes |
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
97 ca = ancestor (hsave, "axes", "toplevel"); |
17720
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
98 if (iscell (ca)) |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
99 ca = [ca{:}]; |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
100 endif |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
101 ca = ca(find (ca, 1)); |
17720
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
102 hsave(hsave == ca) = []; |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
103 ## Next, find the figure associated with any axis found |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
104 if (! isempty (ca)) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
105 cf = ancestor (ca, "figure", "toplevel"); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
106 else |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
107 cf = ancestor (hsave, "figure", "toplevel"); |
17720
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
108 if (iscell (cf)) |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
109 cf = [cf{:}]; |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
110 endif |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
111 cf = cf(find (cf, 1)); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
112 endif |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
113 endif |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
114 |
23013
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
115 do_reset = true; |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
116 if (isempty (cf)) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
117 ## get current figure, or create a new one if necessary |
23013
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
118 cf = get (0, "currentfigure"); |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
119 if (isempty (cf)) |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
120 cf = figure (); |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
121 do_reset = false; |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
122 endif |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
123 else |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
124 ## switch to figure provided without causing other updates |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
125 set (0, "currentfigure", cf); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
126 endif |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
127 |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
128 fnp = get (cf, "nextplot"); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
129 switch (fnp) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
130 case "add" |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
131 ## Default case. Doesn't require action. |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
132 case "new" |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
133 ## Ordinarily, create a new figure to hold plot. |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
134 ## But, if user has requested preparing a specific axis, then |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
135 ## use the existing figure to hold the requested axis. |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
136 if (isempty (ca)) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
137 cf = figure (); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
138 endif |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
139 case "replacechildren" |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
140 kids = get (cf, "children"); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
141 if (! isempty (ca)) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
142 kids(kids == ca) = []; |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
143 endif |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
144 delete (kids); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
145 case "replace" |
23013
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
146 if (do_reset) |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
147 kids = allchild (cf); |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
148 if (! isempty (ca)) |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
149 kids(kids == ca) = []; |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
150 endif |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
151 delete (kids); |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
152 reset (cf); |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
153 endif |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
154 endswitch |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
155 set (cf, "nextplot", "add"); # Matlab compatibility |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
156 |
23013
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
157 do_reset = true; |
30682
fdd58773ac02
newplot.m: Don't change currentaxes when provided an axes handle (bug #61945)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
30564
diff
changeset
|
158 deleteall = false; |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
159 if (isempty (ca)) |
23013
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
160 ca = get (cf, "currentaxes"); |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
161 if (isempty (ca)) |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
162 ca = axes (); |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
163 do_reset = false; |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
164 endif |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
165 deleteall = true; |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
166 endif |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
167 |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
168 anp = get (ca, "nextplot"); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
169 switch (anp) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
170 case "add" |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
171 ## Default case. Doesn't require action. |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
172 case "replacechildren" |
17720
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
173 if (! deleteall && ca != hsave) |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
174 ## preserve hsave and its parents, uncles, ... |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
175 kids = allchild (ca); |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
176 hkid = hsave; |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
177 while (! any (hkid == kids)) |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
178 hkid = get (hkid, "parent"); |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
179 endwhile |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
180 kids(kids == hkid) = []; |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
181 delete (kids); |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
182 else |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
183 delete (get (ca, "children")); |
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
184 endif |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
185 case "replace" |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
186 if (! deleteall && ca != hsave) |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
187 ## preserve hsave and its parents, uncles, ... |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
188 kids = allchild (ca); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
189 hkid = hsave; |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
190 while (! any (hkid == kids)) |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
191 hkid = get (hkid, "parent"); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
192 endwhile |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
193 kids(kids == hkid) = []; |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
194 delete (kids); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
195 else |
29149
e3e887d5f631
plotyy.m: Fix error when called repeatedly (bug #53461).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28789
diff
changeset
|
196 if (isprop (ca, "__plotyy_axes__") ... |
e3e887d5f631
plotyy.m: Fix error when called repeatedly (bug #53461).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28789
diff
changeset
|
197 && ! any (strcmp({dbstack().name}, "plotyy"))) |
19712
52cd69e79784
Fix legend function interaction with plotyy (bug #44246).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
198 ## Hack for bug #44246. There is no way to reset or remove a |
52cd69e79784
Fix legend function interaction with plotyy (bug #44246).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
199 ## property created with addproperty short of deleting the object. |
30551
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
200 old_units = get (ca, "units"); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
201 old_position = get (ca, "position"); |
19712
52cd69e79784
Fix legend function interaction with plotyy (bug #44246).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
202 delete (ca); |
30551
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
203 ca = axes ("units", old_units, "position", old_position); |
23013
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
204 elseif (do_reset) |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
205 rcn = getappdata (ca, "__subplotrcn__"); |
23013
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
206 delete (allchild (ca)); |
5dca1727ce94
cla.m, newplot.m: make use of reset function to cleanup listeners (bug #49980).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
22755
diff
changeset
|
207 reset (ca); |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
208 ## Reinstall listeners for subplot |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
209 if (! isempty (rcn)) |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
210 subplot (rcn{:}, ca) |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
211 endif |
19712
52cd69e79784
Fix legend function interaction with plotyy (bug #44246).
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
212 endif |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
213 endif |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
214 endswitch |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
215 |
22072
7680225527ef
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22069
diff
changeset
|
216 ## Reset line and color styles when hold is not on |
22069
9121d6584f6a
Overhaul graphics implementation of hold() (bug #43559).
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
217 if (! strcmp (anp, "add")) |
9121d6584f6a
Overhaul graphics implementation of hold() (bug #43559).
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
218 set (ca, "colororderindex", 1, "linestyleorderindex", 1); |
9121d6584f6a
Overhaul graphics implementation of hold() (bug #43559).
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
219 endif |
9121d6584f6a
Overhaul graphics implementation of hold() (bug #43559).
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
220 |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
221 if (nargout > 0) |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
222 hax = ca; |
6257 | 223 endif |
8252
b12a2975bf7e
newplot.m: delete stray debugging code
John W. Eaton <jwe@octave.org>
parents:
8228
diff
changeset
|
224 |
6257 | 225 endfunction |
13204 | 226 |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
227 |
13204 | 228 %!test |
229 %! hf = figure ("visible", "off"); | |
230 %! unwind_protect | |
231 %! p = plot ([0, 1]); | |
17036
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
232 %! hax = newplot (); |
08dd9458684a
Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents:
16076
diff
changeset
|
233 %! assert (hax, gca); |
13204 | 234 %! assert (isempty (get (gca, "children"))); |
235 %! unwind_protect_cleanup | |
236 %! close (hf); | |
237 %! end_unwind_protect | |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
238 |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
239 %!test |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
240 %! hf = figure ("visible", "off"); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
241 %! unwind_protect |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
242 %! hax = axes (); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
243 %! hold on; |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
244 %! hg1 = hggroup (); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
245 %! hg2 = hggroup ("parent", hg1); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
246 %! li0 = line (1:10, 1:10); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
247 %! li1 = line (1:10, -1:-1:-10, "parent", hg1); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
248 %! li2 = line (1:10, sin (1:10), "parent", hg2); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
249 %! hold off; |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
250 %! newplot (hg2); |
24423
1d52db450db4
Change ishandle to return true for Java objects for Matlab compatibility.
Rik <rik@octave.org>
parents:
23930
diff
changeset
|
251 %! assert (ishghandle (li0), false); |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
252 %! assert (get (hax, "children"), hg1); |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
253 %! |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
254 %! ## kids are preserved for hggroups |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
255 %! kids = get (hg1, "children"); |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
256 %! newplot (hg1); |
17720
1ab8e21d9cfc
Further corrections to parenting of axes (bug #39813)
Rik <rik@octave.org>
parents:
17719
diff
changeset
|
257 %! assert (get (hg1, "children"), kids); |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
258 %! |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
259 %! ## preserve objects |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
260 %! newplot (li1); |
24423
1d52db450db4
Change ishandle to return true for Java objects for Matlab compatibility.
Rik <rik@octave.org>
parents:
23930
diff
changeset
|
261 %! assert (ishghandle (li1)); |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
262 %! |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
263 %! ## kids are deleted for axes |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
264 %! newplot (hax); |
17719
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
265 %! assert (isempty (get (hax, "children"))); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
266 %! unwind_protect_cleanup |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
267 %! close (hf); |
ed9a21a90221
Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
268 %! end_unwind_protect |
30551
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
269 |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
270 %!test |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
271 %! hf = figure ("visible", "off"); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
272 %! unwind_protect |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
273 %! hax = axes ("units", "normalized", "position", [0.1, 0.1, 0.8, 0.3]); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
274 %! plotyy (hax, 1:4, 1:4, 1:4, 4:-1:1); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
275 %! hax2 = newplot (); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
276 %! assert (get (hax2, "units"), "normalized"); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
277 %! assert (get (hax2, "position"), [0.1, 0.1, 0.8, 0.3]); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
278 %! unwind_protect_cleanup |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
279 %! close (hf); |
4d2b528464ad
newplot.m: Restore axes position after resetting plotyy axes.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
280 %! end_unwind_protect |