Mercurial > octave
comparison scripts/plot/private/__scatter__.m @ 17462:177147bf7b55
Overhaul use of __pltopt__.m to correctly check for cellstr, not just cell.
* scripts/plot/private/__pltopt__.m: Use modern coding conventions. Eliminate
unneeded input checking in subfunctions. Remove unused variables.
* scripts/plot/contourf.m, scripts/plot/feather.m, scripts/plot/plotmatrix.m,
scripts/plot/private/__bar__.m, scripts/plot/private/__quiver__.m,
scripts/plot/private/__scatter__.m, scripts/plot/private/__stem__.m,
scripts/plot/stairs.m: Use iscellstr, not iscell, to properly validate inputs
to __pltopt__.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 23 Sep 2013 08:55:19 -0700 |
parents | c36d3a4bc42f |
children | 76614e624818 |
comparison
equal
deleted
inserted
replaced
17461:dea415e4216d | 17462:177147bf7b55 |
---|---|
91 iarg = firstnonnumeric; | 91 iarg = firstnonnumeric; |
92 while (iarg <= nargin) | 92 while (iarg <= nargin) |
93 arg = varargin{iarg++}; | 93 arg = varargin{iarg++}; |
94 if (ischar (arg) && (strcmpi (arg, "filled") || strcmpi (arg, "fill"))) | 94 if (ischar (arg) && (strcmpi (arg, "filled") || strcmpi (arg, "fill"))) |
95 filled = true; | 95 filled = true; |
96 elseif ((ischar (arg) || iscell (arg)) && ! have_marker) | 96 elseif ((ischar (arg) || iscellstr (arg)) && ! have_marker) |
97 [linespec, valid] = __pltopt__ (fcn, arg, false); | 97 [linespec, valid] = __pltopt__ (fcn, arg, false); |
98 if (valid) | 98 if (valid) |
99 have_marker = true; | 99 have_marker = true; |
100 marker = linespec.marker; | 100 marker = linespec.marker; |
101 if (strcmp (marker, "none")) | 101 if (strcmp (marker, "none")) |