Mercurial > hg > octave-nkf
changeset 12124:cd82f5933c73
scatter: don't recognize 'filled' as a color
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 22 Jan 2011 03:18:31 -0500 |
parents | 9ea6f69259d7 |
children | a21a3875ca83 |
files | scripts/ChangeLog scripts/plot/private/__scatter__.m scripts/plot/scatter.m |
diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2011-01-22 John W. Eaton <jwe@octave.org> + + * plot/private/__scatter__.m: Don't accept "filled" as a color. + * plot/scatter.m: Doc fix. + Bug #32204. + 2011-01-21 Konstantinos Poulios <logari81@gmail.com> * plot/xlabel.m, plot/ylabel.m, plot/zlabel.m: Setting axis label
--- a/scripts/plot/private/__scatter__.m +++ b/scripts/plot/private/__scatter__.m @@ -71,7 +71,8 @@ c = c(:); endif endif - elseif (firstnonnumeric == istart && ischar (varargin{istart})) + elseif (firstnonnumeric == istart && ischar (varargin{istart}) + && ! strcmpi (varargin{istart}, "filled")) c = varargin{istart}; firstnonnumeric++; else
--- a/scripts/plot/scatter.m +++ b/scripts/plot/scatter.m @@ -21,9 +21,9 @@ ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}) ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{c}) ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}) -## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}, 'filled') ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}, @var{style}) ## @deftypefnx {Function File} {} scatter (@var{x}, @var{y}, @var{s}, @var{c}, @var{prop}, @var{val}) +## @deftypefnx {Function File} {} scatter (@dots{}, "filled") ## @deftypefnx {Function File} {} scatter (@var{h}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} scatter (@dots{}) ## @@ -41,7 +41,7 @@ ## ## The marker to use can be changed with the @var{style} argument, that is a ## string defining a marker in the same manner as the @code{plot} command. -## If the argument 'filled' is given then the markers as filled. All +## If the argument @code{"filled"} is given then the markers as filled. All ## additional arguments are passed to the underlying patch command. ## ## The optional return value @var{h} provides a handle to the patch object