octave-nkf: scripts/ui/inputdlg.m annotate

annotate scripts/ui/inputdlg.m @ 16551:6ae555fc8c43

Add questdlg dialog function and fix variety of dialog bugs. * octave-qt-link.cc (octave_qt_link::do_message_dialog): Change initializer from QString to QString::fromStdString(dlg). (octave_qt_link::do_question_dialog): New function. Make all buttons AcceptRole. Signal dialog creation. Go to wait state. Get dialog button result when awakened. (octave_qt_link::do_list_dialog): Change std string 'prompt_string' to std list of std string 'prompt'. Use make_qstring_list(prompt). (octave_qt_link::do_input_dialog): Change 'nr' and 'nc' to std list of float. Use QFloatList::fromStdList(nc). * octave-qt-link.h (octave_qt_link : QObject, public octave_link): Add member do_question_dialog. (octave_qt_link::do_list_dialog): Use std list of std string for prompt. (octave_qt_link::do_input_dialog): Change 'nr' and 'nc' to std list of float. * octave-link.cc (__octave_link_question_dialog__): New builtin. Translate args to inputs of octave_link::question_dialog function. (__octave_link_list_dialog__): Retain prompt string cell list as a std list of std string. (__octave_link_input_dialog__): Make 'nr' and 'nc' std list of float. * octave-link.h (octave_link::question_dialog, octave_link::do_question_dialog): Add. (octave_link::list_dialog, octave_link::do_list_dialog): Change prompt to std list of std string. (octave_link::input_dialog, octave_link::do_input_dialog): Change 'nr' and 'nc' to std list of float. * errordlg.m (errordlg): Make retval return variable. Add "error" icon as message_dialog input. * helpdlg.m (helpdlg): Make retval return variable. Add "help" icon as message_dialog input. * warndlg.m (warndlg): Add "warn" icon as message_dialog input. * message_dialog.m (message_dialog): Define default icon "none". Use dlg variable with icon variable as input to __octave_link_message_dialog__. Use __octave_link_enabled__ rather than return value. * inputdlg.m (inputdlg): Round up rowscols to integer. Replace iscell(cstr) with __octave_link_enabled__. * listdlg.m (listdlg): Correct indentation. Change default selmode from "multiple" to "Multiple". Make default prompt {}. Check valid selmode entry. Use __octave_link_enabled__ rather than ok return value. Remove FIXME note. Use Rich Text in prompt of demo. Add demo using ListSize. * questdlg.m (questdlg): Add case 0 to switch. Add error message for default button not matching options. In all cases, check that default button matches an button option. Add __octave_link_question_dialog__ call conditioned under __octave_link_enabled__. Add three demos. * dialog.cc (QUIWidgetCreator::dialog_finished): Remove. (QUIWidgetCreator::dialog_button_clicked): Test that button pointer is nonzero. Move dialog_result assignment and waitcondition.wakeAll here. (MessageDialog::MessageDialog): If title "", change to " ". Reverse order that buttons are installed. Remove signal 'finished' connection. (ListDialog::ListDialog): Change prompt from QString to QStringList. Make list items noneditable. Add Rich Text support to prompt, place RT <br> between prompt list lines. Use label for prompt. Disable select_all button if not "Multiple". Remove horizontal group box. If title "", change to " ". (InputDialog::InputDialog): Change 'nr' and 'nc' to QFloatList. Define pre-processor variables, then undefine. If title "", change to " ". * dialog.h (QUIWidgetCreator::signal_listviewQUI, WidgetCreator::create_listview): Change QString 'prompt_string' to QStringList 'prompt'. (QUIWidgetCreator::signal_inputlayout, QUIWidgetCreator::create_inputlayout): Use QFloatList for 'nr' and 'nc'. (QUIWidgetCreator::dialog_finished): Remove. (MessageDialog::closeEvent): New override, emitting buttonClicked(0). (ListDialog::ListDialog): Change QString 'prompt_string' to QStringList 'prompt'. (InputDialog::InputDialog): Use QFloatList for 'nr' and 'nc'. * main_window.cc, main_window.h: Make function call changes that match dialog.h changes. (main_window::find_files_finished): Remove unused 'button' variable.

author	Daniel J Sebald <daniel.sebald@ieee.org>
date	Mon, 22 Apr 2013 15:07:13 -0400
parents	7f2395651a1c
children	e39f00a32dc7

rev	line source
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	1 ## Copyright (C) 2010 Martin Hepperle
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	2 ##
15746 da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	3 ## This file is part of Octave.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	4 ##
15746 da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	5 ## Octave is free software; you can redistribute it and/or modify it
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	6 ## under the terms of the GNU General Public License as published by
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	7 ## the Free Software Foundation; either version 3 of the License, or (at
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	8 ## your option) any later version.
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	9 ##
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	10 ## Octave is distributed in the hope that it will be useful, but
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	13 ## General Public License for more details.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	14 ##
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	15 ## You should have received a copy of the GNU General Public License
15746 da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	16 ## along with Octave; see the file COPYING. If not, see
da26f72408a7 update copyright statements in newly added java files John W. Eaton <jwe@octave.org> parents: 15709 diff changeset	17 ## <http://www.gnu.org/licenses/>.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	18
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	19 ## -- texinfo --
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	20 ## @deftypefn {Function File} {@var{cstr} =} inputdlg (@var{prompt})
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	21 ## @deftypefnx {Function File} {@var{cstr} =} inputdlg (@var{prompt}, @var{title})
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	22 ## @deftypefnx {Function File} {@var{cstr} =} inputdlg (@var{prompt}, @var{title}, @var{rowscols})
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	23 ## @deftypefnx {Function File} {@var{cstr} =} inputdlg (@var{prompt}, @var{title}, @var{rowscols}, @var{defaults})
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	24 ## Return user input from a multi-textfield dialog box in a cell array
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	25 ## of strings, or an empty cell array if the dialog is closed by the
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	26 ## Cancel button.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	27 ##
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	28 ## Inputs:
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	29 ##
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	30 ## @table @var
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	31 ## @item prompt
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	32 ## A cell array with strings labeling each text field. This input is required.
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	33 ##
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	34 ## @item title
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	35 ## String to use for the caption of the dialog. The default is "Input Dialog".
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	36 ##
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	37 ## @item rowscols
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	38 ## Specifies the size of the text fields and can take three forms:
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	39 ##
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	40 ## @enumerate
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	41 ## @item a scalar value which defines the number of rows used for each
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	42 ## text field.
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	43 ##
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	44 ## @item a vector which defines the individual number of rows
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	45 ## used for each text field.
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	46 ##
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	47 ## @item a matrix which defines the individual number of rows and
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	48 ## columns used for each text field. In the matrix each row describes
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	49 ## a single text field. The first column specifies the number of input
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	50 ## rows to use and the second column specifies the text field width.
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	51 ## @end enumerate
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	52 ##
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	53 ## @item defaults
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	54 ## A list of default values to place in each text fields. It must be
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	55 ## a cell array of strings with the same size as @var{prompt}.
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	56 ## @end table
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	57 ## @seealso{errordlg, helpdlg, listdlg, msgbox, questdlg, warndlg}
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	58 ## @end deftypefn
acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	59
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	60 function cstr = inputdlg (prompt, title = "Input Dialog", varargin)
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	61
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	62 if (nargin < 1 \|\| nargin > 4)
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	63 print_usage ();
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	64 endif
15709 9fee0b741de6 Update Java dialog scrips to latest octave-forge status Philip Nienhuis <prnienhuis@users.sf.net> parents: 15625 diff changeset	65
9fee0b741de6 Update Java dialog scrips to latest octave-forge status Philip Nienhuis <prnienhuis@users.sf.net> parents: 15625 diff changeset	66 if (iscell (prompt))
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	67 ## Silently extract only char elements
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	68 prompt = prompt(cellfun ("ischar", prompt));
15709 9fee0b741de6 Update Java dialog scrips to latest octave-forge status Philip Nienhuis <prnienhuis@users.sf.net> parents: 15625 diff changeset	69 elseif (ischar (prompt))
9fee0b741de6 Update Java dialog scrips to latest octave-forge status Philip Nienhuis <prnienhuis@users.sf.net> parents: 15625 diff changeset	70 prompt = {prompt};
9fee0b741de6 Update Java dialog scrips to latest octave-forge status Philip Nienhuis <prnienhuis@users.sf.net> parents: 15625 diff changeset	71 else
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	72 error ("inputdlg: PROMPT must be a character string or cellstr array");
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	73 endif
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	74
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	75 if (! ischar (title))
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	76 error ("inputdlg: TITLE must be a character string");
15709 9fee0b741de6 Update Java dialog scrips to latest octave-forge status Philip Nienhuis <prnienhuis@users.sf.net> parents: 15625 diff changeset	77 endif
9fee0b741de6 Update Java dialog scrips to latest octave-forge status Philip Nienhuis <prnienhuis@users.sf.net> parents: 15625 diff changeset	78
15750 05c781cca57e use numel instead of length in newly imported java functions John W. Eaton <jwe@octave.org> parents: 15748 diff changeset	79 switch (numel (varargin))
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	80 case 0
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	81 linespec = 1;
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	82 defaults = cellstr (cell (size (prompt)));
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	83
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	84 case 1
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	85 linespec = varargin{1};
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	86 defaults = cellstr (cell (size (prompt)));
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	87
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	88 case 2
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	89 linespec = varargin{1};
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	90 defaults = varargin{2};
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	91 endswitch
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	92
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	93 ## specification of text field sizes as in Matlab
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	94 ## Matlab requires a matrix for linespec, not a cell array...
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	95 ## rc = [1,10; 2,20; 3,30];
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	96 ## c1 c2
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	97 ## r1 1 10 first text field is 1x10
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	98 ## r2 2 20 second text field is 2x20
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	99 ## r3 3 30 third text field is 3x30
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	100 if (isscalar (linespec))
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	101 ## only scalar value in lineTo, copy from linespec and add defaults
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	102 rowscols = zeros (columns (prompt), 2);
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	103 ## cols
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	104 rowscols(:,2) = 25;
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	105 rowscols(:,1) = linespec;
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	106 elseif (isvector (linespec))
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	107 ## only one column in lineTo, copy from vector linespec and add defaults
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	108 rowscols = zeros (columns (prompt), 2);
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	109 ## rows from colum vector linespec, columns are set to default
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	110 rowscols(:,2) = 25;
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	111 rowscols(:,1) = linespec(:);
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	112 elseif (ismatrix (linespec))
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	113 if (rows (linespec) == columns (prompt) && columns (linespec) == 2)
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	114 ## (rows x columns) match, copy array linespec
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	115 rowscols = linespec;
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	116 else
0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	117 error ("inputdlg: ROWSCOLS matrix does not match size of PROMPT");
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	118 endif
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	119 else
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	120 ## dunno
15772 0f1a143e5002 Overhaul scripts/java directory to conform to Octave core. Rik <rik@octave.org> parents: 15750 diff changeset	121 error ("inputdlg: unknown form of ROWSCOLS argument");
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	122 endif
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16512 diff changeset	123 rowscols = ceil (rowscols);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	124
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	125 ## convert numeric values in defaults cell array to strings
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	126 defs = cellfun (@num2str, defaults, "UniformOutput", false);
54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	127 rc = arrayfun (@num2str, rowscols, "UniformOutput", false);
15625 acf0addfc610 include Octave Forge java package in core Octave John W. Eaton <jwe@octave.org> parents: diff changeset	128
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16512 diff changeset	129 if (__octave_link_enabled__ ())
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16512 diff changeset	130 cstr = __octave_link_input_dialog__ (prompt, title, rowscols, defs);
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16512 diff changeset	131 elseif (__have_feature__ ("JAVA"))
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	132 user_inputs = javaMethod ("inputdlg", "org.octave.JDialogBox",
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16512 diff changeset	133 prompt, title, rc, defs);
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	134 if (isempty (user_inputs))
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	135 cstr = {};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	136 else
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	137 cstr = cellstr (user_inputs);
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	138 endif
16551 6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16512 diff changeset	139 else
6ae555fc8c43 Add questdlg dialog function and fix variety of dialog bugs. Daniel J Sebald <daniel.sebald@ieee.org> parents: 16512 diff changeset	140 error ("inputdlg is not available in this version of Octave");
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	141 endif
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	142
15748 54e8c2527a9e style and doc fixes for newly imported Java package .m files John W. Eaton <jwe@octave.org> parents: 15746 diff changeset	143 endfunction
16512 7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	144
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	145 %!demo
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	146 %! disp('- test inputdlg with prompt and caption only.');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	147 %! prompt = {'Width','Height','Depth'};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	148 %! dims = inputdlg ( prompt, 'Enter Box Dimensions' );
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	149 %! if isempty(dims)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	150 %! helpdlg('Canceled by user', 'Information');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	151 %! else
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	152 %! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3});
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	153 %! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	154 %! str2num(dims{2}) * str2num(dims{3}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	155 %! str2num(dims{1}) * str2num(dims{3}));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	156 %! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	157 %! end
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	158
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	159 %!demo
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	160 %! disp('- test inputdlg with prescribed scalar (2 lines per text field) and defaults.');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	161 %! prompt = {'Width','Height','Depth'};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	162 %! default = {'1.1','2.2','3.3'};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	163 %! rc = 2;
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	164 %! dims = inputdlg ( prompt, 'Enter Box Dimensions',rc,default );
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	165 %! if isempty(dims)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	166 %! helpdlg('Canceled by user', 'Information');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	167 %! else
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	168 %! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3});
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	169 %! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	170 %! str2num(dims{2}) * str2num(dims{3}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	171 %! str2num(dims{1}) * str2num(dims{3}));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	172 %! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	173 %! end
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	174
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	175 %!demo
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	176 %! disp('- test inputdlg with prescribed vector [1,2,3] for # of lines per text field and defaults.');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	177 %! prompt = {'Width','Height','Depth'};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	178 %! default = {'1.10', '2.10', '3.10'};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	179 %! rc = [1,2,3]; % NOTE: must be an array
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	180 %! dims = inputdlg ( prompt, 'Enter Box Dimensions',rc,default );
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	181 %! if isempty(dims)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	182 %! helpdlg('Canceled by user', 'Information');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	183 %! else
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	184 %! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3});
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	185 %! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	186 %! str2num(dims{2}) * str2num(dims{3}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	187 %! str2num(dims{1}) * str2num(dims{3}));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	188 %! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	189 %! end
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	190
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	191 %!demo
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	192 %! disp('- test inputdlg with prescribed row by column sizes and defaults.');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	193 %! prompt = {'Width','Height','Depth'};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	194 %! default = {'1.10', '2.20', '3.30'};
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	195 %! rc = [1,10; 2,20; 3,30]; % NOTE: must be an array
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	196 %! dims = inputdlg ( prompt, 'Enter Box Dimensions',rc,default );
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	197 %! if isempty(dims)
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	198 %! helpdlg('Canceled by user', 'Information');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	199 %! else
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	200 %! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3});
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	201 %! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	202 %! str2num(dims{2}) * str2num(dims{3}) + ...
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	203 %! str2num(dims{1}) * str2num(dims{3}));
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	204 %! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions');
7f2395651a1c dialog boxes with Qt widgets Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> parents: 16505 diff changeset	205 %! end

Mercurial > octave-nkf

annotate scripts/ui/inputdlg.m @ 16551:6ae555fc8c43