Mercurial > hg > octave-terminal
changeset 13327:f81fcceb394c
axes: only update the currentaxes property of the parent figure if the axes object is visible
* graphics.cc (F__is_handle_visible__): New function.
is_handle_visible (const graphics_handle&)): New function.
is_handle_visible (double): New function.
is_handle_visible (const octave_valueu&)): New function.
* axes.m: Only set currentaxes property in parent and currentfigure
property in root if axes object is visible.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 12 Oct 2011 11:18:12 -0400 |
parents | 23cc9c13b622 |
children | a2144dbc2f3a |
files | scripts/plot/axes.m src/graphics.cc |
diffstat | 2 files changed, 63 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/axes.m +++ b/scripts/plot/axes.m @@ -28,8 +28,7 @@ function h = axes (varargin) if (nargin == 0 || nargin > 1) - ## make default axes object, and make it the current axes for the - ## current figure. + ## Create an axes object. idx = find (strcmpi (varargin(1:2:end), "parent"), 1, "first"); if (! isempty (idx) && length (varargin) >= 2*idx) cf = varargin{2*idx}; @@ -38,16 +37,19 @@ cf = gcf (); endif tmp = __go_axes__ (cf, varargin{:}); - set (ancestor (cf, "figure"), "currentaxes", tmp); + if (__is_handle_visible__ (tmp)) + set (ancestor (cf, "figure"), "currentaxes", tmp); + endif else - ## arg is axes handle, make it the current axes for the current - ## figure. + ## arg is axes handle. tmp = varargin{1}; if (length(tmp) == 1 && ishandle (tmp) && strcmp (get (tmp, "type"), "axes")) - parent = ancestor (tmp, "figure"); - set (0, "currentfigure", parent); - set (parent, "currentaxes", tmp); + if (__is_handle_visible__ (tmp)) + parent = ancestor (tmp, "figure"); + set (0, "currentfigure", parent); + set (parent, "currentaxes", tmp); + endif else error ("axes: expecting argument to be a scalar axes handle"); endif
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -7666,6 +7666,59 @@ return retval; } +static bool +is_handle_visible (const graphics_handle& h) +{ + return h.ok () && gh_manager::is_handle_visible (h); +} + +static bool +is_handle_visible (double val) +{ + return is_handle_visible (gh_manager::lookup (val)); +} + +static octave_value +is_handle_visible (const octave_value& val) +{ + octave_value retval = false; + + if (val.is_real_scalar () && is_handle_visible (val.double_value ())) + retval = true; + else if (val.is_numeric_type () && val.is_real_type ()) + { + const NDArray handles = val.array_value (); + + if (! error_state) + { + boolNDArray result (handles.dims ()); + + for (octave_idx_type i = 0; i < handles.numel (); i++) + result.xelem (i) = is_handle_visible (handles (i)); + + retval = result; + } + } + + return retval; +} + +DEFUN (__is_handle_visible__, args, , + "-*- texinfo -*-\n\ +@deftypefn {Built-in Function} __is_handle_visible__ (@var{h})\n\ +Undocumented internal function.\n\ +@end deftypefn") +{ + octave_value retval; + + if (args.length () == 1) + retval = is_handle_visible (args(0)); + else + print_usage (); + + return retval; +} + DEFUN (reset, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} reset (@var{h}, @var{property})\n\