Mercurial > octave
annotate scripts/plot/util/subplot.m @ 29359:7854d5752dd2
maint: merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 10 Feb 2021 10:10:40 -0500 |
parents | dc0e0e71933f 0a5b15007766 |
children | d3a02b27fa6a |
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 ## |
29358
0a5b15007766
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
29004
diff
changeset
|
3 ## Copyright (C) 1995-2021 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 | 7 ## |
8 ## This file is part of Octave. | |
9 ## | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24432
diff
changeset
|
10 ## Octave is free software: you can redistribute it and/or modify it |
2313 | 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 | 14 ## |
15 ## Octave is distributed in the hope that it will be useful, but | |
16 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
17 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
18 ## GNU General Public License for more details. |
2313 | 19 ## |
20 ## You should have received a copy of the GNU General Public License | |
7016 | 21 ## along with Octave; see the file COPYING. If not, see |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24432
diff
changeset
|
22 ## <https://www.gnu.org/licenses/>. |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 ## |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 ######################################################################## |
1540 | 25 |
3368 | 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 | 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 | 48 ## and then the next row is filled. |
3426 | 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 | 51 ## @tex |
52 ## \vskip 10pt | |
53 ## \hfil\vbox{\offinterlineskip\hrule | |
54 ## \halign{\vrule#&&\qquad\hfil#\hfil\qquad\vrule\cr | |
7107 | 55 ## height13pt&1&2&3\cr height12pt&&&\cr\noalign{\hrule} |
56 ## height13pt&4&5&6\cr height12pt&&&\cr\noalign{\hrule}}} | |
3368 | 57 ## \hfil |
58 ## \vskip 10pt | |
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 | 63 ## @group |
7040 | 64 ## +-----+-----+-----+ |
65 ## | 1 | 2 | 3 | | |
66 ## +-----+-----+-----+ | |
67 ## | 4 | 5 | 6 | | |
68 ## +-----+-----+-----+ | |
8350
0e3a92a8683c
fix texi bug in subplot.m
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
8232
diff
changeset
|
69 ## @end group |
6257 | 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. |
28733
9342688e86b4
Updated property references for text and graphics functions (bug #50247)
Nicholas R. Jankowski <jankowskin@asme.org>
parents:
28177
diff
changeset
|
97 ## The full list of properties is documented at @ref{Axes Properties}. |
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
|
98 ## |
28177
bc829338e353
doc: Clarify behavior of "subplot".
Markus Mützel <markus.muetzel@gmx.de>
parents:
27985
diff
changeset
|
99 ## 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
|
100 ## created axes are deleted. |
bc829338e353
doc: Clarify behavior of "subplot".
Markus Mützel <markus.muetzel@gmx.de>
parents:
27985
diff
changeset
|
101 ## |
24431
0c6cedafc71e
doc: Use 'axes' rather than 'axis' appropriately in docstrings.
Rik <rik@octave.org>
parents:
23219
diff
changeset
|
102 ## 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
|
103 ## 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
|
104 ## using @code{set}. |
29004
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
105 ## |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
106 ## Under some circumstances, @code{subplot} might not be able to identify axes |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
107 ## that it could re-use and might replace them. If @code{subplot} axes |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
108 ## should be referenced repeatedly, consider creating and storing their axes |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
109 ## handles beforehand instead of calling @code{subplot} repeatedly for the same |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
110 ## position. |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
111 ## |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
112 ## Example: |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
113 ## @example |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
114 ## @group |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
115 ## x = 1:10; |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
116 ## y = rand (16, 10); |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
117 ## for i_plot = 1:4 |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
118 ## hax(i_plot) = subplot (2, 2, i_plot); |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
119 ## hold (hax(i_plot), "on"); |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
120 ## grid (hax(i_plot), "on"); |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
121 ## endfor |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
122 ## for i_loop = 1:2 |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
123 ## for i_plot = 1:4 |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
124 ## iy = (i_loop - 1)*4 + i_plot; |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
125 ## plotyy (hax(i_plot), x,y(iy,:), x,y(iy+1,:)); |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
126 ## endfor |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
127 ## endfor |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
128 ## @end group |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
129 ## @end example |
e44e3c2b7eea
doc: Improve documentation for subplot in conjunction with plotyy (bug #58566).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28786
diff
changeset
|
130 ## |
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
|
131 ## @seealso{axes, plot, gca, set} |
3368 | 132 ## @end deftypefn |
1540 | 133 |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
134 function h = subplot (varargin) |
11305
c9df571efe95
subplot.m: Add suppport for "align" and "replace" options.
Ben Abbott <bpabbott@mac.com>
parents:
11149
diff
changeset
|
135 |
c9df571efe95
subplot.m: Add suppport for "align" and "replace" options.
Ben Abbott <bpabbott@mac.com>
parents:
11149
diff
changeset
|
136 align_axes = false; |
c9df571efe95
subplot.m: Add suppport for "align" and "replace" options.
Ben Abbott <bpabbott@mac.com>
parents:
11149
diff
changeset
|
137 replace_axes = false; |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
138 have_position = false; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
139 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
|
140 make_subplot = false; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
141 hsubplot = []; |
6163 | 142 |
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
|
143 if (nargin >= 3) |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
144 ## R, C, N? |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
145 arg1 = varargin{1}; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
146 arg2 = varargin{2}; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
147 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
|
148 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
|
149 && 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
|
150 && isnumeric (arg3)) |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
151 rows = arg1; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
152 cols = arg2; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
153 index = arg3; |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
154 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
|
155 make_subplot = true; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
156 hsubplot = varargin{4}; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
157 varargin(1:4) = []; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
158 else |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
159 varargin(1:3) = []; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
160 endif |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
161 initial_args_decoded = true; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
162 endif |
1540 | 163 endif |
164 | |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
165 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
|
166 ## check for "position", pos, ... |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
167 if (strcmpi (varargin{1}, "position")) |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
168 arg = varargin{2}; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
169 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
|
170 pos = arg; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
171 varargin(1:2) = []; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
172 have_position = true; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
173 initial_args_decoded = true; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
174 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
|
175 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
|
176 endif |
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 endif |
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17860
diff
changeset
|
179 |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
180 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
|
181 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
|
182 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
|
183 ## Axes handle |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
184 axes (arg); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
185 cf = get (0, "currentfigure"); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
186 set (cf, "nextplot", "add"); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
187 return; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
188 elseif (isscalar (arg) && arg >= 0) |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
189 ## RCN? |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
190 index = rem (arg, 10); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
191 arg = (arg - index) / 10; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
192 cols = rem (arg, 10); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
193 arg = (arg - cols) / 10; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
194 rows = rem (arg, 10); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
195 varargin(1) = []; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
196 initial_args_decoded = true; |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
197 else |
20711
7b608fadc663
Make error messages more specific about the variable and problem encountered.
Rik <rik@octave.org>
parents:
20173
diff
changeset
|
198 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
|
199 endif |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
200 endif |
1540 | 201 |
13794
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
202 if (! initial_args_decoded) |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
203 print_usage (); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
204 endif |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
205 |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
206 if (! have_position) |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
207 cols = round (cols); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
208 rows = round (rows); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
209 index = round (index); |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
210 |
5b395217ccb9
improve argument parsing for subplot, handle 'position' argument
John W. Eaton <jwe@octave.org>
parents:
12685
diff
changeset
|
211 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
|
212 error ("subplot: INDEX value must be >= 1 and <= ROWS*COLS"); |
1540 | 213 endif |
214 | |
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
|
215 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
|
216 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
|
217 endif |
1540 | 218 endif |
219 | |
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
|
220 ## 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
|
221 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
|
222 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
|
223 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
|
224 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
|
225 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
|
226 |
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
|
227 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
|
228 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
|
229 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
|
230 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
|
231 endif |
1540 | 232 |
12470
64ae43e0e1c0
subplot.m: Use new looseinset property introduced by changeset 12467.
Ben Abbott <bpabbott@mac.com>
parents:
12455
diff
changeset
|
233 axesunits = get (0, "defaultaxesunits"); |
12455
7b67bbf9dbbb
subplot.m: Decrease spacing between subplots rows / columns.
Ben Abbott <bpabbott@mac.com>
parents:
12132
diff
changeset
|
234 cf = gcf (); |
12470
64ae43e0e1c0
subplot.m: Use new looseinset property introduced by changeset 12467.
Ben Abbott <bpabbott@mac.com>
parents:
12455
diff
changeset
|
235 figureunits = get (cf, "units"); |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
236 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
|
237 set (0, "defaultaxesunits", "normalized"); |
12455
7b67bbf9dbbb
subplot.m: Decrease spacing between subplots rows / columns.
Ben Abbott <bpabbott@mac.com>
parents:
12132
diff
changeset
|
238 set (cf, "units", "pixels"); |
12685
5cbf660e649d
Restructure subplot positioning and avoid labels overlap (bug #31610)
Konstantinos Poulios <logari81@googlemail.com>
parents:
12575
diff
changeset
|
239 |
5cbf660e649d
Restructure subplot positioning and avoid labels overlap (bug #31610)
Konstantinos Poulios <logari81@googlemail.com>
parents:
12575
diff
changeset
|
240 ## FIXME: At the moment we force gnuplot to use the aligned mode |
28310
1379ebcb00c3
Replace uses of axes property "activepositionproperty" by "positionconstraint" (bug #58336).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28177
diff
changeset
|
241 ## which will set "positionconstraint" to "innerposition". |
17860
93edd282a2bc
subplot.m: Matlab compatibility when "position" given (bug #40480).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
242 ## 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
|
243 ## See bug #31610. |
12685
5cbf660e649d
Restructure subplot positioning and avoid labels overlap (bug #31610)
Konstantinos Poulios <logari81@googlemail.com>
parents:
12575
diff
changeset
|
244 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
|
245 align_axes = true; |
5cbf660e649d
Restructure subplot positioning and avoid labels overlap (bug #31610)
Konstantinos Poulios <logari81@googlemail.com>
parents:
12575
diff
changeset
|
246 endif |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
247 |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
248 if (! have_position) |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
249 ## 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
|
250 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
|
251 ## 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
|
252 [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
|
253 else |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
254 ## 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
|
255 li = zeros (1,4); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
256 align_axes = true; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
257 endif |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
258 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
259 set (cf, "nextplot", "add"); |
17860
93edd282a2bc
subplot.m: Matlab compatibility when "position" given (bug #40480).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
260 |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
261 if (! make_subplot) |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
262 found = false; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
263 kids = get (cf, "children"); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
264 for child = kids(:)' |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
265 ## 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
|
266 ## 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
|
267 ## "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
|
268 ## 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
|
269 if (! ishghandle (child)) |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
270 continue; |
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
271 endif |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
272 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
|
273 ## 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
|
274 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
|
275 continue; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
276 endif |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
277 |
28786
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
278 if (! replace_axes) |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
279 if (isappdata (child, "__subplotposition__")) |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
280 objpos = getappdata (child, "__subplotposition__"); |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
281 else |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
282 objpos = get (child, "position"); |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
283 endif |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
284 if (all (abs (objpos - pos) < eps)) |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
285 ## If the new axes are in exactly the same position |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
286 ## as an existing axes object, or if they share the same |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
287 ## appdata "__subplotposition__", use the existing axes. |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
288 found = true; |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
289 hsubplot = child; |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
290 else |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
291 ## Check if this axes is a subplot with the same layout and |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
292 ## index as the requested one |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
293 rcn = getappdata (child, "__subplotrcn__"); |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
294 if (all (size (rcn) == [1 3]) |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
295 && rcn{1} == rows && rcn{2} == cols && all (rcn{3} == index)) |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
296 found = true; |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
297 hsubplot = child; |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
298 endif |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
299 endif |
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
300 endif |
28784
9d7f90354b4f
subplot.m: Use layout and index to search existing axes (bug #59076)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
28733
diff
changeset
|
301 |
28786
396d3e1df78b
subplot.m: Use position and layout info to identify existing axes (bug #59076).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28784
diff
changeset
|
302 if (! found) |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
303 ## 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
|
304 objpos = get (child, "position"); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
305 |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
306 x0 = pos(1); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
307 x1 = x0 + pos(3); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
308 y0 = pos(2); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
309 y1 = y0 + pos(4); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
310 objx0 = objpos(1); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
311 objx1 = objx0 + objpos(3); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
312 objy0 = objpos(2); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
313 objy1 = objy0 + objpos(4); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
314 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
|
315 delete (child); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
316 endif |
10549 | 317 endif |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
318 endif |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
319 endfor |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
320 else |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
321 found = true; |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
322 endif |
1540 | 323 |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
324 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
|
325 ## 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
|
326 set (cf, "currentaxes", hsubplot); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
327 if (! isempty (varargin)) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
328 set (hsubplot, varargin{:}); |
17860
93edd282a2bc
subplot.m: Matlab compatibility when "position" given (bug #40480).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
329 endif |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
330 else |
28310
1379ebcb00c3
Replace uses of axes property "activepositionproperty" by "positionconstraint" (bug #58336).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28177
diff
changeset
|
331 pval = [{"positionconstraint", "innerposition", ... |
23930
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
332 "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
|
333 if (! make_subplot) |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
334 hsubplot = axes (pval{:}); |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
335 else |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
336 set (hsubplot, pval{:}) |
174b6afa7e7f
Fix regression in subplot alignment (bugs #51717 and #51731)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
23220
diff
changeset
|
337 endif |
17860
93edd282a2bc
subplot.m: Matlab compatibility when "position" given (bug #40480).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
338 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
339 if (! align_axes) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
340 ## 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
|
341 setappdata (hsubplot, "__subplotposition__", pos); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
342 ## max outerposition |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
343 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
|
344 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
|
345 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
|
346 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
|
347 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
|
348 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
|
349 subplot_align (hsubplot); |
17860
93edd282a2bc
subplot.m: Matlab compatibility when "position" given (bug #40480).
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
350 endif |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
351 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
352 endif |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
353 unwind_protect_cleanup |
12470
64ae43e0e1c0
subplot.m: Use new looseinset property introduced by changeset 12467.
Ben Abbott <bpabbott@mac.com>
parents:
12455
diff
changeset
|
354 set (0, "defaultaxesunits", axesunits); |
64ae43e0e1c0
subplot.m: Use new looseinset property introduced by changeset 12467.
Ben Abbott <bpabbott@mac.com>
parents:
12455
diff
changeset
|
355 set (cf, "units", figureunits); |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
356 end_unwind_protect |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
357 |
6257 | 358 if (nargout > 0) |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
359 h = hsubplot; |
1540 | 360 endif |
361 | |
362 endfunction | |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
363 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
364 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
|
365 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
366 if (nrows == 1 && ncols == 1) |
12455
7b67bbf9dbbb
subplot.m: Decrease spacing between subplots rows / columns.
Ben Abbott <bpabbott@mac.com>
parents:
12132
diff
changeset
|
367 ## 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
|
368 pos = get (0, "defaultaxesposition"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
369 opos = get (0, "defaultaxesouterposition"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
370 li = get (0, "defaultaxeslooseinset"); |
17312
088d014a7fe2
Use semicolon after "return" statement in core m-files.
Rik <rik@octave.org>
parents:
17303
diff
changeset
|
371 return; |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
372 endif |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
373 |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
374 ## 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
|
375 row = ceil (idx / ncols); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
376 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
|
377 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
|
378 col = [min(col) max(col)]; |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
379 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
380 ## 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
|
381 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
|
382 set (hf, "units", "points"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
383 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
|
384 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
|
385 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
|
386 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
387 ## Column/row separation |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
388 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
|
389 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
|
390 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
391 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
|
392 margin.left = xbasemargin; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
393 margin.right = xbasemargin; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
394 margin.bottom = ybasemargin; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
395 margin.top = ybasemargin; |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
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 ## 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
|
398 borders = get (0, "defaultaxesposition"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
399 if (col(1) == 1) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
400 margin.left = borders(1); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
401 else |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
402 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
|
403 endif |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
404 if (col(2) == ncols) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
405 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
|
406 endif |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
407 |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
408 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
409 if (row(2) == nrows) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
410 margin.bottom = borders(2); |
12685
5cbf660e649d
Restructure subplot positioning and avoid labels overlap (bug #31610)
Konstantinos Poulios <logari81@googlemail.com>
parents:
12575
diff
changeset
|
411 else |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
412 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
|
413 endif |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
414 if (row(1) == 1) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
415 margin.top = 1 - borders(2) - borders(4); |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
416 endif |
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
417 |
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
418 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
419 ## 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
|
420 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
|
421 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
|
422 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
423 ## Position, outerposition and looseinset |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
424 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
|
425 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
|
426 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
|
427 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
|
428 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
429 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
|
430 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
|
431 (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
|
432 (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
|
433 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
|
434 |
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
435 endfunction |
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
436 |
28595
4deb794d85e2
Resolve further number of argument mismatch in graphics callbacks (bug #58821)
Rik <rik@octave.org>
parents:
28310
diff
changeset
|
437 function subplot_align (h, ~, 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
|
438 persistent updating = false; |
21758
ffad2baa90f7
maint: Use newlines to make code more readable.
Rik <rik@octave.org>
parents:
21751
diff
changeset
|
439 |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
440 if (! updating) |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
441 if (rmupdate) |
21751
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21580
diff
changeset
|
442 ## 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
|
443 ## 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
|
444 if (isappdata (h, "__subplotposition__")) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
445 rmappdata (h, "__subplotposition__"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
446 rmappdata (h, "__subplotouterposition__"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
447 endif |
28917
72d57dbcc305
maint: Add semicolon after break and return keywords.
Rik <rik@octave.org>
parents:
28787
diff
changeset
|
448 return; |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
449 endif |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
450 |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
451 unwind_protect |
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
452 updating = true; |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
453 hf = ancestor (h, "figure"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
454 children = get (hf, "children"); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
455 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
456 ## 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
|
457 pos = getappdata (children, "__subplotposition__"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
458 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
459 if (iscell (pos)) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
460 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
|
461 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
|
462 else |
28917
72d57dbcc305
maint: Add semicolon after break and return keywords.
Rik <rik@octave.org>
parents:
28787
diff
changeset
|
463 return; |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
464 endif |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
465 hsubplots = children(do_align); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
466 |
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
467 |
21751
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21580
diff
changeset
|
468 ## 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
|
469 ## 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
|
470 ## 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
|
471 if (any (h == hsubplots)) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
472 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
|
473 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
|
474 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
|
475 hsubplots(! do_align) = []; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
476 pos(! do_align,:) = []; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
477 else |
28917
72d57dbcc305
maint: Add semicolon after break and return keywords.
Rik <rik@octave.org>
parents:
28787
diff
changeset
|
478 return; |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
479 endif |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
480 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
481 ## 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
|
482 opos = getappdata (hsubplots, "__subplotouterposition__"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
483 if (iscell (opos)) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
484 opos = cell2mat (opos); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
485 endif |
26268
6dd232798997
maint: Remove useless ';' from end of for, if, while, etc. statements.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
486 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
|
487 set (hsubplots(ii), "outerposition", opos(ii,:), ... |
28310
1379ebcb00c3
Replace uses of axes property "activepositionproperty" by "positionconstraint" (bug #58336).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28177
diff
changeset
|
488 "positionconstraint", "innerposition"); |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
489 endfor |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
490 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
491 ## 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
|
492 curpos = get (hsubplots, "position"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
493 if (iscell (curpos)) |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
494 curpos = cell2mat (curpos); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
495 endif |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
496 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
|
497 dx0(dx0<0) = 0; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
498 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
|
499 dx1(dx1<0) = 0; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
500 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
|
501 dy0(dy0<0) = 0; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
502 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
|
503 dy1(dy1<0) = 0; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
504 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
505 pos(:,1) += dx0; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
506 pos(:,2) += dy0; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
507 pos(:,3) -= dx0 + dx1; |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
508 pos(:,4) -= dy0 + dy1; |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
509 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
510 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
|
511 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
|
512 endfor |
19833
9fc020886ae9
maint: Clean up m-files to follow Octave coding conventions.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
513 |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
514 unwind_protect_cleanup |
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
515 updating = false; |
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
516 end_unwind_protect |
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
517 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
|
518 |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
519 endfunction |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14335
diff
changeset
|
520 |
17338
1c89599167a6
maint: End m-files with 1 blank line.
Rik <rik@octave.org>
parents:
17312
diff
changeset
|
521 |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
522 %!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
|
523 %! clf; |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
524 %! r = 3; |
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
525 %! c = 3; |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
526 %! 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
|
527 %! 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
|
528 %! subplot (r, c, n); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
529 %! xlabel (sprintf ("xlabel #%d", n)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
530 %! ylabel (sprintf ("ylabel #%d", n)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
531 %! title (sprintf ("title #%d", n)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
532 %! 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
|
533 %! axis ([0 1 0 1]); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
534 %! 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
|
535 %! subplot (r, c, 1:3); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
536 %! xlabel (sprintf ("xlabel #%d:%d", 1, 3)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
537 %! ylabel (sprintf ("ylabel #%d:%d", 1, 3)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
538 %! title (sprintf ("title #%d:%d", 1, 3)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
539 %! 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
|
540 %! axis ([0 1 0 1]); |
8744
4142982c66c6
subplot.m: Compatible placement of subplots.
Ben Abbott <bpabbott@mac.com>
parents:
8517
diff
changeset
|
541 |
11305
c9df571efe95
subplot.m: Add suppport for "align" and "replace" options.
Ben Abbott <bpabbott@mac.com>
parents:
11149
diff
changeset
|
542 %!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
|
543 %! clf; |
11305
c9df571efe95
subplot.m: Add suppport for "align" and "replace" options.
Ben Abbott <bpabbott@mac.com>
parents:
11149
diff
changeset
|
544 %! x = 0:1; |
c9df571efe95
subplot.m: Add suppport for "align" and "replace" options.
Ben Abbott <bpabbott@mac.com>
parents:
11149
diff
changeset
|
545 %! for n = 1:4 |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
546 %! subplot (2,2,n, "align"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
547 %! plot (x, x); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
548 %! xlabel (sprintf ("xlabel (2,2,%d)", n)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
549 %! ylabel (sprintf ("ylabel (2,2,%d)", n)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
550 %! title (sprintf ("title (2,2,%d)", n)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
551 %! endfor |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
552 %! subplot (1,2,1, "align"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
553 %! plot (x, x); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
554 %! xlabel ("xlabel (1,2,1)"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
555 %! ylabel ("ylabel (1,2,1)"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
556 %! 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
|
557 |
16975 | 558 %!demo |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
559 %! clf; |
16975 | 560 %! x = 0:10; |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
561 %! ax(1) = subplot (221); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
562 %! set (ax(1), "tag", "1"); |
21580
ecce63c99c3f
maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
563 %! plot (x, rand (3, 11)); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
564 %! title ("x & y labels & ticklabels"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
565 %! xlabel xlabel; |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
566 %! ylabel ylabel; |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
567 %! ax(2) = subplot (222); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
568 %! set (ax(2), "tag", "2"); |
21580
ecce63c99c3f
maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
569 %! plot (x, rand (3, 11)); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
570 %! title ("no labels"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
571 %! axis ("nolabel","tic"); |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
572 %! ax(3) = subplot (223); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
573 %! set (ax(3), "tag", "3"); |
21580
ecce63c99c3f
maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
574 %! plot (x, rand (3, 11)); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
575 %! title ("no labels"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
576 %! axis ("nolabel","tic"); |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
577 %! ax(4) = subplot (224); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
578 %! set (ax(4), "tag", "4"); |
21580
ecce63c99c3f
maint: Add semicolons to terminate code in %! blocks.
Rik <rik@octave.org>
parents:
20852
diff
changeset
|
579 %! plot (x, rand (3, 11)); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
580 %! title ("x & y labels & ticklabels"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
581 %! xlabel xlabel; |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
582 %! ylabel ylabel; |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
583 |
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
584 %!demo |
24188
1253132e2173
Use "clf;" at beginning of all plot demos.
Rik <rik@octave.org>
parents:
23930
diff
changeset
|
585 %! clf; |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
586 %! x = 0:10; |
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
587 %! subplot (221); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
588 %! plot (x, rand (3, 11)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
589 %! ylim ([0, 1]); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
590 %! 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
|
591 %! "horizontalalignment", "center", ... |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
592 %! "units", "normalized"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
593 %! xlabel xlabel; |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
594 %! ylabel ylabel; |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
595 %! title title; |
16975 | 596 %! subplot (222); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
597 %! plot (x, rand (3, 11)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
598 %! axis ("labely"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
599 %! ylabel ylabel; |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
600 %! text (0.5, 0.5, "no xlabels, xticklabels", ... |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
601 %! "horizontalalignment", "center", ... |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
602 %! "units", "normalized"); |
16975 | 603 %! subplot (223); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
604 %! plot (x, rand (3, 11)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
605 %! axis ("labelx"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
606 %! text (0.5, 0.5, "no ylabels, yticklabels", ... |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
607 %! "horizontalalignment", "center", ... |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
608 %! "units", "normalized"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
609 %! xlabel xlabel; |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
610 %! title title; |
16975 | 611 %! subplot (224); |
22302
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
612 %! plot (x, rand (3, 11)); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
613 %! axis ("nolabel", "tic"); |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
614 %! 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
|
615 %! "horizontalalignment", "center", ... |
1c4cd12987f5
Use Octave syntax in graphics demos.
Rik <rik@octave.org>
parents:
22173
diff
changeset
|
616 %! "units", "normalized"); |
17012
942d892524b3
Handle alignment of subplots in subplot.m.
Ben Abbott <bpabbott@mac.com>
parents:
16975
diff
changeset
|
617 |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
618 ## 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
|
619 ## Default mode |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
620 %!test |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
621 %! hf = figure ("visible", "off"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
622 %! unwind_protect |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
623 %! for ii = 1:9 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
624 %! 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
|
625 %! endfor |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
626 %! subplot (3,3,1); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
627 %! assert (gca (), hax(1)); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
628 %! 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
|
629 %! 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
|
630 %! unwind_protect_cleanup |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
631 %! delete (hf); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
632 %! end_unwind_protect |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
633 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
634 ## Position mode |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
635 %!test |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
636 %! hf = figure ("visible", "off"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
637 %! unwind_protect |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
638 %! 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
|
639 %! 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
|
640 %! 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
|
641 %! assert (gca (), h1); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
642 %! 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
|
643 %! assert (gca (), h2); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
644 %! 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
|
645 %! assert (! ishghandle (h2)); |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
646 %! unwind_protect_cleanup |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
647 %! delete (hf); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
648 %! end_unwind_protect |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
649 |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
650 ## Align mode |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
651 %!test |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
652 %! hf = figure ("visible", "off"); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
653 %! unwind_protect |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
654 %! 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
|
655 %! 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
|
656 %! 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
|
657 %! assert (gca (), h1); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
658 %! 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
|
659 %! assert (! ishghandle (h1)); |
1d52db450db4
Change ishandle to return true for Java objects for Matlab compatibility.
Rik <rik@octave.org>
parents:
24188
diff
changeset
|
660 %! assert (! ishghandle (h2)); |
19687
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
661 %! unwind_protect_cleanup |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
662 %! delete (hf); |
8064b5cdbc11
subplot.m: fix deletion of previous subplots (bug #41128)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
19593
diff
changeset
|
663 %! end_unwind_protect |