Skip to content

Commit 10f05bd

Browse files
committed
g.line: store the shrinked values of all stripes.
Prepare for switching between different stripe datasets.
1 parent 4749b39 commit 10f05bd

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

g.line.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787

8888
var valuesx_shrinked = [];
8989
var valuesy_shrinked = [];
90+
var stripesy_shrinked = [];
9091

9192
for (i = 0, ii = valuesy.length; i < ii; i++) {
9293
valuesy_shrinked[i] = shrink(valuesy[i], width - 2 * gutter);
@@ -95,12 +96,10 @@
9596
if (valuesx[i]) {
9697
valuesx_shrinked[i] = shrink(valuesx[i], width - 2 * gutter);
9798
}
98-
}
99-
100-
var stripesy_shrinked;
10199

102-
if (opts.stripes) {
103-
stripesy_shrinked = shrink(stripesy[primary], width - 2 * gutter);
100+
if (opts.stripes) {
101+
stripesy_shrinked[i] = shrink(stripesy[primary], width - 2 * gutter);
102+
}
104103
}
105104

106105
var stripes_miny = Math.min.apply(Math, stripesy[primary]),
@@ -163,10 +162,10 @@
163162
var base_color = opts.stripes.color || { h: 0.42, s: 1, l: 0.5 };
164163
var stripes_range = opts.stripes.range || Math.max(1, stripes_maxy - stripes_miny);
165164

166-
for (var j = 0, jj = stripesy_shrinked.length - 1; j < jj; j++) {
165+
for (var j = 0, jj = stripesy_shrinked[primary].length - 1; j < jj; j++) {
167166
u = Math.max(0, Math.round( (valuesx_shrinked[primary][j] - minx) * kx )),
168167
v = Math.min(width - 2 * gutter, Math.round( (valuesx_shrinked[primary][j+1] - minx) * kx ));
169-
var value = (stripesy_shrinked[j] - stripes_miny) / stripes_range;
168+
var value = (stripesy_shrinked[primary][j] - stripes_miny) / stripes_range;
170169

171170
u_min = Math.min(u, u_min);
172171
v_max = Math.max(v, v_max);
@@ -462,10 +461,10 @@
462461
valuesx_shrinked[i] = shrink(valuesx[i].slice(from[i], to[i]+1), width - 2 * gutter);
463462
if (max_len < valuesx_shrinked[i].length) max_len = valuesx_shrinked[i].length;
464463
}
465-
}
466464

467-
if (opts.stripes) {
468-
stripesy_shrinked = shrink(stripesy[primary].slice(from[primary], to[primary]+1), width - 2 * gutter);
465+
if (opts.stripes) {
466+
stripesy_shrinked[i] = shrink(stripesy[primary].slice(from[primary], to[primary]+1), width - 2 * gutter);
467+
}
469468
}
470469

471470
allx = Array.prototype.concat.apply([], valuesx_shrinked);

0 commit comments

Comments
 (0)