Mercurial > octave-nkf
diff scripts/plot/__contour__.m @ 8299:be9b14945774
Add code to remove listeners from properties and use it with newplot
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Fri, 31 Oct 2008 12:30:20 +0100 |
| parents | ac7f334d9652 |
| children | cc3ac5eb6be3 |
line wrap: on
line diff
--- a/scripts/plot/__contour__.m Fri Oct 31 12:09:16 2008 +0100 +++ b/scripts/plot/__contour__.m Fri Oct 31 12:30:20 2008 +0100 @@ -78,6 +78,13 @@ vn = 10; endif + if (isscalar (vn)) + lvl = linspace (min (z1(!isinf(z1))), max (z1(!isinf(z1))), + vn + 2)(1:end-1); + else + lvl = vn; + endif + if (strcmpi (filled, "on")) if (isvector (x1) || isvector (y1)) [x1, y1] = meshgrid (x1, y1); @@ -91,9 +98,9 @@ y0 = [y0(:, 1), y0, y0(:, 1)]; z0 = -Inf(nr+2, nc+2); z0(2:nr+1, 2:nc+1) = z1; - [c, lev] = contourc (x0, y0, z0, vn); + [c, lev] = contourc (x0, y0, z0, lvl); else - [c, lev] = contourc (x1, y1, z1, vn); + [c, lev] = contourc (x1, y1, z1, lvl); endif hg = hggroup (); @@ -128,11 +135,7 @@ endif endif - if (isscalar (vn)) - lvlstep = (max(z1(:)) - min(z1(:))) / vn; - else - lvlstep = (max(z1(:)) - min(z1(:))) / 10; - endif + lvlstep = sum (abs (diff (lvl))) / (length (lvl) - 1); addproperty ("levellist", hg, "data", lev); addproperty ("levelstep", hg, "double", lvlstep);