Mercurial > hg > octave-nkf
view scripts/plot/__gnuplot_drawnow__.m @ 15848:424edeca3c66
Redo portions of file editor to use more signals/slots rather than casting.
* file-editor-tab.cc, file-editor-tab.h (file_editor_tab::~file_editor_tab):
Add. Delete lexer to prevent memory leak. Delete _edit_area to prevent memory
leak. (file_editor_tab::conditional_close): Add. Simple slot that uses QWidget
pointer as unique ID, not for function call.
(file_editor_tab::file_name_query): Add. Simple slot that signals file name to
whomever is connected. (file_editor_tab::find,
file_editor_tab : public QWidget): Removed use of exec() and keep a pointer to
the find_dialog as a member. Toggle hide()/show() via a connected slot to
toggle visibility as desired.
* file-editor.cc, file-editor.h, file-editor-tab.cc file-editor-tab.h
(file_editor : public file_editor_interface, file_editor_tab : public QWidget,
file_editor_tab::file_editor_tab, file_editor_tab::closeEvent,
file_editor_tab::load_file, file_editor_tab::new_file,
file_editor_tab::run_file): Remove _file_editor pointer member from
file_editor_tab and rid file_editor::get_main_window from file_editor. There
should be no need for such information about higher-level hierarchy inside
lower-level objects. (file_editor::request_open_file,
file_editor_tab::open_file): Move QFileDialog to file_editor::request_open_file
and delete file_editor_tab::open_file since most of the remaining functionality
is in file_editor_tab::load_file. (file_editor::active_editor_tab): Deleted.
(file_editor::fetab_change_request, file_editor_tab::change_editor_state):
Added to initiate a request for the editor tab to change focus.
(file_editor_tab::editor_state_changed): Added arguments to pass the copy
status and the directory path so that editor doesn't have to call functions for
such information. (file_editor::handle_editor_state_changed): Add copying
directory of the file_editor_tab to the current editing directory.
(file_editor::check_conflict_save, file_editor_tab::editor_check_conflict_save,
file_editor_tab::save_file_as, file_editor_tab::handle_save_file_as_answer):
Moved a portion of the save-file-as dialog mechanism to the file_editor where
all file names can be obtained to check for conflict with already open files.
The new signal indicates to the editor that a name check be done, and in turn
the editor signals the tab to save the file.
* main-window.cc, file-editor.cc, file-editor.h, file-editor-interface.h
(file_editor::terminal, file_editor : public file_editor_interface,
file_editor_interface : public QDockWidget): Since file_editor_tab no longer
looks up to main_window, remove _main_window and _terminal from file_editor and
file_editor_interface, as well as file_editor::terminal.
* file-editor-tab.cc (file_editor_tab::file_has_changed): Make the dialog
boxes non-modal and use slots to handle user answers.
(file_editor_tab::closeEvent): Remove portion that accesses upper hierarchy
member functions, can find better approaches.
(file_editor_tab::file_editor_tab): Make there no parent for QsciScintilla so
that window modality can be set to individual editor.
* file-editor-tab.cc, file-editor.cc (file_editor_tab::load_file): Use show()
member rather than exec() and set modality to window so that rest of
application may function. Return a QString with message rather than a boolean.
* file-editor-tab.cc, (file_editor_tab::file_has_changed): Remove static
variable alreadyAsking. Multiple file_editor_tabs are using this code so do
not want to block recognition of multiple file having changed on disk
(bug #37406). Instead, simply stop tracking via the file watcher.
(file_editor_tab::save_file, file_editor_tab::save_file_as,
file_editor_tab::handle_save_file_as_answer,
file_editor_tab::handle_save_file_as_answer_close): Added a remove_on_success
variable. Changed the QFileDialog to WindowModal and created slots to handle
file selected signal and finished signal. Signal/slot connects vary based upon
remove_on_success setting. (file_editor_tab::check_file_modified): Changed the
QFileDialog to NonModal and attach some slots. Editor tab can't be parent in
case deleted, so use read-only state of the editor area.
* file-editor-tab.h (file_editor_tab : public QWidget): New signals for
file_editor for tab and file name management. (file_editor_tab::get_file_name):
Delete.
* file-editor.h (file_editor : public file_editor_interface): Make QStringList
sessionFileNames a member of file_editor so that it can retain data between
file_editor_tab signals. Also can be used for checking precense of filenames
and prevent opening multiple copies (bug #36869) Added signals for file editor
tabs--settings_changed, fetab_close_request, and query_file_name. Three new
slots for tab and file name management.
* file-editor-interface.h, file-editor.h
(file_editor_interface::add_file_editor_tab, file_editor::add_file_editor_tab):
Made the text name for the tab an input variable.
* file-editor.cc (file_editor::~file_editor): Replace dynamic_cast with simple
signal querying all file editor tabs for file names which end up in
savedSessionTabs. (file_editor::handle_file_name_changed): Dynamic cast not
necessary since QObject and QWidget are compatible.
(file_editor::handle_tab_close_request): Replace dynamic_cast with signal to
request file_editor_tab with associated tabID tag should close.
(file_editor::handle_tab_remove_request): Rename of handle_tab_close_request.
Instead of dynamic cast, loop through pointers comparing QWidget* to QObject*,
if same tag remove tab via index and also delete which fixes a memory leak.
(file_editor::handle_add_filename_to_list): Simple slot that uses append() of
the list member functions. (file_editor::notice_settings): Rather than dynamic
cast, emit signal for the file_editor_tabs. (file_editor::add_file_editor_tab):
New variety of connections for improved flow. (file_editor::request_open_file):
Given error messages are made WindowModal, the tab shouldn't be delete if file
open is not successful. The file_editor_tab takes care of that.
(file_editor::request_open_file): Added check and message box for the
requested file already open in editor. For the non-interactive overloaded
version, open a message dialog box to tell the user file not found, e.g.,
could not find file in the settings when launched.
(file_editor::request_open_file): Inquire file names and update list before
checking for existence of files. Supply empty title to editor tab then have
file_editor_tab update name.
* file-editor-tab.h, file-editor-tab.cc, file-editor.cc
(file_editor_tab::run_file): New signal process_octave_code.
(file_editor::add_file_editor_tab): Connect signal process_octave_code to
file_editor's parent's slot handle_command_double_clicked.
author | Daniel J Sebald <daniel.sebald@ieee.org> |
---|---|
date | Sun, 23 Dec 2012 14:33:48 -0600 |
parents | 1ea5f8a4a914 |
children | 1339c964b527 |
line wrap: on
line source
## Copyright (C) 2005-2012 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} {} __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) if (nargin < 4) mono = false; endif if (nargin >= 3 && nargin <= 5) ## Produce various output formats, or redirect gnuplot stream to a ## debug file. plot_stream = []; fid = []; default_plot_stream = get (h, "__plot_stream__"); unwind_protect plot_stream = __gnuplot_open_stream__ (2, h); gnuplot_supports_term = __gnuplot_has_terminal__ (term, plot_stream); if (gnuplot_supports_term) enhanced = gnuplot_set_term (plot_stream (1), true, h, term, file); __go_draw_figure__ (h, plot_stream(1), enhanced, mono); if (nargin == 5) fid = fopen (debug_file, "wb"); enhanced = gnuplot_set_term (fid, true, h, term, file); __go_draw_figure__ (h, fid, enhanced, mono); endif else error ("__gnuplot_drawnow__: the gnuplot terminal, \"%s\", is not available", gnuplot_trim_term (term)); endif unwind_protect_cleanup set (h, "__plot_stream__", default_plot_stream); if (! isempty (plot_stream)) pclose (plot_stream(1)); if (numel (plot_stream) > 1) pclose (plot_stream(2)); endif if (numel (plot_stream) > 2) waitpid (plot_stream(3)); endif endif if (! isempty (fid)) fclose (fid); endif end_unwind_protect elseif (nargin == 1) ## Graphics terminal for display. plot_stream = get (h, "__plot_stream__"); if (isempty (plot_stream)) plot_stream = __gnuplot_open_stream__ (2, h); new_stream = true; else new_stream = false; endif term = gnuplot_default_term (plot_stream); if (strcmp (term, "dumb")) ## popen2 eats stdout of gnuplot, use temporary file instead dumb_tmp_file = tmpnam (); enhanced = gnuplot_set_term (plot_stream (1), new_stream, h, ... term, dumb_tmp_file); else enhanced = gnuplot_set_term (plot_stream (1), new_stream, h, term); endif __go_draw_figure__ (h, plot_stream (1), enhanced, mono); fflush (plot_stream (1)); if (strcmp (term, "dumb")) fid = -1; while (fid < 0) pause (0.1); fid = fopen (dumb_tmp_file, 'r'); endwhile ## reprint the plot on screen [a, count] = fscanf (fid, '%c', Inf); fclose (fid); if (count>0) if (a(1)==12) ## avoid ^L at the beginning a = a(2:end); endif puts (a); endif unlink (dumb_tmp_file); endif else print_usage (); endif endfunction function enhanced = gnuplot_set_term (plot_stream, new_stream, h, term, file) ## Generate the gnuplot "set terminal <term> ..." command. ## When "term" originates from print.m, it may include other options. if (nargin < 4) ## This supports the gnuplot graphics toolkit. term = gnuplot_default_term (plot_stream); opts_str = ""; else ## Get the one word terminal id and save the remaining as options to ## be passed on to gnuplot. The terminal may respect the graphics ## toolkit. [term, opts_str] = gnuplot_trim_term (term); term = lower (term); if (strcmp (term, "lua")) ## Replace "lua tikz" with just "tikz" term = "tikz"; opts_str = strrep (opts_str, "tikz", ""); endif endif if (strfind (opts_str, "noenhanced")) enhanced = false; else enhanced = gnuplot_is_enhanced_term (plot_stream, term); endif ## Set the terminal. if (! isempty (term)) if (enhanced) enh_str = "enhanced"; else enh_str = ""; endif if (! isempty (h) && isfigure (h)) ## Generate gnuplot title string for plot windows. if (output_to_screen (term) && ! strcmp (term, "dumb")) fig.numbertitle = get (h, "numbertitle"); fig.name = strrep (get (h, "name"), "\"", "\\\""); if (strcmp (get (h, "numbertitle"), "on")) title_str = sprintf ("Figure %d", h); else title_str = ""; endif if (! isempty (fig.name) && ! isempty (title_str)) title_str = sprintf ("%s: %s", title_str, fig.name); elseif (! isempty (fig.name) && isempty (title_str)) title_str = fig.name; endif if (! isempty (title_str)) title_str = sprintf ("title \"%s\"", title_str); endif if (strcmp (term, "aqua")) ## Adjust axes-label and tick-label spacing. opts_str = sprintf ("%s font \"%s,%d\"", opts_str, get (0, "defaultaxesfontname"), get (0, "defaultaxesfontsize") / 1.5); endif else title_str = ""; endif if (! (any (strfind (opts_str, " size ") > 0) || any (strfind (opts_str, "size ") == 1))) ## Get figure size in pixels. Rely on listener to handle coversion. units = get (h, "units"); unwind_protect set (h, "units", "pixels"); position_in_pixels = get (h, "position"); unwind_protect_cleanup set (h, "units", units); end_unwind_protect gnuplot_pos = position_in_pixels(1:2); gnuplot_size = position_in_pixels(3:4); if (! (output_to_screen (term) || any (strcmp (term, {"canvas", "emf", "gif", "jpeg", ... "pbm", "png", "pngcairo", "svg"})))) ## Convert to inches gnuplot_pos = gnuplot_pos / 72; gnuplot_size = gnuplot_size / 72; endif if (all (gnuplot_size > 0)) terminals_with_size = {"canvas", "emf", "epslatex", "fig", ... "gif", "jpeg", "latex", "pbm", "pdf", ... "pdfcairo", "postscript", "png", "pngcairo", ... "pstex", "pslatex", "svg", "tikz"}; if (__gnuplot_has_feature__ ("windows_figure_position")) terminals_with_size{end+1} = "windows"; endif if (__gnuplot_has_feature__ ("x11_figure_position")) terminals_with_size{end+1} = "x11"; endif if (__gnuplot_has_feature__ ("wxt_figure_size")) terminals_with_size{end+1} = "wxt"; endif switch (term) case terminals_with_size size_str = sprintf ("size %.12g,%.12g", gnuplot_size); case "tikz" size_str = sprintf ("size %gin,%gin", gnuplot_size); case "dumb" new_stream = 1; if (! isempty (getenv ("COLUMNS")) && ! isempty (getenv ("LINES"))) ## Let dumb use full text screen size (minus prompt lines). n = sprintf ("%i", -2 - length (find (sprintf ("%s", PS1) == "\n"))); ## n = the number of times \n appears in PS1 size_str = ["size ", getenv("COLUMNS"), ",", getenv("LINES"), n]; else ## Use the gnuplot default. size_str = ""; endif case {"aqua", "fig", "corel"} size_str = sprintf ("size %g %g", gnuplot_size); case "dxf" size_str = ""; otherwise size_str = ""; endswitch if ((strncmpi (term, "x11", 3) && __gnuplot_has_feature__ ("x11_figure_position")) || (strcmpi (term, "windows") && __gnuplot_has_feature__ ("windows_figure_position"))) ## X11/Windows allows the window to be positioned as well. units = get (0, "units"); unwind_protect set (0, "units", "pixels"); screen_size = get (0, "screensize")(3:4); unwind_protect_cleanup set (0, "units", units); end_unwind_protect if (all (screen_size > 0)) ## For X11/Windows, set the figure positon as well as the size ## gnuplot position is UL, Octave's is LL (same for screen/window) gnuplot_pos(2) = screen_size(2) - gnuplot_pos(2) - gnuplot_size(2); gnuplot_pos = max (gnuplot_pos, 1); size_str = sprintf ("%s position %d,%d", size_str, gnuplot_pos(1), gnuplot_pos(2)); endif endif else size_str = ""; warning ("gnuplot_set_term: size is zero"); endif else ## A specified size take priority over the figure properies. size_str = ""; endif else if (isempty (h)) disp ("gnuplot_set_term: figure handle is empty"); elseif (! isfigure (h)) disp ("gnuplot_set_term: not a figure handle"); endif title_str = ""; size_str = ""; endif ## Set the gnuplot terminal (type, enhanced, title, options & size). term_str = sprintf ("set terminal %s", term); if (! isempty (enh_str)) term_str = sprintf ("%s %s", term_str, enh_str); endif if (! isempty (title_str)) term_str = sprintf ("%s %s", term_str, title_str); endif if (isempty (strfind (term, "corel"))) if (! isempty (size_str) && new_stream) ## size_str comes after other options to permit specification of ## the canvas size for terminals cdr/corel. term_str = sprintf ("%s %s", term_str, size_str); endif if (nargin > 3 && ischar (opts_str)) ## Options must go last. term_str = sprintf ("%s %s", term_str, opts_str); endif else if (nargin > 3 && ischar (opts_str)) ## Options must go last. term_str = sprintf ("%s %s", term_str, opts_str); endif if (! isempty (size_str) && new_stream) ## size_str comes after other options to permit specification of ## the canvas size for terminals cdr/corel. term_str = sprintf ("%s %s", term_str, size_str); endif endif ## Work around the gnuplot feature of growing the x11 window and ## flickering window (x11, windows, & wxt) when the mouse and ## multiplot are set in gnuplot. fputs (plot_stream, "unset multiplot;\n"); flickering_terms = {"x11", "windows", "wxt", "dumb"}; if (! any (strcmp (term, flickering_terms)) || have_non_legend_axes (h) || numel (findall (h, "type", "image")) > 0) fprintf (plot_stream, "%s\n", term_str); if (nargin == 5) if (! isempty (file)) fprintf (plot_stream, "set output '%s';\n", file); endif endif fputs (plot_stream, "set multiplot;\n"); elseif (any (strcmp (term, flickering_terms))) fprintf (plot_stream, "%s\n", term_str); if (nargin == 5) if (! isempty (file)) fprintf (plot_stream, "set output '%s';\n", file); endif endif endif fprintf (plot_stream, "set termoption dashed\n") else ## gnuplot will pick up the GNUTERM environment variable itself ## so no need to set the terminal type if not also setting the ## figure title, enhanced mode, or position. endif endfunction function term = gnuplot_default_term (plot_stream) term = getenv ("GNUTERM"); ## If not specified, guess the terminal type. if (isempty (term) || ! __gnuplot_has_terminal__ (term, plot_stream)) if (isguirunning () && __gnuplot_has_terminal__ ("qt", plot_stream)) term = "qt"; elseif (ismac ()) term = "aqua"; elseif (! isunix ()) term = "windows"; elseif (! isempty (getenv ("DISPLAY"))) term = "x11"; else term = "dumb"; endif endif endfunction function [term, opts] = gnuplot_trim_term (string) ## Extract the terminal type and terminal options (from print.m) string = deblank (string); n = strfind (string, ' '); if (isempty (n)) term = string; opts = ""; else term = string(1:(n-1)); opts = string((n+1):end); endif endfunction function have_enhanced = gnuplot_is_enhanced_term (plot_stream, term) persistent enhanced_terminals; if (isempty (enhanced_terminals)) ## Don't include pstex, pslatex or epslatex here as the TeX commands ## should not be interpreted in that case. enhanced_terminals = {"aqua", "canvas", "dumb", "emf", "gif", "jpeg", ... "pdf", "pdfcairo", "pm", "png", "pngcairo", ... "postscript", "qt", "svg", "windows", "wxt", "x11"}; endif if (nargin < 2) ## Determine the default gnuplot terminal. term = gnuplot_default_term (plot_stream); endif have_enhanced = any (strncmp (enhanced_terminals, term, min (numel (term), 3))); endfunction function ret = output_to_screen (term) ret = any (strcmpi ({"aqua", "dumb", "pm", "qt", "windows", "wxt", "x11"}, term)); endfunction function retval = have_non_legend_axes (h) retval = false; all_axes = findall (h, "type", "axes"); if (! isempty (all_axes)) n_all_axes = numel (all_axes); all_axes_tags = get (all_axes, "tag"); legend_axes = strcmp (all_axes_tags, "legend"); if (! isempty (legend_axes)) n_legend_axes = sum (legend_axes); retval = (n_all_axes - n_legend_axes) > 1; endif endif endfunction ## No test needed for internal helper function. %!assert (1)