Mercurial > hg > octave-lyh
view scripts/plot/newplot.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 | be7bfd59300a |
| children | 72c96de7a403 |
line wrap: on
line source
## Copyright (C) 2005-2011 John W. Eaton ## ## 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} {} newplot () ## Prepare graphics engine to produce a new plot. This function is ## called at the beginning of all high-level plotting functions. ## It is not normally required in user programs. ## @end deftypefn function newplot () if (nargin == 0) cf = gcf (); fnp = get (cf, "nextplot"); switch (fnp) ## FIXME -- probably we should do more than validate the nextplot ## property value... case "new" case "add" case "replacechildren" delete (get (cf, "children")); case "replace" otherwise error ("newplot: unrecognized nextplot property for current figure"); endswitch ca = gca (); anp = get (ca, "nextplot"); if (strcmp (get (ca, "__hold_all__"), "off")) __next_line_color__ (true); __next_line_style__ (true); else __next_line_color__ (false); __next_line_style__ (false); endif switch (anp) case "new" case "add" case "replacechildren" delete (get (ca, "children")); case "replace" __go_axes_init__ (ca, "replace"); __request_drawnow__ (); otherwise error ("newplot: unrecognized nextplot property for current axes"); endswitch else print_usage (); endif endfunction %!test %! hf = figure ("visible", "off"); %! unwind_protect %! p = plot ([0, 1]); %! newplot; %! assert (isempty (get (gca, "children"))); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect