Mercurial > hg > octave-nkf
view scripts/plot/text.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 | c2dbdeaa25df |
children | 100a7bd2590e |
line wrap: on
line source
## Copyright (C) 2007-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} {} text (@var{x}, @var{y}, @var{label}) ## @deftypefnx {Function File} {} text (@var{x}, @var{y}, @var{z}, @var{label}) ## @deftypefnx {Function File} {} text (@var{x}, @var{y}, @var{label}, @var{p1}, @var{v1}, @dots{}) ## @deftypefnx {Function File} {} text (@var{x}, @var{y}, @var{z}, @var{label}, @var{p1}, @var{v1}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} text (@dots{}) ## Create a text object with text @var{label} at position @var{x}, ## @var{y}, @var{z} on the current axes. Property-value pairs following ## @var{label} may be used to specify the appearance of the text. ## ## The optional return value @var{h} is a graphics handle to the created text ## object. ## @end deftypefn ## Author: jwe function h = text (varargin) nargs = nargin; offset = 0; if (nargs > 2 && isnumeric (varargin{1}) && isnumeric (varargin{2})) x = varargin{1}; y = varargin{2}; offset = 3; if (nargin > 3 && isnumeric (varargin{3})) z = varargin{3}; offset = 4; else z = zeros (size (x)); offset = 3; endif label = varargin{offset}; varargin(1:offset) = []; nx = numel (x); ny = numel (y); nz = numel (z); if (ischar (label) || isnumeric (label)) nt = rows (label); if (nx > 1 && nt == 1) ## Mutiple text objects with same string label = repmat ({label}, [nx, 1]); nt = nx; elseif (nx > 1 && nt == nx) ## Mutiple text objects with different strings label = cellstr (label); elseif (ischar (label)) ## Single text object with one or more lines label = {label}; endif elseif (iscell (label)) nt = numel (label); if (nx > 1 && nt == 1) label = repmat ({label}, [nx, 1]); nt = nx; elseif (! (nx > 1 && nt == nx)) label = {label}; nt = 1; endif else error ("text: expecting LABEL to be a character string or cell array of character strings"); endif else x = y = z = 0; nx = ny = nz = 1; label = {""}; nt = 1; endif if (rem (numel (varargin), 2) == 0) if (nx == ny && nx == nz && (nt == nx || nt == 1 || nx == 1)) pos = [x(:), y(:), z(:)]; ca = gca (); tmp = zeros (nt, 1); if (nx == 1) ## TODO - Modify __go_text__() to accept cell-strings tmp = __go_text__ (ca, "string", "foobar", varargin{:}, "position", pos); set (tmp, "string", label{1}); elseif (nt == nx) for n = 1:nt tmp(n) = __go_text__ (ca, "string", label{n}, varargin{:}, "position", pos(n,:)); endfor __request_drawnow__ (); else error ("text: dimension mismatch for coordinates and LABEL"); endif elseif (nt == nx || nt == 1 || nx == 1) error ("text: dimension mismatch for coordinates"); else error ("text: mismatch betwween coordinates and strings"); endif if (nargout > 0) h = tmp; endif else print_usage (); endif endfunction %!demo %! clf; %! ha = {'left', 'center', 'right'}; %! va = {'bottom', 'middle', 'top'}; %! x = [0.25 0.5 0.75]; %! y = x; %! for t = 0:30:359; %! for nh = 1:numel (ha) %! for nv = 1:numel (va) %! text (x(nh), y(nv), 'Hello World', ... %! 'rotation', t, ... %! 'horizontalalignment', ha{nh}, ... %! 'verticalalignment', va{nv}); %! end %! end %! end %! set (gca, 'xtick', [0.25, 0.5, 0.75], ... %! 'xticklabel', ha, ... %! 'ytick', [0.25, 0.5, 0.75], ... %! 'yticklabel', va); %! axis ([0 1 0 1]); %! xlabel ('horizontal alignment'); %! ylabel ('vertical alignment'); %! title ('text alignment and rotation (0:30:360 degrees)'); %!demo %! clf; %! h = mesh (peaks, 'edgecolor', 0.7 * [1 1 1], ... %! 'facecolor', 'none', ... %! 'facealpha', 0); %! for t = 0:45:359; %! text (25, 25, 0, 'Vertical Alignment = Bottom', ... %! 'rotation', t, ... %! 'horizontalalignment', 'left', ... %! 'verticalalignment', 'bottom'); %! end %! caxis ([-100 100]); %! title ('Vertically Aligned at Bottom'); %!demo %! clf; %! axis ([0 8 0 8]); %! title (['1st title';'2nd title']); %! xlabel (['1st xlabel';'2nd xlabel']); %! ylabel (['1st ylabel';'2nd ylabel']); %! text (4, 4, {'Hello', 'World'}, ... %! 'horizontalalignment', 'center', ... %! 'verticalalignment', 'middle'); %! grid on; %!demo %! clf; %! h = mesh (peaks (), 'edgecolor', 0.7 * [1 1 1], ... %! 'facecolor', 'none', ... %! 'facealpha', 0); %! title (['1st title';'2nd title']); %! xlabel (['1st xlabel';'2nd xlabel']); %! ylabel (['1st ylabel';'2nd ylabel']); %! zlabel (['1st zlabel';'2nd zlabel']); %! text (0, 0, 5, {'Hello', 'World'}, ... %! 'horizontalalignment', 'center', ... %! 'verticalalignment', 'middle'); %! hold on; %! plot3 (0, 0, 5, '+k'); %!demo %! clf; %! h = text (0.5, 0.3, 'char'); %! assert ('char', class (get (h, 'string'))); %! h = text (0.5, 0.4, ['char row 1'; 'char row 2']); %! assert ('char', class (get (h, 'string'))); %! h = text (0.5, 0.6, {'cell2str (1,1)', 'cell2str (1,2)'; 'cell2str (2,1)', 'cell2str (2,2)'}); %! assert ('cell', class (get (h, 'string'))); %! h = text (0.5, 0.8, 'foobar'); %! set (h, 'string', 1:3); %! h = text ([0.1, 0.1], [0.3, 0.4], 'one string & two objects'); %! assert ('char', class (get (h(1), 'string'))); %! assert ('char', class (get (h(2), 'string'))); %! h = text ([0.1, 0.1], [0.5, 0.6], {'one cellstr & two objects'}); %! assert ('cell', class (get (h(1), 'string'))); %! assert ('cell', class (get (h(2), 'string'))); %! h = text ([0.1, 0.1], [0.7, 0.8], {'cellstr 1 object 1', 'cellstr 2 object 2'}); %! assert ('char', class (get (h(1), 'string'))); %! assert ('char', class (get (h(2), 'string'))); %! h = text ([0.1, 0.1], [0.1, 0.2], ['1st string & 1st object'; '2nd string & 2nd object']); %! assert ('char', class (get (h(1), 'string'))); %! assert ('char', class (get (h(2), 'string'))); %! h = text (0.7, 0.6, 'single string'); %! assert ('char', class (get (h, 'string'))); %! h = text (0.7, 0.5, {'single cell-string'}); %! assert ('cell', class (get (h, 'string'))); %! xlabel (1:2); %! ylabel (1:2); %! title (1:2); %!test %! hf = figure ("visible", "off"); %! unwind_protect %! h = text (0.5, 0.3, "char"); %! assert ("char", class (get (h, "string"))); %! h = text (0.5, 0.4, ["char row 1"; "char row 2"]); %! assert ("char", class (get (h, "string"))); %! h = text (0.5, 0.6, {"cell2str (1,1)", "cell2str (1,2)"; "cell2str (2,1)", "cell2str (2,2)"}); %! assert ("cell", class (get (h, "string"))); %! h = text (0.5, 0.8, "foobar"); %! set (h, "string", 1:3); %! h = text ([0.1, 0.1], [0.3, 0.4], "one string & two objects"); %! assert ("char", class (get (h(1), "string"))); %! assert ("char", class (get (h(2), "string"))); %! h = text ([0.1, 0.1], [0.5, 0.6], {"one cellstr & two objects"}); %! assert ("cell", class (get (h(1), "string"))); %! assert ("cell", class (get (h(2), "string"))); %! h = text ([0.1, 0.1], [0.7, 0.8], {"cellstr 1 object 1", "cellstr 2 object 2"}); %! assert ("char", class (get (h(1), "string"))); %! assert ("char", class (get (h(2), "string"))); %! h = text ([0.1, 0.1], [0.1, 0.2], ["1st string & 1st object"; "2nd string & 2nd object"]); %! assert ("char", class (get (h(1), "string"))); %! assert ("char", class (get (h(2), "string"))); %! h = text (0.7, 0.6, "single string"); %! assert ("char", class (get (h, "string"))); %! h = text (0.7, 0.5, {"single cell-string"}); %! assert ("cell", class (get (h, "string"))); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect