Mercurial > hg > octave-terminal
changeset 3063:4287b8c06fbf
[project @ 1997-06-26 02:36:05 by jwe]
author | jwe |
---|---|
date | Thu, 26 Jun 1997 02:36:14 +0000 |
parents | 7310b801f8c2 |
children | 4e6581fd8060 |
files | scripts/ChangeLog scripts/plot/contour.m scripts/plot/loglog.m scripts/plot/mesh.m scripts/plot/plot.m scripts/plot/polar.m scripts/plot/semilogx.m scripts/plot/semilogy.m |
diffstat | 8 files changed, 38 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 25 21:26:24 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + + * plot/mesh.m: Set noparametric plot mode after plotting. + Wed Jun 25 21:06:10 1997 Rick Niles <niles@axp745.gsfc.nasa.gov> * plot/__pltopt__.m: Handle key/legend names.
--- a/scripts/plot/contour.m +++ b/scripts/plot/contour.m @@ -26,11 +26,14 @@ function contour (z, n, x, y) - if (nargin == 1) n = 10; endif + ## XXX FIXME XXX -- these plot states should really just be set + ## temporarily, probably inside an unwind_protect block, but there is + ## no way to determine their current values. + if (nargin == 1 || nargin == 2) if (is_matrix (z)) gset nosurface; @@ -42,7 +45,7 @@ gset view 0, 0, 1, 1; gsplot z w l 1; else - error ("mesh: argument must be a matrix"); + error ("contour: argument must be a matrix"); endif elseif (nargin == 4) if (is_vector (x) && is_vector (y) && is_matrix (z)) @@ -70,15 +73,15 @@ gset view 0, 0, 1, 1; gsplot zz w l 1; else - msg = "mesh: rows (z) must be the same as length (x) and"; + msg = "contour: rows (z) must be the same as length (x) and"; msg = sprintf ("%s\ncolumns (z) must be the same as length (y)", msg); error (msg); endif else - error ("mesh: x and y must be vectors and z must be a matrix"); + error ("contour: x and y must be vectors and z must be a matrix"); endif else - usage ("mesh (z, levels, x, y)"); + usage ("contour (z, levels, x, y)"); endif endfunction
--- a/scripts/plot/loglog.m +++ b/scripts/plot/loglog.m @@ -33,6 +33,10 @@ function loglog (...) + ## XXX FIXME XXX -- these plot states should really just be set + ## temporarily, probably inside an unwind_protect block, but there is + ## no way to determine their current values. + gset logscale x; gset logscale y; gset nopolar;
--- a/scripts/plot/mesh.m +++ b/scripts/plot/mesh.m @@ -32,6 +32,10 @@ function mesh (x, y, z) + ## XXX FIXME XXX -- the plot states should really just be set + ## temporarily, probably inside an unwind_protect block, but there is + ## no way to determine their current values. + if (nargin == 1) z = x; if (is_matrix (z)) @@ -69,6 +73,7 @@ gset parametric; gset view 60, 30, 1, 1 gsplot (zz); + gset noparametric; else msg = "mesh: rows (z) must be the same as length (x) and"; msg = sprintf ("%s\ncolumns (z) must be the same as length (y)", msg); @@ -95,6 +100,7 @@ gset parametric; gset view 60, 30, 1, 1 gsplot (zz); + gset noparametric; else error ("mesh: x, y, and z must have same dimensions"); endif
--- a/scripts/plot/plot.m +++ b/scripts/plot/plot.m @@ -65,6 +65,10 @@ function plot (...) + ## XXX FIXME XXX -- these plot states should really just be set + ## temporarily, probably inside an unwind_protect block, but there is + ## no way to determine their current values. + gset nologscale; gset nopolar;
--- a/scripts/plot/polar.m +++ b/scripts/plot/polar.m @@ -30,6 +30,10 @@ function polar (x1, x2, fmt) + ## XXX FIXME XXX -- these plot states should really just be set + ## temporarily, probably inside an unwind_protect block, but there is + ## no way to determine their current values. + gset nologscale; gset nopolar;
--- a/scripts/plot/semilogx.m +++ b/scripts/plot/semilogx.m @@ -33,6 +33,10 @@ function semilogx (...) + ## XXX FIXME XXX -- these plot states should really just be set + ## temporarily, probably inside an unwind_protect block, but there is + ## no way to determine their current values. + gset logscale x; gset nologscale y; gset nopolar;
--- a/scripts/plot/semilogy.m +++ b/scripts/plot/semilogy.m @@ -33,6 +33,10 @@ function semilogy (...) + ## XXX FIXME XXX -- these plot states should really just be set + ## temporarily, probably inside an unwind_protect block, but there is + ## no way to determine their current values. + gset nologscale x; gset logscale y; gset nopolar;