Mercurial > hg > octave-lyh

annotate scripts/plot/private/__scatter__.m @ 11188:4cb1522e4d0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use function handle as input to cellfun, rather than quoted function name or anonymous function wrapper.
author Rik <octave@nomad.inbox5.com>
date Wed, 03 Nov 2010 17:20:56 -0700
parents 657e63dcfd88
children fd0a3ac60b0e
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
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
55 if (istart <= nargin)
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
56 s = varargin{istart};
10697
1215ab6f3491 Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents: 10549
diff changeset
57 if (isempty (s) || ischar (s))
7603
689652eb95d1 fix for scatter markersize
David Bateman <dbateman@free.fr>
parents: 7421
diff changeset
58 s = 6;
10701
657e63dcfd88 scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents: 10697
diff changeset
59 endif
657e63dcfd88 scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents: 10697
diff changeset
60 if (! ischar (varargin{istart}))
10697
1215ab6f3491 Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents: 10549
diff changeset
61 istart++;
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 else
7603
689652eb95d1 fix for scatter markersize
David Bateman <dbateman@free.fr>
parents: 7421
diff changeset
64 s = 6;
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
65 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
66
10697
1215ab6f3491 Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents: 10549
diff changeset
67 if (istart <= nargin && firstnonnumeric > istart)
1215ab6f3491 Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents: 10549
diff changeset
68 c = varargin{istart};
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
69 if (isvector (c))
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
70 if (columns (c) != 3)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
71 c = c(:);
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
72 endif
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
73 endif
10697
1215ab6f3491 Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents: 10549
diff changeset
74 elseif (firstnonnumeric == istart && ischar (varargin{istart}))
1215ab6f3491 Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents: 10549
diff changeset
75 c = varargin{istart};
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
76 firstnonnumeric++;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
77 else
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
78 c = [];
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
79 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
80
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
81 newargs = {};
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
82 filled = false;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
83 have_marker = false;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
84 marker = "o";
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
85 iarg = firstnonnumeric;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
86 while (iarg <= nargin)
7191
b48a21816f2e [project @ 2007-11-26 21:24:32 by jwe]
jwe
parents: 7189
diff changeset
87 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
88 if (ischar (arg) && strncmpi (arg, "filled", 6))
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
89 filled = true;
7768
a2d9f325b65a Use isschar instead of deprecated isstr
Rafael Laboissiere <rafael@debian.org>
parents: 7603
diff changeset
90 elseif ((ischar (arg) || iscell (arg)) && ! have_marker)
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
91 [linespec, valid] = __pltopt__ (fcn, arg, false);
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
92 if (valid)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
93 have_marker = true;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
94 marker = linespec.marker;
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
95 if (strncmp (marker, "none", 4))
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
96 marker = "o";
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
97 elseif (isempty (marker))
10701
657e63dcfd88 scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents: 10697
diff changeset
98 have_marker = false;
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
99 [dummy, marker] = __next_line_style__ ();
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
100 endif
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
101 else
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
102 error ("%s: invalid linespec", fcn);
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
103 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
104 else
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
105 newargs{end+1} = arg;
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
106 if (iarg <= nargin)
10701
657e63dcfd88 scatter.m: Properly set default value markersize and marker type.
Ben Abbott <bpabbott@mac.com>
parents: 10697
diff changeset
107 newargs{end+1} = varargin{iarg++};
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
108 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
109 endif
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
110 endwhile
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
111
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
112 if (isempty (c))
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
113 c = __next_line_color__();
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
114 endif
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
115
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
116 hg = hggroup ();
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
117 newargs = __add_datasource__ (fcn, hg, {"x", "y", "z", "c", "size"},
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
118 newargs{:});
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
119
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
120 addproperty ("xdata", hg, "data", x);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
121 addproperty ("ydata", hg, "data", y);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
122 addproperty ("zdata", hg, "data", z);
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
123 if (ischar (c))
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
124 addproperty ("cdata", hg, "data", __color_str_rgb__ (c));
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
125 else
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
126 addproperty ("cdata", hg, "data", c);
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
127 endif
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
128 addproperty ("sizedata", hg, "data", s);
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
129 addlistener (hg, "xdata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
130 addlistener (hg, "ydata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
131 addlistener (hg, "zdata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
132 addlistener (hg, "cdata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
133 addlistener (hg, "sizedata", @update_data);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
134
10083
614ad9e7a17b use patches again in scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 10082
diff changeset
135 if (numel (x) <= 100)
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
136
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
137 ## 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
138
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
139 if (numel (s) == 1)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
140 s = repmat (s, numel(x), 1);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
141 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
142
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
143 if (ischar (c) || rows(c) == 1)
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
144 for i = 1 : numel (x)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
145 if (filled)
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
146 h = __go_patch__ (hg, "xdata", x(i), "ydata", y(i), "zdata", z(i,:),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
147 "faces", 1, "vertices", [x(i), y(i), z(i,:)],
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
148 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
149 "marker", marker, "markersize", s(i),
10697
1215ab6f3491 Honor Matlab color settings for scatter().
Ben Abbott <bpabbott@mac.com>
parents: 10549
diff changeset
150 "markeredgecolor", c, "markerfacecolor", c,
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
151 "linestyle", "none");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
152 else
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
153 h = __go_patch__ (hg, "xdata", x(i), "ydata", y(i), "zdata", z(i,:),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
154 "faces", 1, "vertices", [x(i), y(i), z(i,:)],
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
155 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
156 "marker", marker, "markersize", s(i),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
157 "markeredgecolor", c, "markerfacecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
158 "linestyle", "none");
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
159 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
160 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
161 else
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
162 for i = 1 : numel (x)
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
163 if (filled)
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
164 h = __go_patch__ (hg, "xdata", x(i), "ydata", y(i), "zdata", z(i,:),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
165 "faces", 1, "vertices", [x(i), y(i), z(i,:)],
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
166 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
167 "marker", marker, "markersize", s(i),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
168 "markeredgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
169 "markerfacecolor", "flat",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
170 "cdata", c(i,:), "linestyle", "none");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
171 else
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
172 h = __go_patch__ (hg, "xdata", x(i), "ydata", y(i), "zdata", z(i,:),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
173 "faces", 1, "vertices", [x(i), y(i), z(i,:)],
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
174 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
175 "marker", marker, "markersize", s(i),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
176 "markeredgecolor", "flat",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
177 "markerfacecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
178 "cdata", c(i,:), "linestyle", "none");
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
179
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
180 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
181 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
182 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
183
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
184 else
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
185
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
186 ## 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
187
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
188 vert = [x, y, z];
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
189
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
190 if (ischar (c) || rows (c) == 1)
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
191 h = render_size_color (hg, vert, s, c, marker, filled, false);
10236
8e58c402ebb2 Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents: 10135
diff changeset
192 elseif (columns (c) == 1)
8e58c402ebb2 Accelerate colormap colored scatter plots
David Bateman <dbateman@free.fr>
parents: 10135
diff changeset
193 h = render_size_color (hg, vert, s, c, marker, filled, true);
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
194 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
195 [cc, idx] = unique_idx (c, "rows");
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
196 if (isscalar (s))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
197 for i = 1:rows (x)
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
198 h = render_size_color (hg, vert(idx{i},:), s, cc(i,:),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
199 marker, filled, true);
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
200 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
201 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
202 for i = 1:rows (x)
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
203 h = render_size_color (hg, vert(idx{i},:), s(idx{i}), cc(i,:),
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
204 marker, filled, true);
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
205 endfor
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
206 endif
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
207 endif
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
208 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
209
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
210 if (! ischar (c) && rows (c) > 1)
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
211 ax = get (hg, "parent");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
212 clim = get (ax, "clim");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
213 if (min(c(:)) < clim(1))
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
214 clim(1) = min(c(:));
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
215 set (ax, "clim", clim);
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
216 endif
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
217 if (max(c(:)) > clim(2))
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
218 set (ax, "clim", [clim(1), max(c(:))]);
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
219 endif
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
220 endif
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
221
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
222 addproperty ("linewidth", hg, "patchlinewidth", 0.5);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
223 addproperty ("marker", hg, "patchmarker", marker);
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
224 if (filled)
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
225 addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", "none");
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
226 if (ischar (c) || rows (c) == 1)
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
227 addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", c);
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
228 else
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
229 addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", "flat");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
230 endif
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
231 else
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
232 addproperty ("markerfacecolor", hg, "patchmarkerfacecolor", "none");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
233 if (ischar (c) || rows (c) == 1)
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
234 addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", c);
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
235 else
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
236 addproperty ("markeredgecolor", hg, "patchmarkeredgecolor", "flat");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
237 endif
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
238 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
239 addlistener (hg, "linewidth", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
240 addlistener (hg, "marker", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
241 addlistener (hg, "markerfacecolor", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
242 addlistener (hg, "markeredgecolor", @update_props);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
243
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
244 if (! isempty (newargs))
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
245 set (hg, newargs{:})
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
246 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
247
7189
e8d953d03f6a [project @ 2007-11-26 20:42:09 by dbateman]
dbateman
parents:
diff changeset
248 endfunction
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
249
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
250 function [y, idx] = unique_idx (x, byrows)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
251 if (nargin == 2)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
252 [xx, idx] = sortrows (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
253 n = rows (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
254 jdx = find (any (xx(1:n-1,:) != xx(2:n,:), 2));
10082
28af9aa6f9ed fix typos in __scatter__
Jaroslav Hajek <highegg@gmail.com>
parents: 10078
diff changeset
255 jdx(end+1) = n;
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
256 y = xx(jdx,:);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
257 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
258 [xx, idx] = sort (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
259 n = length (x);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
260 jdx = find (xx(1:n-1,:) != xx(2:n,:));
10082
28af9aa6f9ed fix typos in __scatter__
Jaroslav Hajek <highegg@gmail.com>
parents: 10078
diff changeset
261 jdx(end+1) = n;
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
262 y = xx(jdx);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
263 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
264
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
265 if (nargin == 2 || columns (x) == 1)
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
266 idx = mat2cell (idx, diff ([0; jdx]), 1);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
267 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
268 idx = mat2cell (idx, 1, diff ([0, jdx]));
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
269 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
270 endfunction
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
271
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
272 function h = render_size_color(hg, vert, s, c, marker, filled, isflat)
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
273 if (isscalar (s))
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
274 x = vert(:,1);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
275 y = vert(:,2);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
276 z = vert(:,3:end);
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
277 if (ischar (c) || !isflat)
10083
614ad9e7a17b use patches again in scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 10082
diff changeset
278 if (filled)
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
279 h = __go_patch__ (hg, "xdata", x, "ydata", y, "zdata", z,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
280 "faces", 1, "vertices", vert,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
281 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
282 "marker", marker,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
283 "markeredgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
284 "markerfacecolor", c,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
285 "markersize", s, "linestyle", "none");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
286 else
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
287 h = __go_patch__ (hg, "xdata", x, "ydata", y, "zdata", z,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
288 "faces", 1, "vertices", vert,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
289 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
290 "marker", marker,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
291 "markeredgecolor", c,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
292 "markerfacecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
293 "markersize", s, "linestyle", "none");
10083
614ad9e7a17b use patches again in scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 10082
diff changeset
294 endif
614ad9e7a17b use patches again in scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 10082
diff changeset
295 else
614ad9e7a17b use patches again in scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 10082
diff changeset
296 if (filled)
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
297 h = __go_patch__ (hg, "xdata", x, "ydata", y, "zdata", z,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
298 "faces", 1, "vertices", vert,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
299 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
300 "marker", marker, "markersize", s,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
301 "markeredgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
302 "markerfacecolor", "flat",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
303 "cdata", c, "linestyle", "none");
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
304 else
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
305 h = __go_patch__ (hg, "xdata", x, "ydata", y, "zdata", z,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
306 "faces", 1, "vertices", vert,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
307 "facecolor", "none", "edgecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
308 "marker", marker, "markersize", s,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
309 "markeredgecolor", "flat",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
310 "markerfacecolor", "none",
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
311 "cdata", c, "linestyle", "none");
10083
614ad9e7a17b use patches again in scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 10082
diff changeset
312 endif
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
313 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
314 else
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
315 ## 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
316 [ss, idx] = unique_idx (ceil (s*10) / 10);
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
317 for i = 1:rows (ss)
10135
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
318 h = render_size_color (hg, vert(idx{i},:), ss(i), c,
4516a0c97ced Handle linestyleorder. Remove @ markers. Treat edgecolor, markeredgecolor and markerfacecolor correctly in scatter.
David Bateman <dbateman@free.fr>
parents: 10083
diff changeset
319 marker, filled, isflat);
10078
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
320 endfor
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
321 endif
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
322 endfunction
2f435ed48143 optimize scatter plots
Jaroslav Hajek <highegg@gmail.com>
parents: 9896
diff changeset
323
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
324 function update_props (h, d)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
325 lw = get (h, "linewidth");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
326 m = get (h, "marker");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
327 fc = get (h, "markerfacecolor");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
328 ec = get (h, "markeredgecolor");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
329 kids = get (h, "children");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
330
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
331 for i = 1 : numel (kids)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
332 set (kids (i), "linewidth", lw, "marker", m, "markerfacecolor", fc,
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
333 "edgecolor", ec)
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
334 endfor
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
335 endfunction
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
336
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
337 function update_data (h, d)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
338 x1 = get (h, "xdata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
339 y1 = get (h, "ydata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
340 z1 = get (h, "zdata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
341 c1 = get (h, "cdata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
342 if (!ischar (c1) && rows (c1) == 1)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
343 c1 = repmat (c1, numel (x1), 1);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
344 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
345 size1 = get (h, "sizedata");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
346 if (numel (size1) == 1)
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
347 size1 = repmat (size1, numel (x1), 1);
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
348 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
349 hlist = get (h, "children");
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
350 if (ischar (c1))
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
351 if (isempty (z1))
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
352 for i = 1 : length (hlist)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
353 set (hlist(i), "vertices", [x1(i), y1(i)], "cdata", c1,
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
354 "markersize", size1(i));
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
355 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
356 else
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
357 for i = 1 : length (hlist)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
358 set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata", c1,
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
359 "markersize", size1(i));
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
360 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
361 endif
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
362 else
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
363 if (isempty (z1))
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
364 for i = 1 : length (hlist)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
365 set (hlist(i), "vertices", [x1(i), y1(i)], "cdata",
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
366 reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i));
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
367 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
368 else
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
369 for i = 1 : length (hlist)
10549
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
370 set (hlist(i), "vertices", [x1(i), y1(i), z1(i)], "cdata",
95c3e38098bf Untabify .m scripts
Rik <code@nomad.inbox5.com>
parents: 10236
diff changeset
371 reshape(c1(i,:),[1, size(c1)(2:end)]), "markersize", size1(i));
9085
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
372 endfor
136e72b9afa8 correct indexing of cdata for scatter
David Bateman <dbateman@free.fr>
parents: 8920
diff changeset
373 endif
8257
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
374 endif
79c874fe5100 More plot object updates
David Bateman <dbateman@free.fr>
parents: 8190
diff changeset
375 endfunction