Mercurial > octave
comparison scripts/gui/inputdlg.m @ 27957:c20b7290c778
merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 17 Jan 2020 13:27:27 -0600 |
parents | bd51beb6205e 2310164737b3 |
children | 0a5b15007766 |
comparison
equal
deleted
inserted
replaced
27955:179ece36a2eb | 27957:c20b7290c778 |
---|---|
143 rowscols = linespec; | 143 rowscols = linespec; |
144 elseif (isvector (linespec)) | 144 elseif (isvector (linespec)) |
145 if (numel (linespec) == numel (prompt)) | 145 if (numel (linespec) == numel (prompt)) |
146 ## only one column in lineTo, copy from vector linespec and add defaults | 146 ## only one column in lineTo, copy from vector linespec and add defaults |
147 rowscols = zeros (numel (prompt), 2); | 147 rowscols = zeros (numel (prompt), 2); |
148 ## rows from colum vector linespec, columns are set to default | 148 ## rows from column vector linespec, columns are set to default |
149 rowscols(:,2) = 25; | 149 rowscols(:,2) = 25; |
150 rowscols(:,1) = linespec(:); | 150 rowscols(:,1) = linespec(:); |
151 else | 151 else |
152 error ("inputdlg: ROWSCOLS vector does not match size of PROMPT"); | 152 error ("inputdlg: ROWSCOLS vector does not match size of PROMPT"); |
153 endif | 153 endif |