Mercurial > hg > octave-nkf
changeset 7283:a1fdd4dabefb
[project @ 2007-12-10 23:13:13 by jwe]
author | jwe |
---|---|
date | Mon, 10 Dec 2007 23:13:13 +0000 |
parents | 30100a15625c |
children | a239de118fa6 |
files | src/ChangeLog src/graphics.cc src/graphics.h.in |
diffstat | 3 files changed, 19 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -4,13 +4,6 @@ For compatibility, return [x, fval, info] instead of [x, info, msg]. Move tests here from test/test_nonlin.m. -2007-12-10 David Bateman <dbateman@free.fr> - - * graphics.h.in (data_property::data): Declare as NDArray instead - of Matrix. Change all uses. - -2007-12-10 John W. Eaton <jwe@octave.org> - * OPERATORS/op-cm-s.cc: Define function for el_mul with DEFNDBINOP_OP, not DEFBINOP_OP. @@ -29,6 +22,16 @@ * pt-mat.cc (tree_matrix::rvalue): Produce sq_string if any strings are sq_string objects. +2007-12-10 David Bateman <dbateman@free.fr> + + * graphics.h.in (data_property::data): Declare as NDArray instead + of Matrix. Change all uses. + +2007-12-10 Shai Ayal <shaiay@users.sourceforge.net> + + * graphics.h.in (class figure) Add the color property. + * graphics.cc (class figure) Ditto. + 2007-12-07 David Bateman <dbateman@free.fr> * data.cc (Fnorm): Don't return a scalar stored as a sparse
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -863,7 +863,8 @@ currentaxes (octave_NaN), colormap (), visible ("on"), - paperorientation ("portrait") + paperorientation ("portrait"), + color ( color_values (1, 1, 1)) { } void @@ -922,6 +923,8 @@ set_visible (val); else if (name.compare ("paperorientation")) set_paperorientation (val); + else if (name.compare ("color")) + set_color (val); else { modified = false; @@ -950,6 +953,7 @@ m.assign ("colormap", colormap); m.assign ("visible", visible); m.assign ("paperorientation", paperorientation); + m.assign ("color", color); return m; } @@ -985,6 +989,8 @@ retval = visible; else if (name.compare ("paperorientation")) retval = paperorientation; + else if (name.compare ("color")) + retval = color; else warning ("get: invalid property `%s'", name.c_str ()); @@ -1022,7 +1028,7 @@ m["colormap"] = colormap_property (); m["visible"] = "on"; m["paperorientation"] = "portrait"; - + m["color"] = color_property (color_values (1, 1, 1)); return m; }