Mercurial > hg > octave-lojdl
changeset 13986:6be49527e4cf
Fix coloured scatter when using more than 100 points (bug #34936)
* __scatter__m (__scatter__): Use simpler logic with built-in unique
function instead of using unique_idx. (render_size_color): Ditto.
(unique_idx): Erase this function.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Sat, 03 Dec 2011 21:57:49 -0500 |
parents | 43cc49c7abd1 |
children | 2c0765c14e4f |
files | scripts/plot/private/__scatter__.m |
diffstat | 1 files changed, 18 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/private/__scatter__.m +++ b/scripts/plot/private/__scatter__.m @@ -195,18 +195,23 @@ elseif (columns (c) == 1) h = render_size_color (hg, vert, s, c, marker, filled, true); else - [cc, idx] = unique_idx (c, "rows"); - if (isscalar (s)) - for i = 1:rows (x) - h = render_size_color (hg, vert(idx{i},:), s, cc(i,:), + ## We want to group points by colour. So first get all the unique colours + [cc, ~, c_to_cc] = unique (c, "rows"); + + for i = 1:rows (cc) + ## Now for each possible unique colour, get the logical index of + ## points that correspond to that colour + idx = (i == c_to_cc); + + if (isscalar (s)) + h = render_size_color (hg, vert(idx, :), s, c(idx,:), marker, filled, true); - endfor - else - for i = 1:rows (x) - h = render_size_color (hg, vert(idx{i},:), s(idx{i}), cc(i,:), + else + h = render_size_color (hg, vert(idx, :), s(idx), c(idx,:), marker, filled, true); - endfor - endif + endif + endfor + endif endif @@ -250,28 +255,6 @@ endfunction -function [y, idx] = unique_idx (x, byrows) - if (nargin == 2) - [xx, idx] = sortrows (x); - n = rows (x); - jdx = find (any (xx(1:n-1,:) != xx(2:n,:), 2)); - jdx(end+1) = n; - y = xx(jdx,:); - else - [xx, idx] = sort (x); - n = length (x); - jdx = find (xx(1:n-1,:) != xx(2:n,:)); - jdx(end+1) = n; - y = xx(jdx); - endif - - if (nargin == 2 || columns (x) == 1) - idx = mat2cell (idx, diff ([0; jdx]), 1); - else - idx = mat2cell (idx, 1, diff ([0, jdx])); - endif -endfunction - function h = render_size_color(hg, vert, s, c, marker, filled, isflat) if (isscalar (s)) x = vert(:,1); @@ -318,9 +301,10 @@ endif else ## FIXME: round the size to one decimal place. It's not quite right, though. - [ss, idx] = unique_idx (ceil (s*10) / 10); + [ss, ~, s_to_ss] = unique (ceil (s*10) / 10); for i = 1:rows (ss) - h = render_size_color (hg, vert(idx{i},:), ss(i), c, + idx = (i == s_to_ss); + h = render_size_color (hg, vert(idx,:), ss(i), c, marker, filled, isflat); endfor endif