Mercurial > hg > octave-nkf
view scripts/plot/plot.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 | fee211d42c5c |
children | 08dd9458684a |
line wrap: on
line source
## Copyright (C) 1993-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} {} plot (@var{y}) ## @deftypefnx {Function File} {} plot (@var{x}, @var{y}) ## @deftypefnx {Function File} {} plot (@var{x}, @var{y}, @var{property}, @var{value}, @dots{}) ## @deftypefnx {Function File} {} plot (@var{x}, @var{y}, @var{fmt}) ## @deftypefnx {Function File} {} plot (@var{h}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} plot (@dots{}) ## Produce two-dimensional plots. ## ## Many different combinations of arguments are possible. The simplest ## form is ## ## @example ## plot (@var{y}) ## @end example ## ## @noindent ## where the argument is taken as the set of @var{y} coordinates and the ## @var{x} coordinates are taken to be the indices of the elements ## starting with 1. ## ## To save a plot, in one of several image formats such as PostScript ## or PNG, use the @code{print} command. ## ## If more than one argument is given, they are interpreted as ## ## @example ## plot (@var{y}, @var{property}, @var{value}, @dots{}) ## @end example ## ## @noindent ## or ## ## @example ## plot (@var{x}, @var{y}, @var{property}, @var{value}, @dots{}) ## @end example ## ## @noindent ## or ## ## @example ## plot (@var{x}, @var{y}, @var{fmt}, @dots{}) ## @end example ## ## @noindent ## and so on. Any number of argument sets may appear. The @var{x} and ## @var{y} values are interpreted as follows: ## ## @itemize @bullet ## @item ## If a single data argument is supplied, it is taken as the set of @var{y} ## coordinates and the @var{x} coordinates are taken to be the indices of ## the elements, starting with 1. ## ## @item ## If the @var{x} is a vector and @var{y} is a matrix, then ## the columns (or rows) of @var{y} are plotted versus @var{x}. ## (using whichever combination matches, with columns tried first.) ## ## @item ## If the @var{x} is a matrix and @var{y} is a vector, ## @var{y} is plotted versus the columns (or rows) of @var{x}. ## (using whichever combination matches, with columns tried first.) ## ## @item ## If both arguments are vectors, the elements of @var{y} are plotted versus ## the elements of @var{x}. ## ## @item ## If both arguments are matrices, the columns of @var{y} are plotted ## versus the columns of @var{x}. In this case, both matrices must have ## the same number of rows and columns and no attempt is made to transpose ## the arguments to make the number of rows match. ## ## If both arguments are scalars, a single point is plotted. ## @end itemize ## ## Multiple property-value pairs may be specified, but they must appear ## in pairs. These arguments are applied to the lines drawn by ## @code{plot}. ## ## If the @var{fmt} argument is supplied, it is interpreted as ## follows. If @var{fmt} is missing, the default gnuplot line style ## is assumed. ## ## @table @samp ## @item - ## Set lines plot style (default). ## ## @item . ## Set dots plot style. ## ## @item @var{n} ## Interpreted as the plot color if @var{n} is an integer in the range 1 to ## 6. ## ## @item @var{nm} ## If @var{nm} is a two digit integer and @var{m} is an integer in the ## range 1 to 6, @var{m} is interpreted as the point style. This is only ## valid in combination with the @code{@@} or @code{-@@} specifiers. ## ## @item @var{c} ## If @var{c} is one of @code{"k"} (black), @code{"r"} (red), @code{"g"} ## (green), @code{"b"} (blue), @code{"m"} (magenta), @code{"c"} (cyan), ## or @code{"w"} (white), it is interpreted as the line plot color. ## ## @item ";title;" ## Here @code{"title"} is the label for the key. ## ## @item + ## @itemx * ## @itemx o ## @itemx x ## @itemx ^ ## Used in combination with the points or linespoints styles, set the point ## style. ## ## @item @@ ## Select the next unused point style. ## @end table ## ## The @var{fmt} argument may also be used to assign key titles. ## To do so, include the desired title between semi-colons after the ## formatting sequence described above, e.g., "+3;Key Title;" ## Note that the last semi-colon is required and will generate an error if ## it is left out. ## ## Here are some plot examples: ## ## @example ## plot (x, y, "@@12", x, y2, x, y3, "4", x, y4, "+") ## @end example ## ## This command will plot @code{y} with points of type 2 (displayed as ## @samp{+}) and color 1 (red), @code{y2} with lines, @code{y3} with lines of ## color 4 (magenta) and @code{y4} with points displayed as @samp{+}. ## ## @example ## plot (b, "*", "markersize", 3) ## @end example ## ## This command will plot the data in the variable @code{b}, ## with points displayed as @samp{*} with a marker size of 3. ## ## @example ## @group ## t = 0:0.1:6.3; ## plot (t, cos(t), "-;cos(t);", t, sin(t), "+3;sin(t);"); ## @end group ## @end example ## ## This will plot the cosine and sine functions and label them accordingly ## in the key. ## ## If the first argument is an axis handle, then plot into these axes, ## rather than the current axis handle returned by @code{gca}. ## ## The optional return value @var{h} is a graphics handle to the created plot. ## ## @seealso{semilogx, semilogy, loglog, polar, mesh, contour, bar, ## stairs, errorbar, xlabel, ylabel, title, print} ## @end deftypefn ## Author: jwe function retval = plot (varargin) [h, varargin, nargs] = __plt_get_axis_arg__ ("plot", varargin{:}); if (nargs < 1) print_usage (); endif oldh = gca (); unwind_protect axes (h); newplot (); tmp = __plt__ ("plot", h, varargin{:}); unwind_protect_cleanup axes (oldh); end_unwind_protect if (nargout > 0) retval = tmp; endif endfunction %!demo %! x = 1:5; y = 1:5; %! plot (x,y,'g'); %! title ('plot of green line at 45 degrees'); %!demo %! x = 1:5; y = 1:5; %! plot (x,y,'g*'); %! title ('plot of green stars along a line at 45 degrees'); %!demo %! x1 = 1:5; y1 = 1:5; %! x2 = 5:9; y2 = 5:-1:1; %! plot (x1,y1,'bo-', x2,y2,'rs-'); %! axis ('tight'); %! title ('plot of blue circles ascending and red squares descending with connecting lines drawn');