Mercurial > hg > octave-lyh
changeset 17143:603ce503babd
figure.m: Overhaul function. When switching to figure N make it visible.
* scripts/plot/figure.m: When switching to figure N make it visible.
Rename variable tmp to arg for clarity. Add %!error blocks.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 01 Aug 2013 11:18:52 -0700 |
parents | e4968b4613a5 |
children | 96526baf7423 |
files | scripts/plot/figure.m |
diffstat | 1 files changed, 42 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/figure.m +++ b/scripts/plot/figure.m @@ -45,59 +45,64 @@ nargs = nargin; - f = NaN; - - init_new_figure = false; - if (mod (nargs, 2) == 1) - tmp = varargin{1}; - if (ischar (tmp)) - tmp = str2double (tmp); + if (mod (nargs, 2) == 0) + f = NaN; + init_new_figure = true; + else + arg = varargin{1}; + if (ischar (arg)) + arg = str2double (arg); endif - if (isfigure (tmp)) - f = tmp; + if (isfigure (arg)) + f = arg; + init_new_figure = false; varargin(1) = []; nargs--; - elseif (isnumeric (tmp) && tmp > 0 && tmp == fix (tmp)) - f = tmp; + elseif (isnumeric (arg) && isscalar (arg) && arg > 0 && arg == fix (arg)) + f = arg; init_new_figure = true; varargin(1) = []; nargs--; else - error ("figure: expecting figure handle or figure number"); + error ("figure: N must be figure handle or figure number"); endif endif + if (rem (nargs, 2) == 1) + error ("figure: PROPERTY/VALUE arguments must be in pairs"); + endif + ## Check to see if we already have a figure on the screen. If we do, ## then update it if it is different from the figure we are creating ## or switching to. - cf = get (0, "currentfigure"); # Can't use gcf () because it calls figure () + cf = get (0, "currentfigure"); # Can't use gcf () because it calls figure() if (! isempty (cf) && cf != 0) - if (isnan (f) || cf != f) + if (init_new_figure || cf != f) drawnow (); endif endif - if (rem (nargs, 2) == 0) - if (isnan (f) || init_new_figure) - if (ismac () && strcmp (graphics_toolkit (), "fltk")) - ## FIXME - Hack for fltk-aqua to work around bug #31931 - f = __go_figure__ (f); - drawnow (); - if (! isempty (varargin)) - set (f, varargin{:}); - endif - else - f = __go_figure__ (f, varargin{:}); + if (init_new_figure) + if (ismac () && strcmp (graphics_toolkit (), "fltk")) + ## FIXME: Hack for fltk-aqua to work around bug #31931 + f = __go_figure__ (f); + drawnow (); + if (! isempty (varargin)) + set (f, varargin{:}); endif - elseif (nargs > 0) - set (f, varargin{:}); + else + f = __go_figure__ (f, varargin{:}); endif - set (0, "currentfigure", f); - else - print_usage (); + __add_default_menu__ (f); + elseif (nargs > 0) + set (f, varargin{:}); endif - __add_default_menu__ (f); + set (0, "currentfigure", f); + ## When switching to figure N, make figure visible and on top of stack. + if (! init_new_figure) + set (f, "visible", "on"); + endif if (nargout > 0) h = f; @@ -109,9 +114,14 @@ %!test %! hf = figure ("visible", "off"); %! unwind_protect -%! assert (gcf, hf); +%! assert (hf, gcf); %! assert (isfigure (hf)); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect +%!error <N must be figure handle or figure number> figure ({1}) +%!error <N must be figure handle or figure number> figure ([1 2]) +%!error <N must be figure handle or figure number> figure (-1) +%!error <N must be figure handle or figure number> figure (1.5) +