Mercurial > hg > octave-lyh
view scripts/plot/uiwait.m @ 14014:907d03def9d5
explicitly close figures in clean_up_and_exit instead of using an atexit function
* graphics.cc (Fdrawnow): Don't register __go_close_all__ as an atexit
function.
* __go_close_all__.m: Delete.
* plot/module.mk (plot_FCN_FILES): Remove __go_close_all__.m from the
list.
* graphics.cc (gh_manager::create_instance): Do register cleanup
function.
* graphics.cc (delete_graphics_objects, delete_graphics_object,
close_figure, force_close_figure): New functions.
(F__go_delete__): Call delete_graphics_objects to do the work.
* graphics.h, graphics.cc (gh_manager::close_all_figures,
gh_manager::do_close_all_figures): New functions.
* graphics.h.in, graphics.cc (close_all_figures): New function.
* toplev.cc (clean_up_and_exit): Call close_all_figures.
* graphics.h.in (uitoggletool::~uitoggletool, uipushtool::~uipushtool,
uitoolbar::~uitoolbar, uipanel::~uipanel, uicontrol::~uicontrol,
uicontextmenu::~uicontextmenu, uimenu::~uimenu, hggroup::~hggroup,
surface::~surface, image::~image, text::~text, line::~line,
axes::~axes, figure::~figure, root_figure::~root_figure):
Don't delete children.
* toplev.cc (SAFE_CALL, IGNORE_INTERRUPT): Rename to OCTAVE_SAFE_CALL
and OCTAVE_IGNORE_INTERRUPT and move to toplev.h. Temporarily set
Vdebug_on_error and Vdebug_on_warning. Reset error_state to zero.
Change all callers.
* graphics.h.in (base_graphics_toolkit::close): New virtual function.
(graphics_toolkit::close, graphics_toolkit::close_all_toolkits):
New functions.
* graphics.cc (gnuplot_toolkit::close): New function.
):
* __init_fltk__.cc (F__init_fltk__): Don't register __remove_fltk__ as
an atexit function.
(F__remove_fltk__): Move to fltk_toolkit::close.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 08 Dec 2011 06:28:18 -0500 |
parents | 5820f8ce683e |
children | 72c96de7a403 |
line wrap: on
line source
## Copyright (C) 2011 Michael Goffioul ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} uiwait ## @deftypefnx {Function File} {} uiwait (@var{h}) ## @deftypefnx {Function File} {} uiwait (@var{h}, @var{timeout}) ## Suspend program execution until the figure with handle @var{h} is ## deleted or @code{uiresume} is called. When no figure handle is specified, ## this function uses the current figure. ## ## If the figure handle is invalid or there is no current figure, this ## functions returns immediately. ## ## When specified, @var{timeout} defines the number of seconds to wait ## for the figure deletion or the @code{uiresume} call. The timeout value ## must be at least 1. If a smaller value is specified, a warning is issued ## and a timeout value of 1 is used instead. If a non-integer value is ## specified, it is truncated towards 0. If @var{timeout} is not specified, ## the program execution is suspended indefinitely. ## @seealso{uiresume, waitfor} ## @end deftypefn ## Author: goffioul function uiwait (varargin) h = []; timeout = []; if (nargin == 0) h = get (0, "currentfigure"); else h = varargin{1}; if (! ishandle (h) || ! strcmp (get (h, "type"), "figure")) error ("uiwait: invalid figure handle"); endif if (nargin > 1) timeout = varargin{2}; endif endif if (! isempty (h)) unwind_protect try addproperty ("__uiwait_state__", h, "radio", "none|{active}|triggered"); catch if (! strcmp (get (h, "__uiwait_state__"), "none")) error ("uiwait: an active uiwait call for this figure already exists"); endif set (h, "__uiwait_state__", "active"); end_try_catch waitfor_args = {h, "__uiwait_state__", "triggered"}; if (! isempty (timeout)) waitfor_args(end+1:end+2) = {"timeout", timeout}; endif waitfor (waitfor_args{:}); unwind_protect_cleanup if (ishandle (h) && isprop (h, "__uiwait_state__")) set (h, "__uiwait_state__", "none"); endif end_unwind_protect endif endfunction