octave-nkf: scripts/plot/private/__contour_

annotate scripts/plot/private/contour.m @ 16911:5ea6a6d2b83f

Fix contour() listeners. scripts/plot/contour.m: Add tests. scripts/plot/private/__contour__.m: Modify update_data() to set the mode for levellist and levelstep. When levelstep is manually changed, set the corrsponding levellist, but keep the levellistmode set to "auto". Fix recursion.

author	Ben Abbott <bpabbott@mac.com>
date	Sat, 06 Jul 2013 14:17:30 -0400
parents	1b4d7c703eed
children	e39f00a32dc7

rev	line source
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13156 diff changeset	1 ## Copyright (C) 2007-2012 David Bateman
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	2 ##
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	3 ## This file is part of Octave.
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	4 ##
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	5 ## Octave is free software; you can redistribute it and/or modify it
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	6 ## under the terms of the GNU General Public License as published by
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	7 ## the Free Software Foundation; either version 3 of the License, or (at
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	8 ## your option) any later version.
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	9 ##
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	10 ## Octave is distributed in the hope that it will be useful, but
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	13 ## General Public License for more details.
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	14 ##
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	15 ## You should have received a copy of the GNU General Public License
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	16 ## along with Octave; see the file COPYING. If not, see
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	17 ## <http://www.gnu.org/licenses/>.
9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	18
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8441 diff changeset	19 ## -- texinfo --
7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8441 diff changeset	20 ## @deftypefn {Function File} {[@var{c}, @var{hg}] =} __contour__ (@dots{})
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	21 ## Undocumented internal function.
8812 7d48766c21a5 use consistent format for doc strings of internal functions John W. Eaton <jwe@octave.org> parents: 8441 diff changeset	22 ## @end deftypefn
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	23
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	24 function [c, hg] = __contour__ (varargin)
7208 a730e47fda4d [project @ 2007-11-28 02:32:41 by jwe] jwe parents: 7191 diff changeset	25 ax = varargin{1};
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	26 zlevel = varargin{2};
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	27 filled = "off";
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	28
7317 11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	29 linespec.linestyle = "-";
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	30 linespec.color = "auto";
9554 bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	31 edgecolor = "flat";
7317 11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	32 for i = 3 : nargin
11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	33 arg = varargin {i};
11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	34 if ((ischar (arg) \|\| iscell (arg)))
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	35 [linespec, valid] = __pltopt__ ("__contour__", arg, false);
7317 11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	36 if (isempty (linespec.color))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	37 linespec.color = "auto";
7317 11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	38 endif
10156 f481496013a2 Set default line style in __contour__ David Bateman <dbateman@free.fr> parents: 9896 diff changeset	39 if (isempty (linespec.linestyle))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	40 linespec.linestyle = "-";
10156 f481496013a2 Set default line style in __contour__ David Bateman <dbateman@free.fr> parents: 9896 diff changeset	41 endif
7317 11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	42 if (valid)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	43 have_line_spec = true;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	44 varargin(i) = [];
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	45 break;
7317 11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	46 endif
11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	47 endif
11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	48 endfor
11c5f1ee553e [project @ 2007-12-14 17:42:55 by jwe] jwe parents: 7208 diff changeset	49
7462 dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	50 opts = {};
dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	51 i = 3;
dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	52 while (i < length (varargin))
dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	53 if (ischar (varargin {i}))
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	54 if (strcmpi (varargin{i}, "fill"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	55 filled = varargin {i + 1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	56 varargin(i:i+1) = [];
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	57 elseif (strcmpi (varargin{i}, "linecolor"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	58 linespec.color = varargin {i + 1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	59 edgecolor = linespec.color;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	60 if (ischar (edgecolor) && strcmpi (edgecolor, "auto"))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	61 edgecolor = "flat";
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	62 endif
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	63 varargin(i:i+1) = [];
9554 bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	64 elseif (strcmpi (varargin{i}, "edgecolor"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	65 linespec.color = varargin {i + 1};
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	66 edgecolor = linespec.color;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	67 if (ischar (edgecolor) && strcmpi (edgecolor, "flat"))
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	68 linespec.color = "auto";
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	69 endif
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	70 varargin(i:i+1) = [];
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	71 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	72 opts{end+1} = varargin{i};
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	73 varargin(i) = [];
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	74 opts{end+1} = varargin{i};
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	75 varargin(i) = [];
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	76 endif
7462 dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	77 else
dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	78 i++;
dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	79 endif
dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	80 endwhile
dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	81
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	82 if (length (varargin) < 5)
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	83 z1 = varargin{3};
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	84 x1 = 1 : columns (z1);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	85 y1 = 1 : rows (z1);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	86 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	87 x1 = varargin{3};
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	88 y1 = varargin{4};
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	89 z1 = varargin{5};
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	90 endif
10634 60542efcfa2c Check input arguments for size and type (bug #29861). Rik <octave@nomad.inbox5.com> parents: 10549 diff changeset	91 if (!ismatrix (z1) \|\| isvector (z1) \|\| isscalar (z1))
60542efcfa2c Check input arguments for size and type (bug #29861). Rik <octave@nomad.inbox5.com> parents: 10549 diff changeset	92 error ("__contour__: z argument must be a matrix");
60542efcfa2c Check input arguments for size and type (bug #29861). Rik <octave@nomad.inbox5.com> parents: 10549 diff changeset	93 endif
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	94 if (length (varargin) == 4 \|\| length (varargin) == 6)
16911 5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	95 vn = varargin{end};
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	96 vnauto = false;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	97 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	98 vnauto = true;
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	99 vn = 10;
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	100 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	101
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	102 if (isscalar (vn))
16911 5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	103 ## FIXME - the levels should be determined similarly to {x,y,z}ticks
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	104 lvl = linspace (min (z1(!isinf (z1))), max (z1(!isinf (z1))),
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	105 vn + 2)(1:end-1);
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	106 else
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	107 lvl = vn;
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	108 endif
be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	109
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	110 if (strcmpi (filled, "on"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	111 if (isvector (x1) \|\| isvector (y1))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	112 [x1, y1] = meshgrid (x1, y1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	113 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	114 [nr, nc] = size (z1);
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	115 x0 = prepad (x1, nc+1, 2 * x1(1, 1) - x1(1, 2), 2);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	116 x0 = postpad (x0, nc+2, 2 * x1(1, nc) - x1(1, nc - 1), 2);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	117 x0 = [x0(1, :); x0; x0(1, :)];
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	118 y0 = prepad (y1, nr+1, 2 * y1(1, 1) - y1(2, 1), 1);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	119 y0 = postpad (y0, nr+2, 2 * y1(nr, 1) - y1(nr - 1, 1));
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	120 y0 = [y0(:, 1), y0, y0(:, 1)];
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	121 z0 = -Inf (nr+2, nc+2);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	122 z0(2:nr+1, 2:nc+1) = z1;
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	123 [c, lev] = contourc (x0, y0, z0, lvl);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	124 else
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	125 [c, lev] = contourc (x1, y1, z1, lvl);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	126 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	127
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	128 hg = hggroup ();
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	129 opts = __add_datasource__ ("__countour__", hg, {"x", "y", "z"}, opts{:});
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	130
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	131 addproperty ("xdata", hg, "data", x1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	132 addproperty ("ydata", hg, "data", y1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	133 addproperty ("zdata", hg, "data", z1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	134 addproperty ("contourmatrix", hg, "data", c);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	135
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	136 addlistener (hg, "xdata", @update_data);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	137 addlistener (hg, "ydata", @update_data);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	138 addlistener (hg, "zdata", @update_data);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	139 addlistener (hg, "contourmatrix", @update_data);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	140
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	141 addproperty ("fill", hg, "radio", "on\|{off}", filled);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	142
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	143 ## The properties zlevel and zlevelmode don't exist in matlab, but
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	144 ## allow the use of contourgroups with the contour3, meshc and surfc
c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	145 ## functions.
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	146 if (isnumeric (zlevel))
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	147 addproperty ("zlevelmode", hg, "radio", "{none}\|auto\|manual", "manual");
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	148 addproperty ("zlevel", hg, "data", zlevel);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	149 else
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	150 addproperty ("zlevelmode", hg, "radio", "{none}\|auto\|manual", zlevel);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	151 if (ischar (zlevel) && strcmpi (zlevel, "manual"))
7462 dfcaf7ed48e3 Allow linewidth to be specified for contours David Bateman parents: 7317 diff changeset	152 z = varargin{3};
7191 b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe] jwe parents: 7189 diff changeset	153 z = 2 * (min (z(:)) - max (z(:)));
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	154 addproperty ("zlevel", hg, "data", z);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	155 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	156 addproperty ("zlevel", hg, "data", 0.);
7175 5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe] jwe parents: 7170 diff changeset	157 endif
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe] jwe parents: 7170 diff changeset	158 endif
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe] jwe parents: 7170 diff changeset	159
8299 be9b14945774 Add code to remove listeners from properties and use it with newplot David Bateman <dbateman@free.fr> parents: 8289 diff changeset	160 lvlstep = sum (abs (diff (lvl))) / (length (lvl) - 1);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	161
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	162 addproperty ("levellist", hg, "data", lev);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	163 addproperty ("levelstep", hg, "double", lvlstep);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	164 if (vnauto)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	165 addproperty ("levellistmode", hg, "radio", "{auto}\|manual", "auto");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	166 addproperty ("levelstepmode", hg, "radio", "{auto}\|manual", "auto");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	167 elseif (isscalar (vn))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	168 addproperty ("levellistmode", hg, "radio", "{auto}\|manual", "auto");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	169 addproperty ("levelstepmode", hg, "radio", "{auto}\|manual", "manual");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	170 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	171 addproperty ("levellistmode", hg, "radio", "{auto}\|manual", "manual");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	172 addproperty ("levelstepmode", hg, "radio", "{auto}\|manual", "auto");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	173 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	174
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	175 addproperty ("labelspacing", hg, "double", 144);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	176 addproperty ("textlist", hg, "data", lev);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	177 addproperty ("textlistmode", hg, "radio", "{auto}\|manual", "auto");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	178 addproperty ("textstep", hg, "double", lvlstep);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	179 addproperty ("textstepmode", hg, "radio", "{auto}\|manual", "auto");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	180 addproperty ("showtext", hg, "radio", "on\|{off}", "off");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	181
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	182 addproperty ("linecolor", hg, "color", linespec.color, "{auto}\|none");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	183 addproperty ("linestyle", hg, "linelinestyle", linespec.linestyle);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	184 addproperty ("linewidth", hg, "linelinewidth", 0.5);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	185
9554 bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	186 ## FIXME It would be good to hide this property which is just an undocumented
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	187 ## alias for linecolor
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	188 addproperty ("edgecolor", hg, "color", edgecolor, "{flat}\|none");
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	189
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	190 addlistener (hg, "fill", @update_data);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	191
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	192 addlistener (hg, "zlevelmode", @update_zlevel);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	193 addlistener (hg, "zlevel", @update_zlevel);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	194
16911 5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	195 addlistener (hg, "levellist", {@update_data, "levellist"});
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	196 addlistener (hg, "levelstep", {@update_data, "levelstep"});
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	197 addlistener (hg, "levellistmode", @update_data);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	198 addlistener (hg, "levelstepmode", @update_data);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	199
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	200 addlistener (hg, "labelspacing", @update_text);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	201 addlistener (hg, "textlist", @update_text);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	202 addlistener (hg, "textlistmode", @update_text);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	203 addlistener (hg, "textstep", @update_text);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	204 addlistener (hg, "textstepmode", @update_text);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	205 addlistener (hg, "showtext", @update_text);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	206
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	207 addlistener (hg, "linecolor", @update_line);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	208 addlistener (hg, "linestyle", @update_line);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	209 addlistener (hg, "linewidth", @update_line);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	210
9554 bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	211 addlistener (hg, "edgecolor", @update_edgecolor);
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	212
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	213 add_patch_children (hg);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	214
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	215 axis ("tight");
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	216
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	217 if (!isempty (opts))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	218 set (hg, opts{:});
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	219 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	220 endfunction
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	221
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	222 function add_patch_children (hg)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	223 c = get (hg, "contourmatrix");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	224 lev = get (hg, "levellist");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	225 fill = get (hg, "fill");
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	226 zlev = get (hg, "zlevel");
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	227 zmode = get (hg, "zlevelmode");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	228 lc = get (hg, "linecolor");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	229 lw = get (hg, "linewidth");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	230 ls = get (hg, "linestyle");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	231 filled = get (hg, "fill");
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	232 ca = gca ();
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	233
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	234 if (strcmpi (lc, "auto"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	235 lc = "flat";
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	236 endif
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	237
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	238 if (strcmpi (filled, "on"))
10354 f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	239
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	240 lvl_eps = get_lvl_eps (lev);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	241
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	242 ## Decode contourc output format.
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	243 i1 = 1;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	244 ncont = 0;
15450 1b4d7c703eed __contour__.m: initialise cont_lev and cont_area (bug #37458) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14868 diff changeset	245 cont_lev = [];
1b4d7c703eed __contour__.m: initialise cont_lev and cont_area (bug #37458) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14868 diff changeset	246 cont_area = [];
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	247 while (i1 < columns (c))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	248 ncont++;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	249 cont_lev(ncont) = c(1, i1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	250 cont_len(ncont) = c(2, i1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	251 cont_idx(ncont) = i1+1;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	252 ii = i1+1:i1+cont_len(ncont);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	253 cont_area(ncont) = polyarea (c(1, ii), c(2, ii));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	254 i1 += c(2, i1) + 1;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	255 endwhile
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	256
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	257 ## Handle for each level the case where we have (a) hole(s) in a patch.
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	258 ## Those are to be filled with the color of level below or with the
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	259 ## background colour.
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	260 for k = 1:numel (lev)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	261 lvl_idx = find (abs (cont_lev - lev(k)) < lvl_eps);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	262 len = numel (lvl_idx);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	263 if (len > 1)
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	264 ## mark = logical (zeros (size (lvl_idx)));
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	265 mark = false (size (lvl_idx));
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	266 a = 1;
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	267 while (a < len)
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	268 ## take 1st patch
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	269 b = a + 1;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	270 pa_idx = lvl_idx(a);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	271 ## get pointer to contour start, and contour length
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	272 curr_ct_idx = cont_idx(pa_idx);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	273 curr_ct_len = cont_len(pa_idx);
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	274 ## get contour
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	275 curr_ct = c(:, curr_ct_idx:curr_ct_idx+curr_ct_len-1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	276 b_vec = (a+1):len;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	277 next_ct_pt_vec = c(:, cont_idx(lvl_idx(b_vec)));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	278 in = inpolygon (next_ct_pt_vec(1,:), next_ct_pt_vec(2,:),
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	279 curr_ct(1, :), curr_ct(2, :));
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	280 mark(b_vec(in)) = !mark(b_vec(in));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	281 a++;
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	282 endwhile
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	283 if (numel (mark) > 0)
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	284 ## All marked contours describe a hole in a larger contour of
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	285 ## the same level and must be filled with colour of level below.
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	286 ma_idx = lvl_idx(mark);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	287 if (k > 1)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	288 ## Find color of level below.
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	289 tmp = find (abs (cont_lev - lev(k - 1)) < lvl_eps);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	290 lvl_bel_idx = tmp(1);
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	291 ## Set color of patches found.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	292 cont_lev(ma_idx) = cont_lev(lvl_bel_idx);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	293 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	294 ## Set lowest level contour to NaN.
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	295 cont_lev(ma_idx) = NaN;
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	296 endif
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	297 endif
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	298 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	299 endfor
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	300
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	301 ## The algorithm can create patches with the size of the plotting
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	302 ## area, we would like to draw only the patch with the highest level.
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	303 del_idx = [];
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	304 max_idx = find (cont_area == max (cont_area));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	305 if (numel (max_idx) > 1)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	306 ## delete double entries
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	307 del_idx = max_idx(1:end-1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	308 cont_area(del_idx) = cont_lev(del_idx) = [];
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	309 cont_len(del_idx) = cont_idx(del_idx) = [];
7175 5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe] jwe parents: 7170 diff changeset	310 endif
5ff4da7bd2e7 [project @ 2007-11-14 20:36:48 by jwe] jwe parents: 7170 diff changeset	311
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	312 ## Now we have everything together and can start plotting the patches
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	313 ## beginning with largest area.
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	314 [tmp, svec] = sort (cont_area);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	315 len = ncont - numel (del_idx);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	316 h = [];
8441 cc3ac5eb6be3 __contour__.m: __contour__.m: correct order of patches Ben Abbott <bpabbott@mac.com> parents: 8299 diff changeset	317 for n = len:(-1):1
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	318 idx = svec(n);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	319 ctmp = c(:, cont_idx(idx):cont_idx(idx) + cont_len(idx) - 1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	320 if (all (ctmp(:,1) == ctmp(:,end)))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	321 ctmp(:, end) = [];
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	322 else
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	323 ## Special case unclosed contours
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	324 endif
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	325 if (isnan (cont_lev (idx)))
13156 da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	326 fc = get (ca, "color");
da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	327 if (strcmp (fc, "none"))
da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	328 fc = get (ancestor (ca, "figure"), "color");
da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	329 endif
da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	330 else
da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	331 fc = "flat";
da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	332 endif
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	333 h = [h; __go_patch__(ca, "xdata", ctmp(1, :)(:), "ydata", ctmp(2, :)(:),
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	334 "vertices", ctmp.', "faces", 1:(cont_len(idx)-1),
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	335 "facevertexcdata", cont_lev(idx),
13156 da71f676e449 Fix bug #34282. Fill holes in contours with the background colour Ben Abbott <bpabbott@mac.com> parents: 12648 diff changeset	336 "facecolor", fc, "cdata", cont_lev(idx),
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	337 "edgecolor", lc, "linestyle", ls,
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	338 "linewidth", lw, "parent", hg)];
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	339 endfor
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	340
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	341 if (min (lev) == max (lev))
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	342 set (ca, "clim", [min(lev)-1, max(lev)+1], "layer", "top");
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	343 else
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	344 set (ca, "clim", [min(lev), max(lev)], "layer", "top");
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	345 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	346 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	347 ## Decode contourc output format.
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	348 i1 = 1;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	349 h = [];
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	350 while (i1 < length (c))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	351 clev = c(1,i1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	352 clen = c(2,i1);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	353
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	354 if (all (c(:,i1+1) == c(:,i1+clen)))
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	355 p = c(:, i1+1:i1+clen-1).';
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	356 else
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	357 p = [c(:, i1+1:i1+clen), NaN(2, 1)].';
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	358 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	359
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	360 switch (zmode)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	361 case "none"
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	362 h = [h; __go_patch__(ca, "xdata", p(:,1), "ydata", p(:,2),
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	363 "zdata", [], "facecolor", "none",
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	364 "vertices", p, "faces", 1:rows(p),
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	365 "facevertexcdata", clev,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	366 "edgecolor", lc, "linestyle", ls,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	367 "linewidth", lw,
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	368 "cdata", clev, "parent", hg)];
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	369 case "auto"
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	370 h = [h; __go_patch__(ca, "xdata", p(:,1), "ydata", p(:,2),
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	371 "zdata", clev * ones(rows(p),1),
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	372 "vertices", [p, clev * ones(rows(p),1)],
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	373 "faces", 1:rows(p),
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	374 "facevertexcdata", clev,
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	375 "facecolor", "none", "edgecolor", lc,
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	376 "linestyle", ls, "linewidth", lw,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	377 "cdata", clev, "parent", hg)];
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	378 otherwise
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	379 h = [h; __go_patch__(ca, "xdata", p(:,1), "ydata", p(:,2),
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	380 "zdata", zlev * ones (rows(p), 1),
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	381 "vertices", [p, zlev * ones(rows(p),1)],
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	382 "faces", 1:rows(p),
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	383 "facevertexcdata", clev,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	384 "facecolor", "none", "edgecolor", lc,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	385 "linestyle", ls, "linewidth", lw,
c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	386 "cdata", clev, "parent", hg)];
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	387 endswitch
11175 c0a95a5c6d25 Address the speed of plotting large hggroup groups and in particular David Bateman <dbateman@free.fr> parents: 11163 diff changeset	388 i1 += clen + 1;
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	389 endwhile
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	390 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	391
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	392 endfunction
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	393
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	394 function update_zlevel (h, d)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	395 z = get (h, "zlevel");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	396 zmode = get (h, "zlevelmode");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	397 kids = get (h, "children");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	398
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	399 switch (zmode)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	400 case "none"
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	401 set (kids, "zdata", []);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	402 case "auto"
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	403 for i = 1 : length (kids)
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	404 set (kids(i), "zdata", get (kids (i), "cdata") .*
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	405 ones (size (get (kids (i), "xdata"))));
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	406 endfor
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	407 otherwise
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	408 for i = 1 : length (kids)
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	409 set (kids(i), "zdata", z .* ones (size (get (kids (i), "xdata"))));
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	410 endfor
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	411 endswitch
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	412 endfunction
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	413
9554 bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	414 function update_edgecolor (h, d)
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	415 ec = get (h, "edgecolor");
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	416 lc = get (h, "linecolor");
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	417 if (ischar (ec) && strcmpi (ec, "flat"))
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	418 if (! strcmpi (lc, "auto"))
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	419 set (h, "linecolor", "auto");
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	420 endif
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	421 elseif (! isequal (ec, lc))
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	422 set (h, "linecolor", ec);
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	423 endif
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	424 endfunction
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	425
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	426 function update_line (h, d)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	427 lc = get (h, "linecolor");
9554 bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	428 ec = get (h, "edgecolor");
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	429 if (strcmpi (lc, "auto"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	430 lc = "flat";
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	431 endif
9554 bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	432 if (! isequal (ec, lc))
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	433 set (h, "edgecolor", lc);
bda3513e7ba9 Fix test for setting of datasource properties. Add the edgecolor property to contours David Bateman <dbateman@free.fr> parents: 8920 diff changeset	434 endif
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	435 set (findobj (h, "type", "patch"), "edgecolor", lc,
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	436 "linewidth", get (h, "linewidth"), "linestyle", get (h, "linestyle"));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	437 endfunction
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	438
16911 5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	439 function update_data (h, d, prop = "")
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	440 persistent recursive = false;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	441
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	442 if (!recursive)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	443 recursive = true;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	444
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	445 delete (get (h, "children"));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	446
16911 5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	447 switch prop
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	448 case "levellist"
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	449 set (h, "levellistmode", "manual")
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	450 case "levelstep"
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	451 set (h, "levelstepmode", "manual")
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	452 endswitch
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	453
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	454 if (strcmpi (get (h, "levellistmode"), "manual")
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	455 && ! strcmp (prop, "levelstep"))
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	456 lvl = get (h, "levellist");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	457 elseif (strcmpi (get (h, "levelstepmode"), "manual"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	458 z = get (h, "zdata");
16911 5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	459 lvs = get (h, "levelstep");
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	460 lvl(1) = ceil (min (z(:)) / lvs) * lvs;
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	461 lvl(2) = floor (max (z(:)) / lvs) * lvs;
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	462 if (lvl(1) >= lvl(2))
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	463 lvl = median (z(:));
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	464 else
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	465 lvl = lvl(1) : lvs : lvl(2);
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	466 endif
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	467 set (h, "levellist", lvl);
5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	468 set (h, "levellistmode", "auto");
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	469 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	470 lvl = 10;
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	471 endif
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	472
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	473 if (strcmpi (get (h, "fill"), "on"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	474 X = get (h, "xdata");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	475 Y = get (h, "ydata");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	476 Z = get (h, "zdata");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	477 if (isvector (X) \|\| isvector (Y))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	478 [X, Y] = meshgrid (X, Y);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	479 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	480 [nr, nc] = size (Z);
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	481 X0 = prepad (X, nc+1, 2 * X(1, 1) - X(1, 2), 2);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	482 X0 = postpad (X0, nc+2, 2 * X(1, nc) - X(1, nc - 1), 2);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	483 X0 = [X0(1, :); X0; X0(1, :)];
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	484 Y0 = prepad (Y, nr+1, 2 * Y(1, 1) - Y(2, 1), 1);
5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	485 Y0 = postpad (Y0, nr+2, 2 * Y(nr, 1) - Y(nr - 1, 1));
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	486 Y0 = [Y0(:, 1), Y0, Y0(:, 1)];
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	487 Z0 = -Inf (nr+2, nc+2);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	488 Z0(2:nr+1, 2:nc+1) = Z;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	489 [c, lev] = contourc (X0, Y0, Z0, lvl);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	490 else
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	491 [c, lev] = contourc (get (h, "xdata"), get (h, "ydata"),
c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	492 get (h, "zdata"), lvl);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	493 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	494 set (h, "contourmatrix", c);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	495
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	496 if (strcmpi (get (h, "levellistmode"), "manual"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	497 ## Do nothing
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	498 elseif (strcmpi (get (h, "levelstepmode"), "manual"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	499 set (h, "levellist", lev);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	500 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	501 set (h, "levellist", lev);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	502 z = get (h, "zdata");
14868 5d3a684236b0 maint: Use Octave coding conventions for cuddling parentheses in scripts directory Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	503 lvlstep = (max (z(:)) - min (z(:))) / 10;
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	504 set (h, "levelstep", lvlstep);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	505 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	506
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	507 add_patch_children (h);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	508 update_text (h, d);
16911 5ea6a6d2b83f Fix contour() listeners. Ben Abbott <bpabbott@mac.com> parents: 15450 diff changeset	509 recursive = false;
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	510 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	511
7170 9f38c6293317 [project @ 2007-11-13 17:34:33 by jwe] jwe parents: diff changeset	512 endfunction
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	513
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	514 function update_text (h, d)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	515 persistent recursive = false;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	516
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	517 if (!recursive)
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	518 recursive = true;
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	519
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	520 delete (findobj (h, "type", "text"));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	521
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	522 if (strcmpi (get (h, "textlistmode"), "manual"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	523 lvl = get (h, "textlist");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	524 elseif (strcmpi (get (h, "textstepmode"), "manual"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	525 lev = get (h, "levellist");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	526
10354 f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	527 lvl_eps = get_lvl_eps (lev);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	528
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	529 stp = get (h, "textstep");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	530 t = [0, floor(cumsum(diff (lev)) / (abs(stp) - lvl_eps))];
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	531 lvl = lev([true, t(1:end-1) != t(2:end)]);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	532 set (h, "textlist", lvl);
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	533 else
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	534 lvl = get (h, "levellist");
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	535 set (h, "textlist", lvl, "textstep", get (h, "levelstep"));
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	536 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	537
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	538 if (strcmpi (get (h, "showtext"), "on"))
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	539 switch (get (h, "zlevelmode"))
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	540 case "manual"
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	541 __clabel__ (get (h, "contourmatrix"), lvl, h,
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	542 get (h, "labelspacing"), get (h, "zlevel"));
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	543 case "auto"
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	544 __clabel__ (get (h, "contourmatrix"), lvl, h,
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	545 get (h, "labelspacing"), "auto");
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	546 otherwise
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	547 __clabel__ (get (h, "contourmatrix"), lvl, h,
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10354 diff changeset	548 get (h, "labelspacing"), []);
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	549 endswitch
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	550 endif
11198 9f080d23396f Fix multi-parented legends with the gnuplot backend (fixes #30461 and #31522) David Bateman <dbateman@free.fr> parents: 11175 diff changeset	551
9f080d23396f Fix multi-parented legends with the gnuplot backend (fixes #30461 and #31522) David Bateman <dbateman@free.fr> parents: 11175 diff changeset	552 recursive = false;
8289 ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	553 endif
ac7f334d9652 Add contour group objects and the clabel function David Bateman <dbateman@free.fr> parents: 8190 diff changeset	554 endfunction
10354 f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	555
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	556 function lvl_eps = get_lvl_eps (lev)
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	557 ## FIXME -- is this the right thing to do for this tolerance? Should
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	558 ## it be an absolute or relative tolerance, or switch from one to the
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	559 ## other depending on the value of lev?
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	560 if (isscalar (lev))
12648 c6378cec77af Fix unfilled contourf when lvl = [0,0] (bug #33177). Marco Caliari marco.caliari@univr.it parents: 11587 diff changeset	561 lvl_eps = abs (lev) * sqrt (eps) + sqrt (eps);
10354 f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	562 else
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	563 tmp = min (abs (diff (lev)));
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	564 if (tmp < 10*eps)
10354 f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	565 lvl_eps = sqrt (eps);
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	566 else
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	567 lvl_eps = tmp / 1000.0;
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	568 endif
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	569 endif
f074aa6b2c80 __contour__: don't fail if zlevel is a vector with all the same values John W. Eaton <jwe@octave.org> parents: 10156 diff changeset	570 endfunction

Mercurial > octave-nkf

annotate scripts/plot/private/__contour__.m @ 16911:5ea6a6d2b83f

annotate scripts/plot/private/contour.m @ 16911:5ea6a6d2b83f