From 6e0449e71ad3e000b771489dbf45514b243e3f76 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Sat, 4 Aug 2018 15:07:21 +0800 Subject: [PATCH] =?utf8?q?weight=5Fgraphs:=20Mise=20=C3=A0=20jour=20pour?= =?utf8?q?=20l'API=20de=20d3=20v5.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- assets/weights_graphs.js | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/assets/weights_graphs.js b/assets/weights_graphs.js index 943111f..71a9fa3 100644 --- a/assets/weights_graphs.js +++ b/assets/weights_graphs.js @@ -11,31 +11,27 @@ WeightsDrawer.margin = {top: 50, right: 10, bottom: 90, left: 130}; WeightsDrawer.width = 600 - WeightsDrawer.margin.left - WeightsDrawer.margin.right; WeightsDrawer.height = 400 - WeightsDrawer.margin.top - WeightsDrawer.margin.bottom; -WeightsDrawer.parseTime = d3.time.format("%Y-%m-%d %H:%M:%S").parse; -WeightsDrawer.percentFormatter = d3.format(".2%"); +WeightsDrawer.parseTime = d3.timeFormat("%Y-%m-%d %H:%M:%S").parse; +WeightsDrawer.percentFormatter = d3.format("2%"); -WeightsDrawer.x = d3.time.scale() +WeightsDrawer.x = d3.timeDay .range([0, WeightsDrawer.width]); -WeightsDrawer.y = d3.scale.linear() +WeightsDrawer.y = d3.scaleLinear() .range([WeightsDrawer.height, 0]); -WeightsDrawer.xAxis = d3.svg.axis() - .scale(WeightsDrawer.x) - .orient("bottom"); +WeightsDrawer.xAxis = d3.axisBottom(WeightsDrawer.x); -WeightsDrawer.yAxis = d3.svg.axis() - .scale(WeightsDrawer.y) - .orient("left") +WeightsDrawer.yAxis = d3.axisLeft(WeightsDrawer.y) .tickFormat(function(d) { return (d == 0) ? "" : WeightsDrawer.percentFormatter(d); }); -WeightsDrawer.area = d3.svg.area() +WeightsDrawer.area = d3.area() .x(function(d) { return WeightsDrawer.x(d.date); }) .y0(function(d) { return WeightsDrawer.y(d.y0); }) .y1(function(d) { return WeightsDrawer.y(d.y0 + d.y); }); -WeightsDrawer.stack = d3.layout.stack() - .values(function(d) { return d.values; }); +WeightsDrawer.stack = d3.stack() + .value(function(d) { return d.values; }); WeightsDrawer.onionoo_url = "https://onionoo.torproject.org/weights?type=relay&contact=adminsys@nos-oignons.net"; @@ -68,7 +64,7 @@ WeightsDrawer.extract_values = function(history, interval, minTime, maxTime) { return values; } -WeightsDrawer.color = d3.scale.ordinal(); +WeightsDrawer.color = d3.scaleOrdinal(); WeightsDrawer.color.domain(nos_oignons_relays.map(function(r) {return r.fingerprint})); WeightsDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color})); -- 2.39.5