Mercurial > hg > octave-terminal
changeset 12221:a91037b36b4c
rename gnuplot_drawnow to __gnuplot_drawnow__
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 30 Jan 2011 04:22:39 -0500 |
parents | 052bd17c3e74 |
children | 91fa3871e9bf |
files | scripts/ChangeLog scripts/plot/__gnuplot_drawnow__.m scripts/plot/gnuplot_drawnow.m scripts/plot/module.mk src/ChangeLog src/graphics.cc |
diffstat | 5 files changed, 24 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2011-01-30 John W. Eaton <jwe@octave.org> + + * plot/__gnuplot_drawnow__.m: Rename from gnuplot_drawnow.m + Update doc string and error message with new name. + * plot/module.mk (plot_FCN_FILES): Update list. + 2011-01-30 Petr Mikulik <mikulik@physics.muni.cz> * plot/__fltk_ginput__.m (ginput_aggregator): New arg, button.
rename from scripts/plot/gnuplot_drawnow.m rename to scripts/plot/__gnuplot_drawnow__.m --- a/scripts/plot/gnuplot_drawnow.m +++ b/scripts/plot/__gnuplot_drawnow__.m @@ -17,17 +17,13 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {} drawnow () -## Update and display the current graphics. -## -## Octave automatically calls drawnow just before printing a prompt, -## when @code{sleep} or @code{pause} is called, or while waiting for -## command-line input. +## @deftypefn {Function File} {} __gnuplot_drawnow__ (@var{h}, @var{term}, @var{file}, @var{mono}, @var{debug_file}) +## Undocumented internal function. ## @end deftypefn ## Author: jwe -function gnuplot_drawnow (h, term, file, mono, debug_file) +function __gnuplot_drawnow__ (h, term, file, mono, debug_file) if (nargin < 4) mono = false; @@ -51,7 +47,7 @@ __go_draw_figure__ (h, fid, enhanced, mono); endif else - error ("gnuplot_drawnow: the gnuplot terminal, \"%s\", is not available", + error ("__gnuplot_drawnow__: the gnuplot terminal, \"%s\", is not available", gnuplot_trim_term (term)); endif unwind_protect_cleanup
--- a/scripts/plot/module.mk +++ b/scripts/plot/module.mk @@ -35,10 +35,13 @@ plot_FCN_FILES = \ plot/__fltk_ginput__.m \ + plot/__fltk_print__.m \ + plot/__gnuplot_drawnow__.m \ plot/__gnuplot_get_var__.m \ plot/__gnuplot_ginput__.m \ plot/__gnuplot_has_feature__.m \ plot/__gnuplot_open_stream__.m \ + plot/__gnuplot_print__.m \ plot/__gnuplot_version__.m \ plot/__go_close_all__.m \ plot/__go_draw_axes__.m \ @@ -47,12 +50,12 @@ plot/__next_line_color__.m \ plot/__next_line_style__.m \ plot/__plt_get_axis_arg__.m \ + plot/__print_parse_opts__.m \ plot/allchild.m \ plot/ancestor.m \ plot/area.m \ plot/axes.m \ plot/axis.m \ - plot/graphics_toolkit.m \ plot/bar.m \ plot/barh.m \ plot/box.m \ @@ -95,7 +98,7 @@ plot/gcbo.m \ plot/gcf.m \ plot/ginput.m \ - plot/gnuplot_drawnow.m \ + plot/graphics_toolkit.m \ plot/grid.m \ plot/gtext.m \ plot/hggroup.m \ @@ -134,9 +137,6 @@ plot/plotyy.m \ plot/polar.m \ plot/print.m \ - plot/__gnuplot_print__.m \ - plot/__fltk_print__.m \ - plot/__print_parse_opts__.m \ plot/quiver.m \ plot/quiver3.m \ plot/refresh.m \ @@ -170,8 +170,8 @@ plot/title.m \ plot/uigetdir.m \ plot/uigetfile.m \ + plot/uimenu.m \ plot/uiputfile.m \ - plot/uimenu.m \ plot/view.m \ plot/waitforbuttonpress.m \ plot/whitebg.m \
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-01-30 John W. Eaton <jwe@octave.org> + + * graphics.cc (gnuplot_toolkit::redraw): Call __gnuplot_drawnow__, + not gnuplot_drawnow. + (gnuplot_toolkit::print_figure): Likewise. + 2011-01-30 John W. Eaton <jwe@octave.org> * Makefile.am (OCTAVE_LIBS): Remove $(ARPACK_LDFLAGS) and
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -2340,7 +2340,7 @@ { octave_value_list args; args(0) = go.get_handle ().as_octave_value (); - feval ("gnuplot_drawnow", args); + feval ("__gnuplot_drawnow__", args); } void print_figure (const graphics_object& go, const std::string& term, @@ -2354,7 +2354,7 @@ args(2) = file; args(1) = term; args(0) = go.get_handle ().as_octave_value (); - feval ("gnuplot_drawnow", args); + feval ("__gnuplot_drawnow__", args); } Matrix get_canvas_size (const graphics_handle&) const