Mercurial > octave-nkf

changeset 18200:0ecd4618b1fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
voronoi.m: Fix input validation so it doesn't open blank figure window. voronoi.m: Fix input validation so it doesn't open blank figure window.
author Rik <rik@octave.org>
date Fri, 03 Jan 2014 09:16:04 -0800
parents b7d3e1f762e1
children ec87e965c246
files scripts/geometry/voronoi.m
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/geometry/voronoi.m	Fri Jan 03 11:23:08 2014 -0500
+++ b/scripts/geometry/voronoi.m	Fri Jan 03 09:16:04 2014 -0800
@@ -74,14 +74,13 @@
   endif
 
   narg = 1;
+  hax = NaN;
   if (isscalar (varargin{1}) && ishandle (varargin{1}))
     hax = varargin{1};
     if (! isaxes (hax))
       error ("voronoi: HAX argument must be an axes object");
     endif
     narg++;
-  elseif (nargout < 2)
-    hax = gca ();
   endif
 
   if (nargin < 1 + narg || nargin > 3 + narg)
@@ -159,6 +158,9 @@
   Vvy = reshape (p(edges, 2), size (edges));
 
   if (nargout < 2)
+    if (isnan (hax))
+      hax = gca ();
+    endif
     h = plot (hax, Vvx, Vvy, linespec{:}, x, y, '+');
     lim = [xmin, xmax, ymin, ymax];
     axis (lim + 0.1 * [[-1, 1] * xdelta, [-1, 1] * ydelta]);