Browse Source

Merge branch 'master' of https://figureslibres.io/gogs/kevin/r2c_mapd3js

marie 6 years ago
parent
commit
a5581ad7a3
2 changed files with 1 additions and 79 deletions
  1. 1 78
      index.html
  2. 0 1
      script/script.js

+ 1 - 78
index.html

@@ -1,83 +1,6 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <meta charset="utf-8">
 <meta charset="utf-8">
 <link rel="stylesheet" href="styles/styles.css">
 <link rel="stylesheet" href="styles/styles.css">
-<svg width="960" height="600"></svg>
+<svg width="1920" height="1080"></svg>
 <script src="script/d3js/d3.js"></script>
 <script src="script/d3js/d3.js"></script>
 <script src="script/script.js"></script>
 <script src="script/script.js"></script>
-<!--
-<script>
-
-var svg = d3.select("svg"),
-    width = +svg.attr("width"),
-    height = +svg.attr("height");
-
-var color = d3.scaleOrdinal(d3.schemeCategory20);
-
-var simulation = d3.forceSimulation()
-    .force("link", d3.forceLink().id(function(d) { return d.id; }))
-    .force("charge", d3.forceManyBody())
-    .force("center", d3.forceCenter(width / 2, height / 2));
-
-d3.json("miserables.json", function(error, graph) {
-  if (error) throw error;
-
-  var link = svg.append("g")
-      .attr("class", "links")
-    .selectAll("line")
-    .data(graph.links)
-    .enter().append("line")
-      .attr("stroke-width", function(d) { return Math.sqrt(d.value); });
-
-  var node = svg.append("g")
-      .attr("class", "nodes")
-    .selectAll("circle")
-    .data(graph.nodes)
-    .enter().append("circle")
-      .attr("r", 5)
-      .attr("fill", function(d) { return color(d.group); })
-      .call(d3.drag()
-          .on("start", dragstarted)
-          .on("drag", dragged)
-          .on("end", dragended));
-
-  node.append("title")
-      .text(function(d) { return d.id; });
-
-  simulation
-      .nodes(graph.nodes)
-      .on("tick", ticked);
-
-  simulation.force("link")
-      .links(graph.links);
-
-  function ticked() {
-    link
-        .attr("x1", function(d) { return d.source.x; })
-        .attr("y1", function(d) { return d.source.y; })
-        .attr("x2", function(d) { return d.target.x; })
-        .attr("y2", function(d) { return d.target.y; });
-
-    node
-        .attr("cx", function(d) { return d.x; })
-        .attr("cy", function(d) { return d.y; });
-  }
-});
-
-function dragstarted(d) {
-  if (!d3.event.active) simulation.alphaTarget(0.3).restart();
-  d.fx = d.x;
-  d.fy = d.y;
-}
-
-function dragged(d) {
-  d.fx = d3.event.x;
-  d.fy = d3.event.y;
-}
-
-function dragended(d) {
-  if (!d3.event.active) simulation.alphaTarget(0);
-  d.fx = null;
-  d.fy = null;
-}
-
-</script> -->

+ 0 - 1
script/script.js

@@ -1,4 +1,3 @@
-
   var svg = d3.select("svg"),
   var svg = d3.select("svg"),
       width = +svg.attr("width"),
       width = +svg.attr("width"),
       height = +svg.attr("height");
       height = +svg.attr("height");