move restriction to viewport to force.js

This commit is contained in:
Nils Schneider 2012-06-06 01:58:39 +02:00
parent 865d2f9124
commit 36ccf5c847
2 changed files with 13 additions and 5 deletions

View file

@ -315,11 +315,6 @@ d3.layout.force = function() {
} else {
o.x -= (o.px - (o.px = o.x)) * friction;
o.y -= (o.py - (o.py = o.y)) * friction;
if (o.x < 0) o.x = 10;
if (o.x > size[0]) o.x = size[0] - 10;
if (o.y < 0) o.y = 10;
if (o.y > size[1]) o.y = size[1] - 10;
}
}

View file

@ -131,6 +131,19 @@ var force = d3.layout.force()
.size([w, h])
force.on("tick", function() {
var size = force.size()
var nodes = force.nodes()
var n = nodes.length
for (i = 0; i < n; i++) {
var o = nodes[i]
if (!o.fixed) {
if (o.x < 0) o.x = 10
if (o.x > size[0]) o.x = size[0] - 10
if (o.y < 0) o.y = 10
if (o.y > size[1]) o.y = size[1] - 10
}
}
var link = vis.selectAll(".link")
link.selectAll("line")