octave: scripts/plot/util/subplot.m annotate

annotate scripts/plot/util/subplot.m @ 28177:bc829338e353 stable

doc: Clarify behavior of "subplot". * subplot.m: The "position" property-value pair cannot be combined with the "rows, cols, index" triplet. (Partly) covered axes are deleted.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Fri, 27 Mar 2020 15:25:50 +0100
parents	9f9ac219896d
children	1379ebcb00c3 9342688e86b4

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ########################################################################
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 ##
27919 1891570abac8 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27918 diff changeset	3 ## Copyright (C) 1995-2020 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/>.
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	7 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	8 ## This file is part of Octave.
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	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
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	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.
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	14 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	15 ## Octave is distributed in the hope that it will be useful, but
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	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.
2313 5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	19 ##
5ca126254d15 [project @ 1996-07-11 21:25:22 by jwe] jwe parents: 2312 diff changeset	20 ## 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: 6828 diff changeset	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 ########################################################################
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	25
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	26 ## -- texinfo --
20852 516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	27 ## @deftypefn {} {} subplot (@var{rows}, @var{cols}, @var{index})
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	28 ## @deftypefnx {} {} subplot (@var{rows}, @var{cols}, @var{index}, @var{hax})
20852 516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	29 ## @deftypefnx {} {} subplot (@var{rcn})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	30 ## @deftypefnx {} {} subplot (@var{hax})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	31 ## @deftypefnx {} {} subplot (@dots{}, "align")
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	32 ## @deftypefnx {} {} subplot (@dots{}, "replace")
28177 bc829338e353 doc: Clarify behavior of "subplot". Markus Mützel <markus.muetzel@gmx.de> parents: 27985 diff changeset	33 ## @deftypefnx {} {} subplot ("position", @var{pos})
20852 516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	34 ## @deftypefnx {} {} subplot (@dots{}, @var{prop}, @var{val}, @dots{})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20711 diff changeset	35 ## @deftypefnx {} {@var{hax} =} subplot (@dots{})
17122 eaab03308c0b doc: Rewrite docstrings for most plot functions. Rik <rik@octave.org> parents: 17095 diff changeset	36 ## Set up a plot grid with @var{rows} by @var{cols} subwindows and set the
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	37 ## current axes for plotting (@code{gca}) to the location given by @var{index}.
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3368 diff changeset	38 ##
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	39 ## If an axes handle @var{hax} is provided after the (@var{rows}, @var{cols},
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	40 ## @var{index}) arguments, the corresponding axes is turned into a
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	41 ## subplot.
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	42 ##
17122 eaab03308c0b doc: Rewrite docstrings for most plot functions. Rik <rik@octave.org> parents: 17095 diff changeset	43 ## If only one numeric argument is supplied, then it must be a three digit
20173 777f26aa8e3e doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19833 diff changeset	44 ## value specifying the number of rows in digit 1, the number of columns in
777f26aa8e3e doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19833 diff changeset	45 ## digit 2, and the plot index in digit 3.
17085 d3ebc3f9bdbf doc update for grid and subplot Michael Godfrey <michaeldgodfrey@gmail.com> parents: 17022 diff changeset	46 ##
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	47 ## The plot index runs row-wise; First, all columns in a row are numbered
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	48 ## and then the next row is filled.
3426 f8dde1807dee [project @ 2000-01-13 08:40:00 by jwe] jwe parents: 3368 diff changeset	49 ##
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	50 ## For example, a plot with 2x3 grid will have plot indices running as follows:
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	51 ## @tex
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	52 ## \vskip 10pt
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	53 ## \hfil\vbox{\offinterlineskip\hrule
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	54 ## \halign{\vrule#&&\qquad\hfil#\hfil\qquad\vrule\cr
7107 22397f0fb0b2 [project @ 2007-11-06 20:31:33 by dbateman] dbateman parents: 7086 diff changeset	55 ## height13pt&1&2&3\cr height12pt&&&\cr\noalign{\hrule}
22397f0fb0b2 [project @ 2007-11-06 20:31:33 by dbateman] dbateman parents: 7086 diff changeset	56 ## height13pt&4&5&6\cr height12pt&&&\cr\noalign{\hrule}}}
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	57 ## \hfil
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	58 ## \vskip 10pt
a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	59 ## @end tex
8517 81d6ab3ac93c Allow documentation tobe built for other formats than tex and info sh@sh-laptop parents: 8350 diff changeset	60 ## @ifnottex
10821 693e22af08ae Grammarcheck documentation of m-files Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	61 ##
8350 0e3a92a8683c fix texi bug in subplot.m Thorsten Meyer <thorsten.meyier@gmx.de> parents: 8232 diff changeset	62 ## @example
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	63 ## @group
7040 1f16da18d85d [project @ 2007-10-19 18:24:19 by jwe] jwe parents: 7017 diff changeset	64 ## +-----+-----+-----+
1f16da18d85d [project @ 2007-10-19 18:24:19 by jwe] jwe parents: 7017 diff changeset	65 ## \| 1 \| 2 \| 3 \|
1f16da18d85d [project @ 2007-10-19 18:24:19 by jwe] jwe parents: 7017 diff changeset	66 ## +-----+-----+-----+
1f16da18d85d [project @ 2007-10-19 18:24:19 by jwe] jwe parents: 7017 diff changeset	67 ## \| 4 \| 5 \| 6 \|
1f16da18d85d [project @ 2007-10-19 18:24:19 by jwe] jwe parents: 7017 diff changeset	68 ## +-----+-----+-----+
8350 0e3a92a8683c fix texi bug in subplot.m Thorsten Meyer <thorsten.meyier@gmx.de> parents: 8232 diff changeset	69 ## @end group
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6178 diff changeset	70 ## @end example
10821 693e22af08ae Grammarcheck documentation of m-files Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	71 ##
17122 eaab03308c0b doc: Rewrite docstrings for most plot functions. Rik <rik@octave.org> parents: 17095 diff changeset	72 ## @end ifnottex
eaab03308c0b doc: Rewrite docstrings for most plot functions. Rik <rik@octave.org> parents: 17095 diff changeset	73 ##
24431 0c6cedafc71e doc: Use 'axes' rather than 'axis' appropriately in docstrings. Rik <rik@octave.org> parents: 23219 diff changeset	74 ## @var{index} may also be a vector. In this case, the new axes will enclose
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	75 ## the grid locations specified. The first demo illustrates this:
12476 070214996fba subplot.m: Document using INDEX as a vector. Ben Abbott <bpabbott@mac.com> parents: 12470 diff changeset	76 ##
070214996fba subplot.m: Document using INDEX as a vector. Ben Abbott <bpabbott@mac.com> parents: 12470 diff changeset	77 ## @example
14327 4d917a6a858b doc: Use Octave coding conventions in @example blocks of docstrings. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	78 ## demo ("subplot", 1)
12476 070214996fba subplot.m: Document using INDEX as a vector. Ben Abbott <bpabbott@mac.com> parents: 12470 diff changeset	79 ## @end example
070214996fba subplot.m: Document using INDEX as a vector. Ben Abbott <bpabbott@mac.com> parents: 12470 diff changeset	80 ##
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	81 ## The index of the subplot to make active may also be specified by its axes
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	82 ## handle, @var{hax}, returned from a previous @code{subplot} command.
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	83 ##
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 17122 diff changeset	84 ## If the option @qcode{"align"} is given then the plot boxes of the subwindows
24431 0c6cedafc71e doc: Use 'axes' rather than 'axis' appropriately in docstrings. Rik <rik@octave.org> parents: 23219 diff changeset	85 ## will align, but this may leave no room for axes tick marks or labels.
17122 eaab03308c0b doc: Rewrite docstrings for most plot functions. Rik <rik@octave.org> parents: 17095 diff changeset	86 ##
24431 0c6cedafc71e doc: Use 'axes' rather than 'axis' appropriately in docstrings. Rik <rik@octave.org> parents: 23219 diff changeset	87 ## If the option @qcode{"replace"} is given then the subplot axes will be
0c6cedafc71e doc: Use 'axes' rather than 'axis' appropriately in docstrings. Rik <rik@octave.org> parents: 23219 diff changeset	88 ## reset, rather than just switching the current axes for plotting to the
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	89 ## requested subplot.
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	90 ##
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	91 ## The @qcode{"position"} property can be used to exactly position the subplot
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	92 ## axes within the current figure. The option @var{pos} is a 4-element vector
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	93 ## [x, y, width, height] that determines the location and size of the axes.
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	94 ## The values in @var{pos} are normalized in the range [0,1].
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	95 ##
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	96 ## Any property/value pairs are passed directly to the underlying axes object.
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	97 ##
28177 bc829338e353 doc: Clarify behavior of "subplot". Markus Mützel <markus.muetzel@gmx.de> parents: 27985 diff changeset	98 ## Any previously existing axes that would be (partly) covered by the newly
bc829338e353 doc: Clarify behavior of "subplot". Markus Mützel <markus.muetzel@gmx.de> parents: 27985 diff changeset	99 ## created axes are deleted.
bc829338e353 doc: Clarify behavior of "subplot". Markus Mützel <markus.muetzel@gmx.de> parents: 27985 diff changeset	100 ##
24431 0c6cedafc71e doc: Use 'axes' rather than 'axis' appropriately in docstrings. Rik <rik@octave.org> parents: 23219 diff changeset	101 ## If the output @var{hax} is requested, subplot returns the axes handle for
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	102 ## the subplot. This is useful for modifying the properties of a subplot
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	103 ## using @code{set}.
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	104 ## @seealso{axes, plot, gca, set}
3368 a4cd1e9d9962 [project @ 1999-11-20 17:22:48 by jwe] jwe parents: 3233 diff changeset	105 ## @end deftypefn
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	106
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	107 function h = subplot (varargin)
11305 c9df571efe95 subplot.m: Add suppport for "align" and "replace" options. Ben Abbott <bpabbott@mac.com> parents: 11149 diff changeset	108
c9df571efe95 subplot.m: Add suppport for "align" and "replace" options. Ben Abbott <bpabbott@mac.com> parents: 11149 diff changeset	109 align_axes = false;
c9df571efe95 subplot.m: Add suppport for "align" and "replace" options. Ben Abbott <bpabbott@mac.com> parents: 11149 diff changeset	110 replace_axes = false;
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	111 have_position = false;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	112 initial_args_decoded = false;
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	113 make_subplot = false;
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	114 hsubplot = [];
6163 8614649c454c [project @ 2006-11-14 18:52:34 by jwe] jwe parents: 6046 diff changeset	115
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	116 if (nargin >= 3)
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	117 ## R, C, N?
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	118 arg1 = varargin{1};
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	119 arg2 = varargin{2};
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	120 arg3 = varargin{3};
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	121 if ( isnumeric (arg1) && isscalar (arg1)
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	122 && isnumeric (arg2) && isscalar (arg2)
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	123 && isnumeric (arg3))
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	124 rows = arg1;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	125 cols = arg2;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	126 index = arg3;
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	127 if (nargin > 3 && isaxes (varargin{4}))
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	128 make_subplot = true;
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	129 hsubplot = varargin{4};
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	130 varargin(1:4) = [];
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	131 else
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	132 varargin(1:3) = [];
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	133 endif
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	134 initial_args_decoded = true;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	135 endif
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	136 endif
749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	137
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	138 if (! initial_args_decoded && nargin > 1)
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	139 ## check for "position", pos, ...
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	140 if (strcmpi (varargin{1}, "position"))
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	141 arg = varargin{2};
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	142 if (isnumeric (arg) && numel (arg) == 4)
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	143 pos = arg;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	144 varargin(1:2) = [];
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	145 have_position = true;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	146 initial_args_decoded = true;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	147 else
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	148 error ("subplot: POSITION must be a 4-element numeric array");
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	149 endif
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	150 endif
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	151 endif
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17860 diff changeset	152
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	153 if (! initial_args_decoded && nargin > 0)
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	154 arg = varargin{1};
17303 8520c264619c subplot.m: Use isaxes() function instead of ishandle() to check for axes. Rik <rik@octave.org> parents: 17281 diff changeset	155 if (nargin == 1 && isaxes (arg))
8520c264619c subplot.m: Use isaxes() function instead of ishandle() to check for axes. Rik <rik@octave.org> parents: 17281 diff changeset	156 ## Axes handle
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	157 axes (arg);
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	158 cf = get (0, "currentfigure");
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	159 set (cf, "nextplot", "add");
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	160 return;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	161 elseif (isscalar (arg) && arg >= 0)
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	162 ## RCN?
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	163 index = rem (arg, 10);
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	164 arg = (arg - index) / 10;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	165 cols = rem (arg, 10);
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	166 arg = (arg - cols) / 10;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	167 rows = rem (arg, 10);
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	168 varargin(1) = [];
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	169 initial_args_decoded = true;
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	170 else
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20173 diff changeset	171 error ("subplot: invalid axes handle or RCN argument");
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	172 endif
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	173 endif
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	174
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	175 if (! initial_args_decoded)
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	176 print_usage ();
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	177 endif
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	178
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	179 if (! have_position)
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	180 cols = round (cols);
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	181 rows = round (rows);
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	182 index = round (index);
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	183
5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	184 if (any (index < 1) \|\| any (index > rows*cols))
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	185 error ("subplot: INDEX value must be >= 1 and <= ROWS*COLS");
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	186 endif
749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	187
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	188 if (rows < 1 \|\| cols < 1 \|\| index < 1)
22173 8de49f15e182 doc: Fix "doubled words" typos (\b(\w+)\s+\1\b) Andreas Weber <andy.weber.aw@gmail.com> parents: 21758 diff changeset	189 error ("subplot: ROWS, COLS, and INDEX must be positive");
13794 5b395217ccb9 improve argument parsing for subplot, handle 'position' argument John W. Eaton <jwe@octave.org> parents: 12685 diff changeset	190 endif
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	191 endif
749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	192
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	193 ## Process "align" and "replace" options
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	194 idx = strcmpi (varargin, "align");
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	195 if (any (idx))
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	196 align_axes = true;
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	197 varargin(idx) = [];
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	198 endif
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	199
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	200 idx = strcmpi (varargin, "replace");
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	201 if (any (idx))
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	202 replace_axes = true;
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	203 varargin(idx) = [];
9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	204 endif
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	205
12470 64ae43e0e1c0 subplot.m: Use new looseinset property introduced by changeset 12467. Ben Abbott <bpabbott@mac.com> parents: 12455 diff changeset	206 axesunits = get (0, "defaultaxesunits");
12455 7b67bbf9dbbb subplot.m: Decrease spacing between subplots rows / columns. Ben Abbott <bpabbott@mac.com> parents: 12132 diff changeset	207 cf = gcf ();
12470 64ae43e0e1c0 subplot.m: Use new looseinset property introduced by changeset 12467. Ben Abbott <bpabbott@mac.com> parents: 12455 diff changeset	208 figureunits = get (cf, "units");
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	209 unwind_protect
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	210 set (0, "defaultaxesunits", "normalized");
12455 7b67bbf9dbbb subplot.m: Decrease spacing between subplots rows / columns. Ben Abbott <bpabbott@mac.com> parents: 12132 diff changeset	211 set (cf, "units", "pixels");
12685 5cbf660e649d Restructure subplot positioning and avoid labels overlap (bug #31610) Konstantinos Poulios <logari81@googlemail.com> parents: 12575 diff changeset	212
5cbf660e649d Restructure subplot positioning and avoid labels overlap (bug #31610) Konstantinos Poulios <logari81@googlemail.com> parents: 12575 diff changeset	213 ## FIXME: At the moment we force gnuplot to use the aligned mode
5cbf660e649d Restructure subplot positioning and avoid labels overlap (bug #31610) Konstantinos Poulios <logari81@googlemail.com> parents: 12575 diff changeset	214 ## which will set "activepositionproperty" to "position".
17860 93edd282a2bc subplot.m: Matlab compatibility when "position" given (bug #40480). Rik <rik@octave.org> parents: 17744 diff changeset	215 ## This can yield to text overlap between labels and titles.
93edd282a2bc subplot.m: Matlab compatibility when "position" given (bug #40480). Rik <rik@octave.org> parents: 17744 diff changeset	216 ## See bug #31610.
12685 5cbf660e649d Restructure subplot positioning and avoid labels overlap (bug #31610) Konstantinos Poulios <logari81@googlemail.com> parents: 12575 diff changeset	217 if (strcmp (get (cf, "__graphics_toolkit__"), "gnuplot"))
5cbf660e649d Restructure subplot positioning and avoid labels overlap (bug #31610) Konstantinos Poulios <logari81@googlemail.com> parents: 12575 diff changeset	218 align_axes = true;
5cbf660e649d Restructure subplot positioning and avoid labels overlap (bug #31610) Konstantinos Poulios <logari81@googlemail.com> parents: 12575 diff changeset	219 endif
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	220
9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	221 if (! have_position)
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	222 ## Subplots that cover more that one base subplot are not updated
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	223 align_axes = (align_axes \|\| (! isscalar (index)));
17860 93edd282a2bc subplot.m: Matlab compatibility when "position" given (bug #40480). Rik <rik@octave.org> parents: 17744 diff changeset	224 ## Normal case where subplot indices have been given
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	225 [pos, opos, li] = subplot_position (cf, rows, cols, index);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	226 else
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	227 ## Position is specified by the user.
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	228 li = zeros (1,4);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	229 align_axes = true;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	230 endif
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	231
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	232 set (cf, "nextplot", "add");
17860 93edd282a2bc subplot.m: Matlab compatibility when "position" given (bug #40480). Rik <rik@octave.org> parents: 17744 diff changeset	233
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	234 if (! make_subplot)
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	235 found = false;
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	236 kids = get (cf, "children");
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	237 for child = kids(:)'
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	238 ## Check whether this child is still valid; this might not be the
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	239 ## case anymore due to the deletion of previous children (due to
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	240 ## "deletefcn" callback or for legends/colorbars that are deleted
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	241 ## with their corresponding axes).
24423 1d52db450db4 Change ishandle to return true for Java objects for Matlab compatibility. Rik <rik@octave.org> parents: 24188 diff changeset	242 if (! ishghandle (child))
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	243 continue;
4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	244 endif
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	245 if (strcmp (get (child, "type"), "axes"))
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	246 ## Skip legend and colorbar objects.
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	247 if (any (strcmp (get (child, "tag"), {"legend", "colorbar"})))
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	248 continue;
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	249 endif
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	250
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	251 if (isappdata (child, "__subplotposition__"))
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	252 objpos = getappdata (child, "__subplotposition__");
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	253 else
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	254 objpos = get (child, "position");
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	255 endif
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	256 if (all (abs (objpos - pos) < eps) && ! replace_axes)
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	257 ## If the new axes are in exactly the same position
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	258 ## as an existing axes object, or if they share the same
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	259 ## appdata "__subplotposition__", use the existing axes.
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	260 found = true;
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	261 hsubplot = child;
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	262 else
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	263 ## If the new axes overlap an old axes object, delete the old axes.
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	264 objpos = get (child, "position");
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	265
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	266 x0 = pos(1);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	267 x1 = x0 + pos(3);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	268 y0 = pos(2);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	269 y1 = y0 + pos(4);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	270 objx0 = objpos(1);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	271 objx1 = objx0 + objpos(3);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	272 objy0 = objpos(2);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	273 objy1 = objy0 + objpos(4);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	274 if (! (x0 >= objx1 \|\| x1 <= objx0 \|\| y0 >= objy1 \|\| y1 <= objy0))
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	275 delete (child);
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	276 endif
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 9211 diff changeset	277 endif
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	278 endif
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	279 endfor
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	280 else
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	281 found = true;
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	282 endif
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	283
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	284 if (found && ! make_subplot)
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	285 ## Switch to existing subplot and set requested properties
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	286 set (cf, "currentaxes", hsubplot);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	287 if (! isempty (varargin))
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	288 set (hsubplot, varargin{:});
17860 93edd282a2bc subplot.m: Matlab compatibility when "position" given (bug #40480). Rik <rik@octave.org> parents: 17744 diff changeset	289 endif
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	290 else
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	291 pval = [{"activepositionproperty", "position", ...
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	292 "position", pos, "looseinset", li} varargin];
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	293 if (! make_subplot)
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	294 hsubplot = axes (pval{:});
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	295 else
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	296 set (hsubplot, pval{:})
174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	297 endif
17860 93edd282a2bc subplot.m: Matlab compatibility when "position" given (bug #40480). Rik <rik@octave.org> parents: 17744 diff changeset	298
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	299 if (! align_axes)
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	300 ## base position (no ticks, no annotation, no cumbersome neighbor)
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	301 setappdata (hsubplot, "__subplotposition__", pos);
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	302 ## max outerposition
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	303 setappdata (hsubplot, "__subplotouterposition__", opos);
23930 174b6afa7e7f Fix regression in subplot alignment (bugs #51717 and #51731) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23220 diff changeset	304 setappdata (hsubplot, "__subplotrcn__", {rows, cols, index});
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	305 addlistener (hsubplot, "outerposition", @subplot_align);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	306 addlistener (hsubplot, "xaxislocation", @subplot_align);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	307 addlistener (hsubplot, "yaxislocation", @subplot_align);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	308 addlistener (hsubplot, "position", {@subplot_align, true});
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	309 subplot_align (hsubplot);
17860 93edd282a2bc subplot.m: Matlab compatibility when "position" given (bug #40480). Rik <rik@octave.org> parents: 17744 diff changeset	310 endif
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	311
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	312 endif
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	313 unwind_protect_cleanup
12470 64ae43e0e1c0 subplot.m: Use new looseinset property introduced by changeset 12467. Ben Abbott <bpabbott@mac.com> parents: 12455 diff changeset	314 set (0, "defaultaxesunits", axesunits);
64ae43e0e1c0 subplot.m: Use new looseinset property introduced by changeset 12467. Ben Abbott <bpabbott@mac.com> parents: 12455 diff changeset	315 set (cf, "units", figureunits);
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	316 end_unwind_protect
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	317
6257 44c91c5dfe1d [project @ 2007-01-30 19:16:52 by jwe] jwe parents: 6178 diff changeset	318 if (nargout > 0)
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	319 h = hsubplot;
1540 749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	320 endif
749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	321
749b8b19733f [project @ 1995-10-06 03:10:34 by jwe] jwe parents: diff changeset	322 endfunction
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	323
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	324 function [pos, opos, li] = subplot_position (hf, nrows, ncols, idx)
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	325
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	326 if (nrows == 1 && ncols == 1)
12455 7b67bbf9dbbb subplot.m: Decrease spacing between subplots rows / columns. Ben Abbott <bpabbott@mac.com> parents: 12132 diff changeset	327 ## Trivial result for subplot (1,1,1)
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	328 pos = get (0, "defaultaxesposition");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	329 opos = get (0, "defaultaxesouterposition");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	330 li = get (0, "defaultaxeslooseinset");
17312 088d014a7fe2 Use semicolon after "return" statement in core m-files. Rik <rik@octave.org> parents: 17303 diff changeset	331 return;
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	332 endif
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	333
9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	334 ## Row/Column inside the axes array
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	335 row = ceil (idx / ncols);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	336 col = idx .- (row - 1) * ncols;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	337 row = [min(row) max(row)];
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	338 col = [min(col) max(col)];
9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	339
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	340 ## Minimal margins around subplots defined in points
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	341 fig_units = get (hf, "units");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	342 set (hf, "units", "points");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	343 pts_size = get (gcf, "position")(3:4);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	344 xbasemargin = 6 / pts_size(1);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	345 ybasemargin = 6 / pts_size(2);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	346
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	347 ## Column/row separation
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	348 margin.column = .2 / ncols + 2 * xbasemargin;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	349 margin.row = .2 / nrows + 2 * ybasemargin;
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	350
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	351 set (hf, "units", fig_units);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	352 margin.left = xbasemargin;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	353 margin.right = xbasemargin;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	354 margin.bottom = ybasemargin;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	355 margin.top = ybasemargin;
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	356
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	357 ## Boundary axes have default margins
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	358 borders = get (0, "defaultaxesposition");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	359 if (col(1) == 1)
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	360 margin.left = borders(1);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	361 else
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	362 margin.left = margin.column - margin.right;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	363 endif
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	364 if (col(2) == ncols)
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	365 margin.right = 1 - borders(1) - borders(3);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	366 endif
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	367
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	368
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	369 if (row(2) == nrows)
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	370 margin.bottom = borders(2);
12685 5cbf660e649d Restructure subplot positioning and avoid labels overlap (bug #31610) Konstantinos Poulios <logari81@googlemail.com> parents: 12575 diff changeset	371 else
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	372 margin.bottom = margin.row - margin.top;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	373 endif
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	374 if (row(1) == 1)
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	375 margin.top = 1 - borders(2) - borders(4);
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	376 endif
4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	377
4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	378
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	379 ## Compute base width and height
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	380 width = (borders(3) - (ncols - 1) * margin.column) / ncols;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	381 height = (borders(4) - (nrows - 1) * margin.row) /nrows;
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	382
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	383 ## Position, outerposition and looseinset
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	384 x0 = borders(1) + (col(1) - 1) * (width + margin.column);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	385 y0 = borders(2) + (nrows - row(2)) * (height + margin.row);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	386 width += diff (col) * (width + margin.column);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	387 height += diff (row) * (height + margin.row);
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	388
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	389 pos = [x0 y0 width height];
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	390 opos = [(x0 - margin.left), (y0 - margin.bottom), ...
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	391 (width + margin.left + margin.right), ...
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	392 (height + margin.bottom + margin.top)];
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	393 li = [margin.left, margin.bottom, margin.right, margin.top];
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	394
4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	395 endfunction
4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	396
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	397 function subplot_align (h, d, rmupdate = false)
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	398 persistent updating = false;
21758 ffad2baa90f7 maint: Use newlines to make code more readable. Rik <rik@octave.org> parents: 21751 diff changeset	399
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	400 if (! updating)
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	401 if (rmupdate)
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	402 ## The "position" property has been changed from outside this routine.
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	403 ## Don't update anymore.
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	404 if (isappdata (h, "__subplotposition__"))
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	405 rmappdata (h, "__subplotposition__");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	406 rmappdata (h, "__subplotouterposition__");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	407 endif
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	408 return
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	409 endif
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	410
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	411 unwind_protect
942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	412 updating = true;
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	413 hf = ancestor (h, "figure");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	414 children = get (hf, "children");
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	415
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	416 ## Base position of the subplot
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	417 pos = getappdata (children, "__subplotposition__");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	418
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	419 if (iscell (pos))
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	420 do_align = ! cellfun (@isempty, pos);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	421 pos = cell2mat (pos(do_align));
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	422 else
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	423 return
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	424 endif
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	425 hsubplots = children(do_align);
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	426
9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	427
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	428 ## There may be mixed subplot series (e.g., 2-by-6 and 1-by-6) in
b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21580 diff changeset	429 ## the same figure. Only subplots that have the same width and
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	430 ## height as this one are updated.
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	431 if (any (h == hsubplots))
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	432 width = pos(h == hsubplots, 3);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	433 height = pos(h == hsubplots, 4);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	434 do_align = (pos(:,3) == width) & (pos(:,4) == height);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	435 hsubplots(! do_align) = [];
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	436 pos(! do_align,:) = [];
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	437 else
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	438 return
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	439 endif
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	440
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	441 ## Reset outerpositions to their default value
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	442 opos = getappdata (hsubplots, "__subplotouterposition__");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	443 if (iscell (opos))
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	444 opos = cell2mat (opos);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	445 endif
26268 6dd232798997 maint: Remove useless ';' from end of for, if, while, etc. statements. Rik <rik@octave.org> parents: 25054 diff changeset	446 for ii = 1:numel (hsubplots)
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	447 set (hsubplots(ii), "outerposition", opos(ii,:), ...
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	448 "activepositionproperty", "position");
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	449 endfor
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	450
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	451 ## Compare current positions to default and compute the new ones
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	452 curpos = get (hsubplots, "position");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	453 if (iscell (curpos))
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	454 curpos = cell2mat (curpos);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	455 endif
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	456 dx0 = max (curpos(:,1) - pos(:,1));
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	457 dx0(dx0<0) = 0;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	458 dx1 = max ((pos(:,1) + pos(:,3)) - (curpos(:,1) + curpos(:,3)));
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	459 dx1(dx1<0) = 0;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	460 dy0 = max (curpos(:,2) - pos(:,2));
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	461 dy0(dy0<0) = 0;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	462 dy1 = max ((pos(:,2) + pos(:,4)) - (curpos(:,2) + curpos(:,4)));
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	463 dy1(dy1<0) = 0;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	464
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	465 pos(:,1) += dx0;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	466 pos(:,2) += dy0;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	467 pos(:,3) -= dx0 + dx1;
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	468 pos(:,4) -= dy0 + dy1;
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	469
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	470 for ii = 1:numel (hsubplots)
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	471 set (hsubplots(ii), "position", pos(ii,:));
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	472 endfor
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	473
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	474 unwind_protect_cleanup
942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	475 updating = false;
942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	476 end_unwind_protect
942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	477 endif
17428 9304514b566c subplot.m: Don't clear axes when switching to existing subplot (most of a fix for bug #39874). Rik <rik@octave.org> parents: 17338 diff changeset	478
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	479 endfunction
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14335 diff changeset	480
17338 1c89599167a6 maint: End m-files with 1 blank line. Rik <rik@octave.org> parents: 17312 diff changeset	481
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	482 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	483 %! clf;
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	484 %! r = 3;
4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	485 %! c = 3;
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	486 %! fmt = {"horizontalalignment", "center", "verticalalignment", "middle"};
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	487 %! for n = 1 : r*c
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	488 %! subplot (r, c, n);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	489 %! xlabel (sprintf ("xlabel #%d", n));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	490 %! ylabel (sprintf ("ylabel #%d", n));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	491 %! title (sprintf ("title #%d", n));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	492 %! text (0.5, 0.5, sprintf ("subplot(%d,%d,%d)", r, c, n), fmt{:});
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	493 %! axis ([0 1 0 1]);
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	494 %! endfor
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	495 %! subplot (r, c, 1:3);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	496 %! xlabel (sprintf ("xlabel #%d:%d", 1, 3));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	497 %! ylabel (sprintf ("ylabel #%d:%d", 1, 3));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	498 %! title (sprintf ("title #%d:%d", 1, 3));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	499 %! text (0.5, 0.5, sprintf ("subplot(%d,%d,%d:%d)", r, c, 1, 3), fmt{:});
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	500 %! axis ([0 1 0 1]);
8744 4142982c66c6 subplot.m: Compatible placement of subplots. Ben Abbott <bpabbott@mac.com> parents: 8517 diff changeset	501
11305 c9df571efe95 subplot.m: Add suppport for "align" and "replace" options. Ben Abbott <bpabbott@mac.com> parents: 11149 diff changeset	502 %!demo
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	503 %! clf;
11305 c9df571efe95 subplot.m: Add suppport for "align" and "replace" options. Ben Abbott <bpabbott@mac.com> parents: 11149 diff changeset	504 %! x = 0:1;
c9df571efe95 subplot.m: Add suppport for "align" and "replace" options. Ben Abbott <bpabbott@mac.com> parents: 11149 diff changeset	505 %! for n = 1:4
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	506 %! subplot (2,2,n, "align");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	507 %! plot (x, x);
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	508 %! xlabel (sprintf ("xlabel (2,2,%d)", n));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	509 %! ylabel (sprintf ("ylabel (2,2,%d)", n));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	510 %! title (sprintf ("title (2,2,%d)", n));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	511 %! endfor
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	512 %! subplot (1,2,1, "align");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	513 %! plot (x, x);
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	514 %! xlabel ("xlabel (1,2,1)");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	515 %! ylabel ("ylabel (1,2,1)");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	516 %! title ("title (1,2,1)");
11305 c9df571efe95 subplot.m: Add suppport for "align" and "replace" options. Ben Abbott <bpabbott@mac.com> parents: 11149 diff changeset	517
16975 47cc8e3d9183 Add demo to subplot. Ben Abbott <bpabbott@mac.com> parents: 15512 diff changeset	518 %!demo
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	519 %! clf;
16975 47cc8e3d9183 Add demo to subplot. Ben Abbott <bpabbott@mac.com> parents: 15512 diff changeset	520 %! x = 0:10;
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	521 %! ax(1) = subplot (221);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	522 %! set (ax(1), "tag", "1");
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 20852 diff changeset	523 %! plot (x, rand (3, 11));
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	524 %! title ("x & y labels & ticklabels");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	525 %! xlabel xlabel;
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	526 %! ylabel ylabel;
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	527 %! ax(2) = subplot (222);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	528 %! set (ax(2), "tag", "2");
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 20852 diff changeset	529 %! plot (x, rand (3, 11));
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	530 %! title ("no labels");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	531 %! axis ("nolabel","tic");
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	532 %! ax(3) = subplot (223);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	533 %! set (ax(3), "tag", "3");
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 20852 diff changeset	534 %! plot (x, rand (3, 11));
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	535 %! title ("no labels");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	536 %! axis ("nolabel","tic");
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	537 %! ax(4) = subplot (224);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	538 %! set (ax(4), "tag", "4");
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 20852 diff changeset	539 %! plot (x, rand (3, 11));
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	540 %! title ("x & y labels & ticklabels");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	541 %! xlabel xlabel;
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	542 %! ylabel ylabel;
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	543
942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	544 %!demo
24188 1253132e2173 Use "clf;" at beginning of all plot demos. Rik <rik@octave.org> parents: 23930 diff changeset	545 %! clf;
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	546 %! x = 0:10;
942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	547 %! subplot (221);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	548 %! plot (x, rand (3, 11));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	549 %! ylim ([0, 1]);
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	550 %! text (0.5, 0.5, "{x,y}labels & {x,y}ticklabels", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	551 %! "horizontalalignment", "center", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	552 %! "units", "normalized");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	553 %! xlabel xlabel;
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	554 %! ylabel ylabel;
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	555 %! title title;
16975 47cc8e3d9183 Add demo to subplot. Ben Abbott <bpabbott@mac.com> parents: 15512 diff changeset	556 %! subplot (222);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	557 %! plot (x, rand (3, 11));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	558 %! axis ("labely");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	559 %! ylabel ylabel;
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	560 %! text (0.5, 0.5, "no xlabels, xticklabels", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	561 %! "horizontalalignment", "center", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	562 %! "units", "normalized");
16975 47cc8e3d9183 Add demo to subplot. Ben Abbott <bpabbott@mac.com> parents: 15512 diff changeset	563 %! subplot (223);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	564 %! plot (x, rand (3, 11));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	565 %! axis ("labelx");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	566 %! text (0.5, 0.5, "no ylabels, yticklabels", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	567 %! "horizontalalignment", "center", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	568 %! "units", "normalized");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	569 %! xlabel xlabel;
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	570 %! title title;
16975 47cc8e3d9183 Add demo to subplot. Ben Abbott <bpabbott@mac.com> parents: 15512 diff changeset	571 %! subplot (224);
22302 1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	572 %! plot (x, rand (3, 11));
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	573 %! axis ("nolabel", "tic");
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	574 %! text (0.5, 0.5, "no {x,y}labels, {x,y}ticklabels", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	575 %! "horizontalalignment", "center", ...
1c4cd12987f5 Use Octave syntax in graphics demos. Rik <rik@octave.org> parents: 22173 diff changeset	576 %! "units", "normalized");
17012 942d892524b3 Handle alignment of subplots in subplot.m. Ben Abbott <bpabbott@mac.com> parents: 16975 diff changeset	577
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	578 ## Test recognition/deletion of previous axes
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	579 ## Default mode
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	580 %!test
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	581 %! hf = figure ("visible", "off");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	582 %! unwind_protect
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	583 %! for ii = 1:9
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	584 %! hax(ii) = subplot (3,3,ii);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	585 %! endfor
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	586 %! subplot (3,3,1);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	587 %! assert (gca (), hax(1));
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	588 %! subplot (2,1,1);
24423 1d52db450db4 Change ishandle to return true for Java objects for Matlab compatibility. Rik <rik@octave.org> parents: 24188 diff changeset	589 %! assert (ishghandle (hax),[false(1,6), true(1,3)]);
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	590 %! unwind_protect_cleanup
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	591 %! delete (hf);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	592 %! end_unwind_protect
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	593
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	594 ## Position mode
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	595 %!test
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	596 %! hf = figure ("visible", "off");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	597 %! unwind_protect
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	598 %! h1 = subplot ("position", [0.1 0.1 0.3 0.3]);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	599 %! h2 = subplot ("position", [0.5 0.5 0.3 0.3]);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	600 %! subplot ("position", [0.1 0.1 0.3 0.3]);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	601 %! assert (gca (), h1);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	602 %! subplot ("position", [0.5 0.5 0.3 0.3]);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	603 %! assert (gca (), h2);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	604 %! subplot ("position", [0.5 0.5 0.3 0.2]);
24423 1d52db450db4 Change ishandle to return true for Java objects for Matlab compatibility. Rik <rik@octave.org> parents: 24188 diff changeset	605 %! assert (! ishghandle (h2));
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	606 %! unwind_protect_cleanup
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	607 %! delete (hf);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	608 %! end_unwind_protect
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	609
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	610 ## Align mode
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	611 %!test
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	612 %! hf = figure ("visible", "off");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	613 %! unwind_protect
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	614 %! h1 = subplot (3,5,1, "align");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	615 %! h2 = subplot (3,5,2, "align");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	616 %! subplot (3,5,1, "align");
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	617 %! assert (gca (), h1);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	618 %! subplot (3,2,1, "align");
24423 1d52db450db4 Change ishandle to return true for Java objects for Matlab compatibility. Rik <rik@octave.org> parents: 24188 diff changeset	619 %! assert (! ishghandle (h1));
1d52db450db4 Change ishandle to return true for Java objects for Matlab compatibility. Rik <rik@octave.org> parents: 24188 diff changeset	620 %! assert (! ishghandle (h2));
19687 8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	621 %! unwind_protect_cleanup
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	622 %! delete (hf);
8064b5cdbc11 subplot.m: fix deletion of previous subplots (bug #41128) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 19593 diff changeset	623 %! end_unwind_protect

Mercurial > octave

annotate scripts/plot/util/subplot.m @ 28177:bc829338e353 stable