annotate scripts/plot/util/axes.m @ 17720:1ab8e21d9cfc

Further corrections to parenting of axes (bug #39813) * scripts/plot/util/newplot.m: Accept multiple graphic handles to save. Also save handles when axis nextplot property is "replacechildren". Correct failing %!test. * scripts/plot/util/__plt_get_axis_arg__.m: Return axis as first value, "parent" handle as second value. * scripts/plot/draw/surface.m: Get axis from __plt_get_axis_arg__ and ignore any other returned handles.
author Rik <rik@octave.org>
date Mon, 21 Oct 2013 22:25:15 -0700
parents 7bb76a22cde1
children d63878346099
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: 13327
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: 6851
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: 6851
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: 6851
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: 6851
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 -*-
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10549
diff changeset
20 ## @deftypefn {Function File} {} axes ()
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
21 ## @deftypefnx {Function File} {} axes (@var{property}, @var{value}, @dots{})
17122
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
22 ## @deftypefnx {Function File} {} axes (@var{hax})
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
23 ## @deftypefnx {Function File} {@var{h} =} axes (@dots{})
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
24 ## Create an axes object and return a handle to it, or set the current
17122
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
25 ## axes to @var{hax}.
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
26 ##
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
27 ## Called without any arguments, or with @var{property}/@var{value} pairs,
17122
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
28 ## construct a new axes. For accepted properties and corresponding
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
29 ## values, @pxref{XREFset,,set}.
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
30 ##
17122
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
31 ## Called with a single axes handle argument @var{hax}, the function makes
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
32 ## @var{hax} the current axis. It also restacks the axes in the
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
33 ## corresponding figure so that @var{hax} is the first entry in the list
eaab03308c0b doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents: 17042
diff changeset
34 ## of children. This causes @var{hax} to be displayed on top of any other
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
35 ## axes objects (Z-order stacking).
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
36 ##
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
37 ## @seealso {gca, set, get}
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
38 ## @end deftypefn
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
39
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
40 ## Author: jwe
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
41
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
42 function h = axes (varargin)
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
43
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
44 if (nargin == 0 || nargin > 1)
13327
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
45 ## Create an axes object.
6851
05f6f120a65f [project @ 2007-08-31 17:58:00 by jwe]
jwe
parents: 6688
diff changeset
46 idx = find (strcmpi (varargin(1:2:end), "parent"), 1, "first");
05f6f120a65f [project @ 2007-08-31 17:58:00 by jwe]
jwe
parents: 6688
diff changeset
47 if (! isempty (idx) && length (varargin) >= 2*idx)
05f6f120a65f [project @ 2007-08-31 17:58:00 by jwe]
jwe
parents: 6688
diff changeset
48 cf = varargin{2*idx};
05f6f120a65f [project @ 2007-08-31 17:58:00 by jwe]
jwe
parents: 6688
diff changeset
49 varargin([2*idx-1, 2*idx]) = [];
05f6f120a65f [project @ 2007-08-31 17:58:00 by jwe]
jwe
parents: 6688
diff changeset
50 else
05f6f120a65f [project @ 2007-08-31 17:58:00 by jwe]
jwe
parents: 6688
diff changeset
51 cf = gcf ();
05f6f120a65f [project @ 2007-08-31 17:58:00 by jwe]
jwe
parents: 6688
diff changeset
52 endif
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
53 htmp = __go_axes__ (cf, varargin{:});
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
54 if (__is_handle_visible__ (htmp))
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
55 set (ancestor (cf, "figure"), "currentaxes", htmp);
13327
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
56 endif
6688
b26a8e0e42cd [project @ 2007-06-04 06:25:21 by jwe]
jwe
parents: 6405
diff changeset
57 else
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
58 ## ARG is axes handle.
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
59 htmp = varargin{1};
17125
b5d6314314fc Change various plot functions to take advantage of new isaxes() function.
Rik <rik@octave.org>
parents: 17122
diff changeset
60 if (isscalar (htmp) && isaxes (htmp))
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
61 if (__is_handle_visible__ (htmp))
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
62 parent = ancestor (htmp, "figure");
13327
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
63 set (0, "currentfigure", parent);
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
64 set (parent, "currentaxes", htmp);
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
65
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
66 ## restack
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
67 ch = get (parent, "children")(:);
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
68 idx = (ch == htmp);
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
69 ch = [ch(idx); ch(!idx)];
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
70 set (parent, "children", ch);
13327
f81fcceb394c axes: only update the currentaxes property of the parent figure if the axes object is visible
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
71 endif
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
72 else
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
73 error ("axes: H must be a scalar axes handle");
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
74 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
75 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
76
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
77 if (nargout > 0)
17042
62d5f73e840c axes.m: reorder figure children after setting the currentaxes (bug #39539).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 14868
diff changeset
78 h = htmp;
6257
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
79 endif
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
80
44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe]
jwe
parents:
diff changeset
81 endfunction
17338
1c89599167a6 maint: End m-files with 1 blank line.
Rik <rik@octave.org>
parents: 17125
diff changeset
82