Mercurial > hg > octave-nkf
view scripts/plot/errorbar.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 | 4506eade9f04 |
children | 64e7bb01fce2 |
line wrap: on
line source
## Copyright (C) 2000-2012 Teemu Ikonen ## ## 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} {} errorbar (@var{args}) ## This function produces two-dimensional plots with errorbars. Many ## different combinations of arguments are possible. The simplest form is ## ## @example ## errorbar (@var{y}, @var{ey}) ## @end example ## ## @noindent ## where the first argument is taken as the set of @var{y} coordinates ## and the second argument @var{ey} is taken as the errors of the ## @var{y} values. @var{x} coordinates are taken to be the indices ## of the elements, starting with 1. ## ## If more than two arguments are given, they are interpreted as ## ## @example ## errorbar (@var{x}, @var{y}, @dots{}, @var{fmt}, @dots{}) ## @end example ## ## @noindent ## where after @var{x} and @var{y} there can be up to four error ## parameters such as @var{ey}, @var{ex}, @var{ly}, @var{uy}, etc., ## depending on the plot type. Any number of argument sets may appear, ## as long as they are separated with a format string @var{fmt}. ## ## If @var{y} is a matrix, @var{x} and error parameters must also be matrices ## having same dimensions. The columns of @var{y} are plotted versus the ## corresponding columns of @var{x} and errorbars are drawn from ## the corresponding columns of error parameters. ## ## If @var{fmt} is missing, yerrorbars ("~") plot style is assumed. ## ## If the @var{fmt} argument is supplied, it is interpreted as in ## normal plots. In addition, @var{fmt} may include an errorbar style ## which must precede the line and marker format. The following plot ## styles are supported by errorbar: ## ## @table @samp ## @item ~ ## Set yerrorbars plot style (default). ## ## @item > ## Set xerrorbars plot style. ## ## @item ~> ## Set xyerrorbars plot style. ## ## @item # ## Set boxes plot style. ## ## @item #~ ## Set boxerrorbars plot style. ## ## @item #~> ## Set boxxyerrorbars plot style. ## @end table ## ## Examples: ## ## @example ## errorbar (@var{x}, @var{y}, @var{ex}, ">") ## @end example ## ## @noindent ## produces an xerrorbar plot of @var{y} versus @var{x} with @var{x} ## errorbars drawn from @var{x}-@var{ex} to @var{x}+@var{ex}. ## ## @example ## @group ## errorbar (@var{x}, @var{y1}, @var{ey}, "~", ## @var{x}, @var{y2}, @var{ly}, @var{uy}) ## @end group ## @end example ## ## @noindent ## produces yerrorbar plots with @var{y1} and @var{y2} versus @var{x}. ## Errorbars for @var{y1} are drawn from @var{y1}-@var{ey} to ## @var{y1}+@var{ey}, errorbars for @var{y2} from @var{y2}-@var{ly} to ## @var{y2}+@var{uy}. ## ## @example ## @group ## errorbar (@var{x}, @var{y}, @var{lx}, @var{ux}, ## @var{ly}, @var{uy}, "~>") ## @end group ## @end example ## ## @noindent ## produces an xyerrorbar plot of @var{y} versus @var{x} in which ## @var{x} errorbars are drawn from @var{x}-@var{lx} to @var{x}+@var{ux} ## and @var{y} errorbars from @var{y}-@var{ly} to @var{y}+@var{uy}. ## @seealso{semilogxerr, semilogyerr, loglogerr} ## @end deftypefn ## Created: 18.7.2000 ## Author: Teemu Ikonen <tpikonen@pcu.helsinki.fi> ## Keywords: errorbar, plotting function retval = errorbar (varargin) [h, varargin] = __plt_get_axis_arg__ ("errorbar", varargin{:}); oldh = gca (); unwind_protect axes (h); newplot (); tmp = __errcomm__ ("errorbar", h, varargin{:}); if (nargout > 0) retval = tmp; endif unwind_protect_cleanup axes (oldh); end_unwind_protect endfunction %!demo %! clf; %! rand_1x11_data1 = [0.82712, 0.50325, 0.35613, 0.77089, 0.20474, 0.69160, 0.30858, 0.88225, 0.35187, 0.14168, 0.54270]; %! rand_1x11_data2 = [0.506375, 0.330106, 0.017982, 0.859270, 0.140641, 0.327839, 0.275886, 0.162453, 0.807592, 0.318509, 0.921112]; %! errorbar (0:10, rand_1x11_data1, 0.25*rand_1x11_data2); %!demo %! clf; %! rand_1x11_data3 = [0.423650, 0.142331, 0.213195, 0.129301, 0.975891, 0.012872, 0.635327, 0.338829, 0.764997, 0.401798, 0.551850]; %! rand_1x11_data4 = [0.682566, 0.456342, 0.132390, 0.341292, 0.108633, 0.601553, 0.040455, 0.146665, 0.309187, 0.586291, 0.540149]; %! errorbar (0:10, rand_1x11_data3, rand_1x11_data4, '>'); %!demo %! clf; %! x = 0:0.5:2*pi; %! err = x/100; %! y1 = sin (x); %! y2 = cos (x); %! hg = errorbar (x, y1, err, '~', x, y2, err, '>'); %!demo %! clf; %! x = 0:0.5:2*pi; %! err = x/100; %! y1 = sin (x); %! y2 = cos (x); %! hg = errorbar (x, y1, err, err, '#r', x, y2, err, err, '#~'); %!demo %! clf; %! x = 0:0.5:2*pi; %! err = x/100; %! y1 = sin (x); %! y2 = cos (x); %! hg = errorbar (x, y1, err, err, err, err, '~>', ... %! x, y2, err, err, err, err, '#~>-*');