Mercurial > hg > octave-lyh
annotate scripts/plot/waitbar.m @ 14335:ce2b59a6d0e5
maint: periodic merge of stable to default.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Sun, 05 Feb 2012 15:32:24 -0800 |
parents | 7a7ce92cff56 |
children | eaab03308c0b |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14112
diff
changeset
|
1 ## Copyright (C) 2012 John W. Eaton |
13803 | 2 ## |
3 ## This file is part of Octave. | |
4 ## | |
5 ## Octave is free software; you can redistribute it and/or modify it | |
6 ## under the terms of the GNU General Public License as published by | |
7 ## the Free Software Foundation; either version 3 of the License, or (at | |
8 ## your option) any later version. | |
9 ## | |
10 ## Octave is distributed in the hope that it will be useful, but | |
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 ## General Public License for more details. | |
14 ## | |
15 ## You should have received a copy of the GNU General Public License | |
16 ## along with Octave; see the file COPYING. If not, see | |
17 ## <http://www.gnu.org/licenses/>. | |
18 | |
19 ## -*- texinfo -*- | |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
20 ## @deftypefn {Function File} {@var{h} =} waitbar (@var{frac}) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
21 ## @deftypefnx {Function File} {@var{h} =} waitbar (@var{frac}, @var{msg}) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
22 ## @deftypefnx {Function File} {@var{h} =} waitbar (@dots{}, "FigureProperty", "Value", @dots{}) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
23 ## @deftypefnx {Function File} {} waitbar (@var{frac}) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
24 ## @deftypefnx {Function File} {} waitbar (@var{frac}, @var{hwbar}) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
25 ## @deftypefnx {Function File} {} waitbar (@var{frac}, @var{hwbar}, @var{msg}) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
26 ## Return a handle @var{h} to a new waitbar object. The waitbar is |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
27 ## filled to fraction @var{frac} which must be in the range [0, 1]. The |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
28 ## optional message @var{msg} is centered and displayed above the waitbar. |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
29 ## The appearance of the waitbar figure window can be configured by passing |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
30 ## property/value pairs to the function. |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
31 ## |
13832
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
32 ## When called with a single input the current waitbar, if it exists, is |
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
33 ## updated to the new value @var{frac}. If there are multiple outstanding |
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
34 ## waitbars they can be updated individually by passing the handle @var{hwbar} |
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
35 ## of the specific waitbar to modify. |
13803 | 36 ## @end deftypefn |
37 | |
38 ## Author: jwe | |
39 | |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
40 function retval = waitbar (varargin) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
41 |
13806 | 42 persistent curr_waitbar; |
43 | |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
44 if (nargin < 1) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
45 print_usage (); |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
46 endif |
13803 | 47 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
48 frac = varargin{1}; |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
49 varargin(1) = []; |
13803 | 50 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
51 if (! (isnumeric (frac) && isscalar (frac) && frac >= 0 && frac <= 1)) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
52 error ("waitbar: FRAC must be between 0 and 1"); |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
53 endif |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
54 |
13821
4d1927edf194
waitbar: use previous bar if nargin == 1, not nargout == 1
John W. Eaton <jwe@octave.org>
parents:
13818
diff
changeset
|
55 ## Use existing waitbar if it still points to a valid graphics handle. |
4d1927edf194
waitbar: use previous bar if nargin == 1, not nargout == 1
John W. Eaton <jwe@octave.org>
parents:
13818
diff
changeset
|
56 if (nargin == 1 && ishandle (curr_waitbar)) |
13806 | 57 h = curr_waitbar; |
58 else | |
59 h = false; | |
60 endif | |
13803 | 61 |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
62 if (! isempty (varargin) && isnumeric (varargin{1})) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
63 if (! ishandle (varargin{1})) |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
64 error ("waitbar: H must be a handle to a waitbar object"); |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
65 else |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
66 h = varargin{1}; |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
67 varargin(1) = []; |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
68 if (! isfigure (h) || ! strcmp (get (h, "tag"), "waitbar")) |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
69 error ("waitbar: H must be a handle to a waitbar object"); |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
70 endif |
13803 | 71 endif |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
72 endif |
13803 | 73 |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
74 msg = false; |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
75 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
76 if (! isempty (varargin)) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
77 msg = varargin{1}; |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
78 varargin(1) = []; |
13847
9fc597693b0b
allow waitbar message to be a cellstr object
John W. Eaton <jwe@octave.org>
parents:
13832
diff
changeset
|
79 if (! (ischar (msg) || iscellstr (msg))) |
9fc597693b0b
allow waitbar message to be a cellstr object
John W. Eaton <jwe@octave.org>
parents:
13832
diff
changeset
|
80 error ("waitbar: MSG must be a character string or cell array of strings"); |
13803 | 81 endif |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
82 endif |
13803 | 83 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
84 if (rem (numel (varargin), 2) != 0) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
85 error ("waitbar: invalid number of property-value pairs"); |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
86 endif |
13803 | 87 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
88 if (h) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
89 p = findobj (h, "type", "patch"); |
13806 | 90 set (p, "xdata", [0; frac; frac; 0]); |
91 ax = findobj (h, "type", "axes"); | |
13847
9fc597693b0b
allow waitbar message to be a cellstr object
John W. Eaton <jwe@octave.org>
parents:
13832
diff
changeset
|
92 if (ischar (msg) || iscellstr (msg)) |
13806 | 93 th = get (ax, "title"); |
94 curr_msg = get (th, "string"); | |
14238
1facbe04b00c
Fix regression in 9fc597693b0b preventing updating of waitbar text string.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
95 ## graphics handles always store data as column vectors |
1facbe04b00c
Fix regression in 9fc597693b0b preventing updating of waitbar text string.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
96 if (iscellstr (msg)) |
1facbe04b00c
Fix regression in 9fc597693b0b preventing updating of waitbar text string.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
97 msg = msg(:); |
1facbe04b00c
Fix regression in 9fc597693b0b preventing updating of waitbar text string.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
98 endif |
13847
9fc597693b0b
allow waitbar message to be a cellstr object
John W. Eaton <jwe@octave.org>
parents:
13832
diff
changeset
|
99 cmp = strcmp (msg, curr_msg); |
14238
1facbe04b00c
Fix regression in 9fc597693b0b preventing updating of waitbar text string.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
100 if (! all (cmp(:))) |
13806 | 101 set (th, "string", msg); |
102 endif | |
13803 | 103 endif |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
104 else |
13816
7ee18dc46bbb
new and improved non-integer figure handles
John W. Eaton <jwe@octave.org>
parents:
13813
diff
changeset
|
105 h = __go_figure__ (NaN, "position", [250, 500, 400, 100], |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
106 "numbertitle", "off", |
13806 | 107 "toolbar", "none", "menubar", "none", |
13816
7ee18dc46bbb
new and improved non-integer figure handles
John W. Eaton <jwe@octave.org>
parents:
13813
diff
changeset
|
108 "integerhandle", "off", |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
109 "handlevisibility", "callback", |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
110 "tag", "waitbar", |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
111 varargin{:}); |
13803 | 112 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
113 ax = axes ("parent", h, "xtick", [], "ytick", [], |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
114 "xlim", [0, 1], "ylim", [0, 1], |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
115 "xlimmode", "manual", "ylimmode", "manual", |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
116 "position", [0.1, 0.3, 0.8, 0.2]); |
13821
4d1927edf194
waitbar: use previous bar if nargin == 1, not nargout == 1
John W. Eaton <jwe@octave.org>
parents:
13818
diff
changeset
|
117 |
13806 | 118 patch (ax, [0; frac; frac; 0], [0; 0; 1; 1], [0, 0.35, 0.75]); |
119 | |
13847
9fc597693b0b
allow waitbar message to be a cellstr object
John W. Eaton <jwe@octave.org>
parents:
13832
diff
changeset
|
120 if (! (ischar (msg) || iscellstr (msg))) |
13822
38e3bfc4e076
provide default message for waitbar
John W. Eaton <jwe@octave.org>
parents:
13821
diff
changeset
|
121 msg = "Please wait..."; |
13806 | 122 endif |
13822
38e3bfc4e076
provide default message for waitbar
John W. Eaton <jwe@octave.org>
parents:
13821
diff
changeset
|
123 title (ax, msg); |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
124 endif |
13803 | 125 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
126 drawnow (); |
13803 | 127 |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
128 if (nargout > 0) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
129 retval = h; |
13803 | 130 endif |
131 | |
13806 | 132 ## If there were no errors, update current waitbar. |
133 curr_waitbar = h; | |
134 | |
13803 | 135 endfunction |
136 | |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
137 |
13803 | 138 %!demo |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
139 %! h = waitbar (0, '0.00%'); |
13803 | 140 %! for i = 0:0.01:1 |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
141 %! waitbar (i, h, sprintf ('%.2f%%', 100*i)); |
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
142 %! end |
13806 | 143 %! close (h); |
144 | |
145 %!demo | |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
146 %! h = waitbar (0, 'please wait...'); |
13818
a05e5db7b94e
have some fun with waitbar demo #2
John W. Eaton <jwe@octave.org>
parents:
13817
diff
changeset
|
147 %! for i = 0:0.01:0.6 |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
148 %! waitbar (i); |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
149 %! end |
14112
6e9fee72a01c
Add missing ";" to line in waitbar.m demo.
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
13847
diff
changeset
|
150 %! i = 0.3; |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
151 %! waitbar (i, h, 'don''t you hate taking a step backward?'); |
13832
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
152 %! pause (0.5); |
13818
a05e5db7b94e
have some fun with waitbar demo #2
John W. Eaton <jwe@octave.org>
parents:
13817
diff
changeset
|
153 %! for i = i:0.005:0.7 |
a05e5db7b94e
have some fun with waitbar demo #2
John W. Eaton <jwe@octave.org>
parents:
13817
diff
changeset
|
154 %! waitbar (i, h); |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
155 %! end |
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
156 %! waitbar (i, h, 'or stalling?'); |
13832
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
157 %! pause (1); |
13818
a05e5db7b94e
have some fun with waitbar demo #2
John W. Eaton <jwe@octave.org>
parents:
13817
diff
changeset
|
158 %! for i = i:0.003:0.8 |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
159 %! waitbar (i, h, 'just a little longer now'); |
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
160 %! end |
13818
a05e5db7b94e
have some fun with waitbar demo #2
John W. Eaton <jwe@octave.org>
parents:
13817
diff
changeset
|
161 %! for i = i:0.001:1 |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
162 %! waitbar (i, h, 'please don''t be impatient'); |
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
163 %! end |
13806 | 164 %! close (h); |
165 | |
166 %!demo | |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
167 %! h1 = waitbar (0, 'Waitbar #1'); |
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
168 %! h2 = waitbar (0, 'Waitbar #2'); |
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
169 %! h2pos = get (h2, 'position'); |
14249
27abe77158d6
Changes to allow plot demos to be converted and run by Matlab.
Ben Abbott <bpabbott@mac.com>
parents:
14245
diff
changeset
|
170 %! h2pos(1) = h2pos(1) + (h2pos(3) + 50); |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
171 %! set (h2, 'position', h2pos); |
13832
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
172 %! pause (0.5); |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
173 %! for i = 1:4 |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
174 %! waitbar (i/4, h1); |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
175 %! pause (0.5); |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
176 %! waitbar (i/4, h2); |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
177 %! pause (0.5); |
14245
4506eade9f04
Use Matlab coding conventions for demos in plot/ directory.
Rik <octave@nomad.inbox5.com>
parents:
14237
diff
changeset
|
178 %! end |
13832
2e4252228f73
waitbar.m: Eliminate docstring reference to waitbar(frac,msg)
Rik <octave@nomad.inbox5.com>
parents:
13822
diff
changeset
|
179 %! pause (0.5); |
13817
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
180 %! close (h1); |
b3e1f9ae64dc
waitbar.m: More improvements.
Rik <octave@nomad.inbox5.com>
parents:
13816
diff
changeset
|
181 %! close (h2); |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
182 |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
183 %% Test input validation |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
184 %!error <FRAC must be between 0 and 1> waitbar (-0.5) |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
185 %!error <FRAC must be between 0 and 1> waitbar (1.5) |
13813
72875370e2d1
allow waitbar test to succeed even if figure 1 exists
John W. Eaton <jwe@octave.org>
parents:
13806
diff
changeset
|
186 %!error <MSG must be a character string> waitbar (0.5, struct ()) |
13805
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
187 %!error <invalid number of property-value pairs> waitbar (0.5, "msg", "Name") |
b3cdef33ac0e
waitbar.m: Update docstring. Only return output handle h if requested.
Rik <octave@nomad.inbox5.com>
parents:
13803
diff
changeset
|
188 |