diff --git a/.travis.yml b/.travis.yml index 4346d9b8..ed41afe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: node_js node_js: - - "0.10" + - "4.1" before_script: - "npm install -g grunt-cli" \ No newline at end of file diff --git a/WebCola/examples/smallworldwithgroups.html b/WebCola/examples/smallworldwithgroups.html index 56329153..5e8f2902 100644 --- a/WebCola/examples/smallworldwithgroups.html +++ b/WebCola/examples/smallworldwithgroups.html @@ -13,14 +13,15 @@ } .link { - stroke: #999; - stroke-opacity: .8; + stroke: darkgray; + stroke-width: 0.7px; + stroke-opacity: .4; } .group { - stroke: #fff; + stroke: white; stroke-width: 1.5px; - opacity: 0.2; + opacity: 0.4; } @@ -46,7 +47,7 @@

Simple Groups Example

.attr("width", width) .attr("height", height); - d3.json("graphdata/miserables.json", function (error, graph) { + d3.json("graphdata/braingraph.json", function (error, graph) { var groupMap = {}; graph.nodes.forEach(function (v, i) { var g = v.group; @@ -66,9 +67,9 @@

Simple Groups Example

.nodes(graph.nodes) .links(graph.links) .groups(groups) - .jaccardLinkLengths(40, 0.7) + .jaccardLinkLengths(60, 0.7) .avoidOverlaps(true) - .start(20, 10, 10); + .start(80, 0, 80); var group = svg.selectAll('.group') .data(groups) @@ -81,8 +82,7 @@

Simple Groups Example

var link = svg.selectAll(".link") .data(graph.links) .enter().append("line") - .attr("class", "link") - .style("stroke-width", function (d) { return Math.sqrt(d.value); }); + .attr("class", "link"); var node = svg.selectAll(".node") .data(graph.nodes) @@ -122,7 +122,7 @@

Simple Groups Example

.groups(groups) .jaccardLinkLengths(40, 0.7) .avoidOverlaps(true) - .start(20, 0, 10); + .start(40, 0, 40); In the above, groups is an array where each group object contains a single property leaves which is an array of indices to the graph.nodes array. We turn on avoidOverlaps to get cola to