Merge branch 'force-rangeerror' of https://github.com/jasondavies/d3 into release
This commit is contained in:
Коммит
3d6eba8d19
10
d3.layout.js
10
d3.layout.js
|
@ -560,12 +560,18 @@ function d3_layout_forceAccumulate(quad) {
|
|||
cy = 0;
|
||||
quad.count = 0;
|
||||
if (!quad.leaf) {
|
||||
quad.nodes.forEach(function(c) {
|
||||
var nodes = quad.nodes,
|
||||
n = nodes.length,
|
||||
i = -1,
|
||||
c;
|
||||
while (++i < n) {
|
||||
c = nodes[i];
|
||||
if (c == null) continue;
|
||||
d3_layout_forceAccumulate(c);
|
||||
quad.count += c.count;
|
||||
cx += c.count * c.cx;
|
||||
cy += c.count * c.cy;
|
||||
});
|
||||
}
|
||||
}
|
||||
if (quad.point) {
|
||||
// jitter internal nodes that are coincident
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -354,12 +354,18 @@ function d3_layout_forceAccumulate(quad) {
|
|||
cy = 0;
|
||||
quad.count = 0;
|
||||
if (!quad.leaf) {
|
||||
quad.nodes.forEach(function(c) {
|
||||
var nodes = quad.nodes,
|
||||
n = nodes.length,
|
||||
i = -1,
|
||||
c;
|
||||
while (++i < n) {
|
||||
c = nodes[i];
|
||||
if (c == null) continue;
|
||||
d3_layout_forceAccumulate(c);
|
||||
quad.count += c.count;
|
||||
cx += c.count * c.cx;
|
||||
cy += c.count * c.cy;
|
||||
});
|
||||
}
|
||||
}
|
||||
if (quad.point) {
|
||||
// jitter internal nodes that are coincident
|
||||
|
|
Загрузка…
Ссылка в новой задаче