Mercurial > octave-nkf

annotate scripts/plot/util/newplot.m @ 17719:ed9a21a90221

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix incorrect parenting of axes and hggroups (bug #39813) Modify newplot to accept any type of graphics handle so that it can be preserved. Modify __plt_get_axis_arg__ to return "parent" handle instead of axis handle. * newplot.m: Make the function preserve the hsave handle. Add Matlab compatible tests *__plt_get_axis_arg__: Return "parent" argument in case one is specified instead of axis.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Mon, 23 Sep 2013 19:44:57 +0200
parents 7bb76a22cde1
children 1ab8e21d9cfc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 13204
diff changeset
1 ## Copyright (C) 2005-2012 John W. Eaton
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
2 ##
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
3 ## This file is part of Octave.
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
4 ##
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6895
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6895
diff changeset
8 ## your option) any later version.
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
9 ##
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
13 ## General Public License for more details.
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
14 ##
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6895
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6895
diff changeset
17 ## <http://www.gnu.org/licenses/>.
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
18
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
19 ## -*- texinfo -*-
16076
c90c9623b20f newplot.m: Return handle to created axes for Matlab compatibility (Bug #38146)
Rik <rik@octave.org>
parents: 14363
diff changeset
20 ## @deftypefn {Function File} {} newplot ()
17036
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
21 ## @deftypefnx {Function File} {} newplot (@var{hfig})
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
22 ## @deftypefnx {Function File} {} newplot (@var{hax})
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
23 ## @deftypefnx {Function File} {@var{hax} =} newplot (@dots{})
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
24 ## 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
25 ##
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
26 ## 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
27 ## functions. It is not normally required in user programs. @code{newplot}
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
28 ## queries the @qcode{"NextPlot"} field of the current figure and axis to
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
29 ## 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
30 ##
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
31 ## @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
32 ## @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
33 ## @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
34 ##
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
35 ## @item @qcode{"add"} (default) @tab Add new graphic objects to 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
36 ##
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
37 ## @item @qcode{"replacechildren"} @tab Delete child objects whose HandleVisibility is
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
38 ## set to @qcode{"on"}. Set NextPlot property to @qcode{"add"}. This
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
39 ## typically clears a figure, but leaves in place hidden objects such as
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
40 ## 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
41 ##
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
42 ## @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
43 ## 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
44 ## four properties are not reset: Position, Units, PaperPosition, PaperUnits.
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
45 ## This is equivalent to @code{clf reset}.
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
46 ## @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
47 ##
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
48 ## @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
49 ## @headitem Axis NextPlot @tab Action
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
50 ## @item @qcode{"add"} @tab Add new graphic objects to the current axes. This is
17036
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
51 ## equivalent to @code{hold on}.
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
52 ##
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
53 ## @item @qcode{"replacechildren"} @tab Delete child objects whose HandleVisibility is
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
54 ## set to @qcode{"on"}, but leave axis properties unmodified. This typically
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
55 ## clears a plot, but preserves special settings such as log scaling for
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
56 ## 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
57 ##
17281
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
58 ## @item @qcode{"replace"} (default) @tab Delete all child objects of the
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
59 ## axis and reset all axis properties to their defaults. However, the
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
60 ## 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
61 ## to @code{cla reset}.
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted.
Rik <rik@octave.org>
parents: 17204
diff changeset
62 ## @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
63 ##
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
64 ## 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
65 ## 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
66 ##
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
67 ## 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
68 ## 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
69 ##
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
70 ## @strong{Caution:} Calling @code{newplot} may change the current figure and
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
71 ## current axis.
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
72 ## @end deftypefn
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
73
17036
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
74 ## 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
75 ## 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
76 ## 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
77 ## 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
78 ## 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
79 ## functions. In Octave's case the argument is almost always null,
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
80 ## or occasionally the axis handle to plot into.
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
81
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
82 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
83
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
84 if (nargin > 1)
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
85 print_usage ();
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
86 endif
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
87
17036
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
88 cf = [];
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
89 ca = [];
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
90
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
91 if (! isempty (hsave))
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
92 ## Find the first valid axes
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
93 ca = ancestor (hsave, "axes", "toplevel");
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
94 ca = ca(find (ca, 1));
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
95 ## 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
96 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
97 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
98 else
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
99 cf = ancestor (hsave, "figure", "toplevel");
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
100 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
101 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
102 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
103
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 (cf))
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
105 ## get current figure, or create a new one if necessary
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
106 cf = gcf ();
17036
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
107 else
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
108 ## 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
109 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
110 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
111
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
112 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
113 switch (fnp)
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
114 case "add"
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
115 ## 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
116 case "new"
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
117 ## 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
118 ## 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
119 ## 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
120 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
121 cf = figure ();
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
122 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
123 case "replacechildren"
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
124 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
125 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
126 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
127 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
128 delete (kids);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
129 case "replace"
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
130 kids = allchild (cf);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
131 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
132 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
133 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
134 delete (kids);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
135 reset (cf);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
136 endswitch
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
137 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
138
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
139 if (isempty (ca))
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
140 ca = gca ();
17719
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
141 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
142 else
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
143 set (cf, "currentaxes", ca);
17719
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
144 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
145 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
146
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
147 ## FIXME: Is this necessary anymore?
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
148 ## It seems like a kluge that belongs somewhere else.
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
149 if (strcmp (get (ca, "__hold_all__"), "off"))
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
150 __next_line_color__ (true);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
151 __next_line_style__ (true);
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
152 else
17036
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
153 __next_line_color__ (false);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
154 __next_line_style__ (false);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
155 endif
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
156
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
157 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
158 switch (anp)
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
159 case "add"
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
160 ## 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
161 case "replacechildren"
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
162 delete (get (ca, "children"));
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
163 case "replace"
17719
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
164 if (! deleteall && ca != hsave)
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
165 ## 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
166 kids = allchild (ca);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
167 hkid = hsave;
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
168 while (! any (hkid == kids))
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
169 hkid = get (hkid, "parent");
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
170 endwhile
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
171 kids(kids == hkid) = [];
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
172 delete (kids);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
173 else
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
174 __go_axes_init__ (ca, "replace");
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
175 __request_drawnow__ ();
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
176 endif
17036
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
177 ## FIXME: The code above should perform the following:
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
178 ###########################
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
179 ## delete (allchild (ca));
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
180 ## reset (ca);
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
181 ###########################
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
182 ## Actually, __go_axes_init__ does both less and more.
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
183 ## It doesn't really remove all children since it re-instantiates
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
184 ## xlabel, ylabel, zlabel, and title text objects.
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
185 ## Also it preserves font properties like fontsize.
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
186 ## For the time being, in order to have axis labels and title work,
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
187 ## the above code is is required.
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
188 endswitch
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
189
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
190 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
191 hax = ca;
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
192 endif
8252
b12a2975bf7e newplot.m: delete stray debugging code
John W. Eaton <jwe@octave.org>
parents: 8228
diff changeset
193
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
194 endfunction
13204
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
195
14363
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
196
13204
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
197 %!test
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
198 %! hf = figure ("visible", "off");
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
199 %! unwind_protect
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
200 %! 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
201 %! hax = newplot ();
08dd9458684a Overhaul __plt_get_axis_arg__ and newplot functions to avoid creating unnecessary axes.
Rik <rik@octave.org>
parents: 16076
diff changeset
202 %! assert (hax, gca);
13204
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
203 %! assert (isempty (get (gca, "children")));
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
204 %! unwind_protect_cleanup
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
205 %! close (hf);
be7bfd59300a Add tests for scripts/plot
Kai Habel <kai.habel@gmx.de>
parents: 11589
diff changeset
206 %! end_unwind_protect
14363
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
207
17719
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
208 %!test
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
209 %! hf = figure ("visible", "off");
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
210 %! unwind_protect
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
211 %! hax = axes ();
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
212 %! hold on;
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
213 %! hg1 = hggroup ();
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
214 %! hg2 = hggroup ("parent", hg1);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
215 %! 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
216 %! 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
217 %! 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
218 %! hold off;
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
219 %! newplot (hg2);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
220 %! assert (ishandle (li0), false);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
221 %! assert (get (hax, "children"), hg1);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
222 %!
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
223 %! ## 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
224 %! kids = get (hg1, "children");
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
225 %! newplot (hg1);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
226 %! assert (get (hg1, "children"), kids));
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
227 %!
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
228 %! ## preserve objects
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
229 %! newplot (li1);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
230 %! assert (ishandle (li1));
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
231 %!
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
232 %! ## kids are deleted for axes
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
233 %! newplot (hax);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
234 %! 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
235 %! unwind_protect_cleanup
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
236 %! close (hf);
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
237 %! end_unwind_protect
ed9a21a90221 Fix incorrect parenting of axes and hggroups (bug #39813)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 17572
diff changeset
238