annotate scripts/plot/private/__scatter__.m @ 10078:2f435ed48143

optimize scatter plots
author Jaroslav Hajek <highegg@gmail.com>
date Sun, 10 Jan 2010 21:34:30 +0100
parents 1aeb39118764
children 28af9aa6f9ed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8920
eb63fbe60fab update copyright notices
John W. Eaton <jwe@octave.org>
parents: 8812
diff changeset
1 ## Copyright (C) 2007, 2008, 2009 David Bateman
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
2 ##
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
3 ## This file is part of Octave.
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
4 ##
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
6 ## under the terms of the GNU General Public License as published by
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
8 ## your option) any later version.
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
9 ##
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
13 ## General Public License for more details.
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
14 ##
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
17 ## <http://www.gnu.org/licenses/>.
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
18
8812
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8257
diff changeset
19 ## -*- texinfo -*-
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8257
diff changeset
20 ## @deftypefn {Function File} {@var{hg} =} __scatter__ (@dots{})
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
21 ## Undocumented internal function.
8812
7d48766c21a5 use consistent format for doc strings of internal functions
John W. Eaton <jwe@octave.org>
parents: 8257
diff changeset
22 ## @end deftypefn
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
23
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
24 function hg = __scatter__ (varargin)
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
25
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
26 h = varargin{1};
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
27 nd = varargin{2};
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
28 fcn = varargin{3};
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
29 x = varargin{4}(:);
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
30 y = varargin{5}(:);
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
31 istart = 6;
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
32
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
33 if (nd == 3)
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
34 z = varargin{6}(:);
7421
1c7b3e1fda19 [project @ 2008-01-25 21:00:42 by dbateman]
dbateman
parents: 7235
diff changeset
35 idx = isnan(x) | isnan (y) | isnan (z);
1c7b3e1fda19 [project @ 2008-01-25 21:00:42 by dbateman]
dbateman
parents: 7235
diff changeset
36 x (idx) = [];
1c7b3e1fda19 [project @ 2008-01-25 21:00:42 by dbateman]
dbateman
parents: 7235
diff changeset
37 y (idx) = [];
1c7b3e1fda19 [project @ 2008-01-25 21:00:42 by dbateman]
dbateman
parents: 7235
diff changeset
38 z (idx) = [];
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
39 istart = 7;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
40 else
7421
1c7b3e1fda19 [project @ 2008-01-25 21:00:42 by dbateman]
dbateman
parents: 7235
diff changeset
41 idx = isnan(x) | isnan (y);
1c7b3e1fda19 [project @ 2008-01-25 21:00:42 by dbateman]
dbateman
parents: 7235
diff changeset
42 x (idx) = [];
1c7b3e1fda19 [project @ 2008-01-25 21:00:42 by dbateman]
dbateman
parents: 7235
diff changeset
43 y (idx) = [];
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
44 z = zeros (length (x), 0);
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
45 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
46
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
47 firstnonnumeric = Inf;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
48 for i = istart:nargin
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
49 if (! isnumeric (varargin{i}))
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
50 firstnonnumeric = i;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
51 break;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
52 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
53 endfor
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
54
7235
ee0820d8b4ac [project @ 2007-12-01 00:49:32 by jwe]
jwe
parents: 7191
diff changeset
55 if (istart < nargin && firstnonnumeric > istart)
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
56 s = varargin{istart};
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
57 if (isempty (s))
7603
689652eb95d1 fix for scatter markersize
David Bateman <dbateman@free.fr>
parents: 7421
diff changeset
58 s = 6;
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
59 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
60 else
7603
689652eb95d1 fix for scatter markersize
David Bateman <dbateman@free.fr>
parents: 7421
diff changeset
61 s = 6;
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
62 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
63
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
64 if (istart < nargin && firstnonnumeric > istart + 1)
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
65 c = varargin{istart + 1};
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
66 if (isvector (c))
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
67 if (columns (c) != 3)
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
68 c = c(:);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
69 endif
9295
10b9a71a81f1 __scatter__.m: If the color spec is empty, set using __next_line_color__.
Ben Abbott <bpabbott@mac.com>
parents: 9085
diff changeset
70 elseif (isempty (c))
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
71 c = __next_line_color__();
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
72 endif
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
73 elseif (firstnonnumeric == istart + 1 && ischar (varargin{istart + 1}))
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
74 c = varargin{istart + 1};
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
75 firstnonnumeric++;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
76 else
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
77 c = __next_line_color__();
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
78 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
79
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
80 newargs = {};
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
81 filled = false;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
82 have_marker = false;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
83 marker = "o";
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
84 iarg = firstnonnumeric;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
85 while (iarg <= nargin)
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
86 arg = varargin{iarg++};
8190
73d6b71788c0 use case-insensitive comparison for graphics properties; misc style fixes
John W. Eaton <jwe@octave.org>
parents: 7768
diff changeset
87 if (ischar (arg) && strncmpi (arg, "filled", 6))
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
88 filled = true;
7768
a2d9f325b65a Use isschar instead of deprecated isstr
Rafael Laboissiere <rafael@debian.org>
parents: 7603
diff changeset
89 elseif ((ischar (arg) || iscell (arg)) && ! have_marker)
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
90 [linespec, valid] = __pltopt__ (fcn, arg, false);
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
91 if (valid)
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
92 have_marker = true;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
93 marker = linespec.marker;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
94 if (strncmp (marker, "none", 4))
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
95 marker = "o";
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
96 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
97 else
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
98 error ("%s: invalid linespec", fcn);
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
99 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
100 else
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
101 newargs{end+1} = arg;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
102 if (iarg <= nargin)
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
103 newargs{end+1} = varagin{iarg++};
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
104 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
105 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
106 endwhile
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
107
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
108 hg = hggroup ();
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
109 newargs = __add_datasource__ (fcn, hg, {"x", "y", "z", "c", "size"},
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
110 newargs{:});
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
111
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
112 addproperty ("xdata", hg, "data", x);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
113 addproperty ("ydata", hg, "data", y);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
114 addproperty ("zdata", hg, "data", z);
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
115 addproperty ("cdata", hg, "data", c);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
116 addproperty ("sizedata", hg, "data", s);
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
117 addlistener (hg, "xdata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
118 addlistener (hg, "ydata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
119 addlistener (hg, "zdata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
120 addlistener (hg, "cdata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
121 addlistener (hg, "sizedata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
122
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
123 if (numel (x) <= 20)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
124
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
125 ## For small number of points, we'll construct an object for each point.
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
126
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
127 if (numel (s) == 1)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
128 s = repmat (s, numel(x), 1);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
129 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
130
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
131 if (ischar (c))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
132 for i = 1 : numel (x)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
133 h = __go_line__ (hg, "xdata", x(i), "ydata", y(i), "zdata", z(i,:),
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
134 "color", c, "marker", marker,
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
135 "markersize", s(i), "linestyle", "none");
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
136 if (filled)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
137 set(h, "markerfacecolor", c);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
138 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
139 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
140 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
141 if (rows (c) == 1)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
142 c = repmat (c, numel (x), 1);
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
143 endif
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
144
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
145 for i = 1 : numel (x)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
146 h = __go_line__ (hg, "xdata", x(i), "ydata", y(i), "zdata", z(i,:),
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
147 "color", c(i,:), "marker", marker,
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
148 "markersize", s(i), "linestyle", "none");
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
149 if (filled)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
150 set(h, "markerfacecolor", c(i,:));
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
151 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
152 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
153 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
154
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
155 else
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
156
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
157 ## For larger numbers of points, we split the points by common color.
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
158
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
159 vert = [x, y, z];
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
160
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
161 if (ischar (c) || rows (c) == 1)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
162 h = render_size_color (hg, vert, s, c, marker, filled);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
163 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
164 [cc, idx] = unique_idx (c, "rows");
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
165 if (isscalar (s))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
166 for i = 1:rows (x)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
167 h = render_size_color (hg, vert(idx{i},:), s, cc(i,:), marker, filled);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
168 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
169 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
170 for i = 1:rows (x)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
171 h = render_size_color (hg, vert(idx{i},:), s(idx{i}), cc(i,:), marker, filled);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
172 endfor
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
173 endif
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
174 endif
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
175
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
176 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
177
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
178 if (! ischar (c))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
179 ax = get (hg, "parent");
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
180 clim = get (ax, "clim");
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
181 if (min(c(:)) < clim(1))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
182 clim(1) = min(c(:));
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
183 set (ax, "clim", clim);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
184 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
185 if (max(c(:)) > clim(2))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
186 set (ax, "clim", [clim(1), max(c(:))]);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
187 endif
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
188 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
189
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
190 addproperty ("linewidth", hg, "patchlinewidth", 0.5);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
191 addproperty ("marker", hg, "patchmarker", marker);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
192 if (numel (x) > 0)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
193 addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", "none");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
194 addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", "none");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
195 else
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
196 addproperty ("markerfacecolor", hg, "patchmarkerfacecolor",
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
197 get (h, "markerfacecolor"));
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
198 addproperty ("markeredgecolor", hg, "patchmarkeredgecolor",
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
199 get (h, "color"));
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
200 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
201 addlistener (hg, "linewidth", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
202 addlistener (hg, "marker", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
203 addlistener (hg, "markerfacecolor", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
204 addlistener (hg, "markeredgecolor", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
205
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
206 if (! isempty (newargs))
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
207 set (hg, newargs{:})
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
208 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
209
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
210 endfunction
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
211
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
212 function [y, idx] = unique_idx (x, byrows)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
213 if (nargin == 2)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
214 [xx, idx] = sortrows (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
215 n = rows (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
216 jdx = find (any (xx(1:n-1,:) != xx(2:n,:), 2));
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
217 jdx(n) = n;
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
218 y = xx(jdx,:);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
219 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
220 [xx, idx] = sort (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
221 n = length (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
222 jdx = find (xx(1:n-1,:) != xx(2:n,:));
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
223 jdx(n) = n;
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
224 y = xx(jdx);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
225 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
226
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
227 if (nargin == 2 || columns (x) == 1)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
228 idx = mat2cell (idx, diff ([0; jdx]), 1);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
229 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
230 idx = mat2cell (idx, 1, diff ([0, jdx]));
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
231 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
232 endfunction
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
233
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
234 function h = render_size_color(hg, vert, s, c, marker, filled)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
235 if (isscalar (s))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
236 x = vert(:,1);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
237 y = vert(:,2);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
238 z = vert(:,3:end);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
239 h = __go_line__ (hg, "xdata", x, "ydata", y, "zdata", z,
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
240 "color", c, "marker", marker,
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
241 "markersize", s, "linestyle", "none");
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
242 if (filled)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
243 set(h, "markerfacecolor", c);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
244 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
245 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
246 ## FIXME: round the size to one decimal place. It's not quite right, though.
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
247 [ss, idx] = unique_idx (ceil (s*10) / 10);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
248 for i = 1:rows (ss)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
249 h = render_size_color (hg, vert(idx{i},:), ss(i), c, marker, filled);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
250 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
251 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
252 endfunction
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
253
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
254 function update_props (h, d)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
255 lw = get (h, "linewidth");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
256 m = get (h, "marker");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
257 fc = get (h, "markerfacecolor");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
258 ec = get (h, "markeredgecolor");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
259 kids = get (h, "children");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
260
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
261 for i = 1 : numel (kids)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
262 set (kids (i), "linewidth", lw, "marker", m, "markerfacecolor", fc,
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
263 "edgecolor", ec)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
264 endfor
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
265 endfunction
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
266
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
267 function update_data (h, d)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
268 x1 = get (h, "xdata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
269 y1 = get (h, "ydata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
270 z1 = get (h, "zdata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
271 c1 = get (h, "cdata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
272 if (!ischar (c1) && rows (c1) == 1)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
273 c1 = repmat (c1, numel (x1), 1);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
274 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
275 size1 = get (h, "sizedata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
276 if (numel (size1) == 1)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
277 size1 = repmat (size1, numel (x1), 1);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
278 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
279 hlist = get (h, "children");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
280 if (ischar (c1))
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
281 if (isempty (z1))
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
282 for i = 1 : length (hlist)
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
283 set (hlist(i), "vertices", [x1(i), y1(i)], "cdata", c1,
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
284 "markersize", size1(i));
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
285 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
286 else
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
287 for i = 1 : length (hlist)
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
288 set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata", c1,
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
289 "markersize", size1(i));
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
290 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
291 endif
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
292 else
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
293 if (isempty (z1))
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
294 for i = 1 : length (hlist)
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
295 set (hlist(i), "vertices", [x1(i), y1(i)], "cdata",
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
296 reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i));
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
297 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
298 else
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
299 for i = 1 : length (hlist)
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
300 set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata",
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
301 reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i));
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
302 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
303 endif
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
304 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
305 endfunction