Mercurial > octave
diff scripts/ui/inputdlg.m @ 16933:e39f00a32dc7
maint: Use parentheses around condition for switch(),while(),if() statements.
* libinterp/corefcn/dirfns.cc, libinterp/octave-value/ov-fcn-handle.cc,
liboctave/array/Sparse.cc, scripts/image/rgb2ind.m, scripts/io/importdata.m,
scripts/io/strread.m, scripts/optimization/fminbnd.m,
scripts/optimization/sqp.m, scripts/plot/graphics_toolkit.m,
scripts/plot/hdl2struct.m, scripts/plot/legend.m, scripts/plot/print.m,
scripts/plot/printd.m, scripts/plot/private/__contour__.m,
scripts/plot/private/__go_draw_axes__.m, scripts/plot/struct2hdl.m,
scripts/polynomial/polyeig.m, scripts/sparse/bicg.m, scripts/specfun/ellipke.m,
scripts/special-matrix/gallery.m, scripts/ui/errordlg.m, scripts/ui/helpdlg.m,
scripts/ui/inputdlg.m, scripts/ui/listdlg.m, scripts/ui/questdlg.m,
scripts/ui/warndlg.m: Use parentheses around condition for
switch(),while(),if() statements.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 09 Jul 2013 14:04:05 -0700 |
| parents | 6ae555fc8c43 |
| children | bc924baa2c4e |
line wrap: on
line diff
--- a/scripts/ui/inputdlg.m Tue Jul 09 12:22:33 2013 -0700 +++ b/scripts/ui/inputdlg.m Tue Jul 09 14:04:05 2013 -0700 @@ -142,64 +142,66 @@ endfunction -%!demo -%! disp('- test inputdlg with prompt and caption only.'); -%! prompt = {'Width','Height','Depth'}; -%! dims = inputdlg ( prompt, 'Enter Box Dimensions' ); -%! if isempty(dims) -%! helpdlg('Canceled by user', 'Information'); -%! else -%! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3}); -%! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ... -%! str2num(dims{2}) * str2num(dims{3}) + ... -%! str2num(dims{1}) * str2num(dims{3})); -%! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); -%! end %!demo -%! disp('- test inputdlg with prescribed scalar (2 lines per text field) and defaults.'); -%! prompt = {'Width','Height','Depth'}; -%! default = {'1.1','2.2','3.3'}; -%! rc = 2; -%! dims = inputdlg ( prompt, 'Enter Box Dimensions',rc,default ); -%! if isempty(dims) -%! helpdlg('Canceled by user', 'Information'); -%! else -%! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3}); -%! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ... -%! str2num(dims{2}) * str2num(dims{3}) + ... -%! str2num(dims{1}) * str2num(dims{3})); -%! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); -%! end +%! disp ('- test inputdlg with prompt and caption only.'); +%! prompt = {'Width','Height','Depth'}; +%! dims = inputdlg (prompt, 'Enter Box Dimensions'); +%! if (isempty (dims)) +%! helpdlg ('Canceled by user', 'Information'); +%! else +%! volume = str2num (dims{1}) * str2num (dims{2}) * str2num (dims{3}); +%! surface = 2 * (str2num (dims{1}) * str2num (dims{2}) + ... +%! str2num (dims{2}) * str2num (dims{3}) + ... +%! str2num (dims{1}) * str2num (dims{3})); +%! helpdlg (sprintf ('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); +%! end + +%!demo +%! disp ('- test inputdlg with prescribed scalar (2 lines per text field) and defaults.'); +%! prompt = {'Width','Height','Depth'}; +%! default = {'1.1','2.2','3.3'}; +%! rc = 2; +%! dims = inputdlg (prompt, 'Enter Box Dimensions',rc,default); +%! if (isempty (dims)) +%! helpdlg ('Canceled by user', 'Information'); +%! else +%! volume = str2num (dims{1}) * str2num (dims{2}) * str2num (dims{3}); +%! surface = 2 * (str2num (dims{1}) * str2num (dims{2}) + ... +%! str2num (dims{2}) * str2num (dims{3}) + ... +%! str2num (dims{1}) * str2num (dims{3})); +%! helpdlg (sprintf ('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); +%! end %!demo -%! disp('- test inputdlg with prescribed vector [1,2,3] for # of lines per text field and defaults.'); -%! prompt = {'Width','Height','Depth'}; -%! default = {'1.10', '2.10', '3.10'}; -%! rc = [1,2,3]; % NOTE: must be an array -%! dims = inputdlg ( prompt, 'Enter Box Dimensions',rc,default ); -%! if isempty(dims) -%! helpdlg('Canceled by user', 'Information'); -%! else -%! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3}); -%! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ... -%! str2num(dims{2}) * str2num(dims{3}) + ... -%! str2num(dims{1}) * str2num(dims{3})); -%! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); -%! end +%! disp ('- test inputdlg with prescribed vector [1,2,3] for # of lines per text field and defaults.'); +%! prompt = {'Width','Height','Depth'}; +%! default = {'1.10', '2.10', '3.10'}; +%! rc = [1,2,3]; % NOTE: must be an array +%! dims = inputdlg (prompt, 'Enter Box Dimensions',rc,default); +%! if (isempty (dims)) +%! helpdlg ('Canceled by user', 'Information'); +%! else +%! volume = str2num (dims{1}) * str2num (dims{2}) * str2num (dims{3}); +%! surface = 2 * (str2num (dims{1}) * str2num (dims{2}) + ... +%! str2num (dims{2}) * str2num (dims{3}) + ... +%! str2num (dims{1}) * str2num (dims{3})); +%! helpdlg (sprintf ('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); +%! end %!demo -%! disp('- test inputdlg with prescribed row by column sizes and defaults.'); -%! prompt = {'Width','Height','Depth'}; -%! default = {'1.10', '2.20', '3.30'}; -%! rc = [1,10; 2,20; 3,30]; % NOTE: must be an array -%! dims = inputdlg ( prompt, 'Enter Box Dimensions',rc,default ); -%! if isempty(dims) -%! helpdlg('Canceled by user', 'Information'); -%! else -%! volume = str2num(dims{1}) * str2num(dims{2}) * str2num(dims{3}); -%! surface = 2 * (str2num(dims{1}) * str2num(dims{2}) + ... -%! str2num(dims{2}) * str2num(dims{3}) + ... -%! str2num(dims{1}) * str2num(dims{3})); -%! helpdlg(sprintf('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); -%! end +%! disp ('- test inputdlg with prescribed row by column sizes and defaults.'); +%! prompt = {'Width','Height','Depth'}; +%! default = {'1.10', '2.20', '3.30'}; +%! rc = [1,10; 2,20; 3,30]; % NOTE: must be an array +%! dims = inputdlg (prompt, 'Enter Box Dimensions',rc,default); +%! if (isempty (dims)) +%! helpdlg ('Canceled by user', 'Information'); +%! else +%! volume = str2num (dims{1}) * str2num (dims{2}) * str2num (dims{3}); +%! surface = 2 * (str2num (dims{1}) * str2num (dims{2}) + ... +%! str2num (dims{2}) * str2num (dims{3}) + ... +%! str2num (dims{1}) * str2num (dims{3})); +%! helpdlg (sprintf ('Results:\nVolume = %.3f\nSurface = %.3f', volume, surface), 'Box Dimensions'); +%! end +