Mercurial > hg > octave-nkf

diff scripts/plot/util/findobj.m @ 19560:c446da1da9ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
findobj.m: Allow -depth argument anywhere in input arg list (bug #43136). * findobj.m: Check for -depth argument in while loop over all args rather than only for first argument.
author Rik <rik@octave.org>
date Fri, 28 Nov 2014 07:55:46 -0800
parents dca6ecfd622c
children 4197fc428c7d
line wrap: on
line diff
--- a/scripts/plot/util/findobj.m
+++ b/scripts/plot/util/findobj.m
@@ -100,9 +100,6 @@
         if (strcmpi (varargin{n1}, "flat"))
           depth = 0;
           n1 = n1 + 1;
-        elseif (strcmpi (varargin{n1}, "-depth"))
-          depth = varargin{n1+1};
-          n1 = n1 + 2;
         endif
       else
         error ("findobj: properties and options must be strings");
@@ -134,7 +131,18 @@
     endif
     logicaloperator{np} = "and";
     if (ischar (args{na}))
-      if (strcmpi (args{na}, "-regexp"))
+      if (strcmpi (args{na}, "-property"))
+        if (na + 1 <= numel (args))
+          na = na + 1;
+          property(np) = 1;
+          pname{np} = args{na};
+          na = na + 1;
+          pvalue{np} = [];
+          np = np + 1;
+        else
+          error ("findobj: inconsistent number of arguments");
+        endif
+      elseif (strcmpi (args{na}, "-regexp"))
         if (na + 2 <= numel (args))
           regularexpression(np) = 1;
           na = na + 1;
@@ -146,14 +154,11 @@
         else
           error ("findobj: inconsistent number of arguments");
         endif
-      elseif (strcmpi (args{na}, "-property"))
+      elseif (strcmpi (args{na}, "-depth"))
         if (na + 1 <= numel (args))
           na = na + 1;
-          property(np) = 1;
-          pname{np} = args{na};
+          depth = args{na};
           na = na + 1;
-          pvalue{np} = [];
-          np = np + 1;
         else
           error ("findobj: inconsistent number of arguments");
         endif