Mercurial > octave-nkf

comparison scripts/plot/draw/plotmatrix.m @ 20547:8164c580922b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
plotmatrix.m: Fix regression in %!demo introduced by in-place operators. * plotmatrix.m: Rename nargin variable to narg variable to avoid shadowing nargin() function.
author Rik <rik@octave.org>
date Fri, 25 Sep 2015 13:05:01 -0700
parents 83792dd9bcc1
children
comparison
equal deleted inserted replaced
20546:9502e0142c19 20547:8164c580922b
128 128
129 function [h, ax, p, pax] = __plotmatrix__ (bigax, varargin) 129 function [h, ax, p, pax] = __plotmatrix__ (bigax, varargin)
130 have_line_spec = false; 130 have_line_spec = false;
131 have_hist = false; 131 have_hist = false;
132 parent = get (bigax, "parent"); 132 parent = get (bigax, "parent");
133 for i = 1 : nargin - 1 133 narg = nargin ();
134 for i = 1 : narg - 1
134 arg = varargin{i}; 135 arg = varargin{i};
135 if (ischar (arg) || iscellstr (arg)) 136 if (ischar (arg) || iscellstr (arg))
136 [linespec, valid] = __pltopt__ ("plotmatrix", varargin{i}, false); 137 [linespec, valid] = __pltopt__ ("plotmatrix", varargin{i}, false);
137 if (valid) 138 if (valid)
138 have_line_spec = true; 139 have_line_spec = true;
139 linespec = varargin(i); 140 linespec = varargin(i);
140 varargin(i) = []; 141 varargin(i) = [];
141 nargin -= 1; 142 narg -= 1;
142 break; 143 break;
143 else 144 else
144 print_usage ("plotmatrix"); 145 print_usage ("plotmatrix");
145 endif 146 endif
146 endif 147 endif
147 endfor 148 endfor
148 149
149 if (nargin == 2) 150 if (narg == 2)
150 X = varargin{1}; 151 X = varargin{1};
151 Y = X; 152 Y = X;
152 have_hist = true; 153 have_hist = true;
153 elseif (nargin == 3) 154 elseif (narg == 3)
154 X = varargin{1}; 155 X = varargin{1};
155 Y = varargin{2}; 156 Y = varargin{2};
156 else 157 else
157 print_usage ("plotmatrix"); 158 print_usage ("plotmatrix");
158 endif 159 endif