From a43d3ebb1295a04ca24e3a04ed152e02b3dea178 Mon Sep 17 00:00:00 2001 From: Nicolas Braud-Santoni Date: Sat, 4 Aug 2018 15:02:36 +0800 Subject: [PATCH] =?utf8?q?bw=5Fgraphs:=20Mise=20=C3=A0=20jour=20pour=20l'A?= =?utf8?q?PI=20de=20d3=20v5.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- assets/bw_graphs.js | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/assets/bw_graphs.js b/assets/bw_graphs.js index ee51966..567d43a 100644 --- a/assets/bw_graphs.js +++ b/assets/bw_graphs.js @@ -7,33 +7,29 @@ BwDrawer.margin = {top: 50, right: 10, bottom: 90, left: 130}; BwDrawer.width = 600 - BwDrawer.margin.left - BwDrawer.margin.right; BwDrawer.height = 400 - BwDrawer.margin.top - BwDrawer.margin.bottom; -BwDrawer.parseTime = d3.time.format("%Y-%m-%d %H:%M:%S").parse; -BwDrawer.bwFormatter = d3.format(".f"); +BwDrawer.parseTime = d3.timeFormat("%Y-%m-%d %H:%M:%S").parse; +BwDrawer.bwFormatter = d3.format("f"); -BwDrawer.x = d3.time.scale() +BwDrawer.x = d3.timeDay .range([0, BwDrawer.width]); -BwDrawer.y = d3.scale.linear() +BwDrawer.y = d3.scaleLinear() .range([BwDrawer.height, 0]); -BwDrawer.xAxis = d3.svg.axis() - .scale(BwDrawer.x) - .orient("bottom"); +BwDrawer.xAxis = d3.axisBottom(BwDrawer.x); -BwDrawer.yAxis = d3.svg.axis() - .scale(BwDrawer.y) - .orient("left") +BwDrawer.yAxis = d3.axisLeft(BwDrawer.y) .tickFormat(function(d) { return (d == 0) ? "" : BwDrawer.bwFormatter(Math.abs(d)) + " Mbit/s " + ((d > 0) ? "in" : "out"); }); -BwDrawer.area = d3.svg.area() +BwDrawer.area = d3.area() .x(function(d) { return BwDrawer.x(d.date); }) .y0(function(d) { return BwDrawer.y(d.y0); }) .y1(function(d) { return BwDrawer.y(d.y0 + d.y); }); -BwDrawer.read_stack = d3.layout.stack() - .values(function(d) { return d.read_values; }); -BwDrawer.write_stack = d3.layout.stack() - .values(function(d) { return d.write_values; }); +BwDrawer.read_stack = d3.stack() + .value(function(d) { return d.read_values; }); +BwDrawer.write_stack = d3.stack() + .value(function(d) { return d.write_values; }); BwDrawer.onionoo_url = "https://onionoo.torproject.org/bandwidth?type=relay&contact=adminsys@nos-oignons.net"; @@ -48,7 +44,7 @@ BwDrawer.extract_values = function(history, interval, minTime, maxTime) { var first = history ? BwDrawer.parseTime(history.first) : maxTime; var last = history ? BwDrawer.parseTime(history.last) : minTime; var i = 0; - for (var current = minTime; current <= maxTime; current = d3.time.second.offset(current, interval)) { + for (var current = minTime; current <= maxTime; current = d3.timeSecond.offset(current, interval)) { values.push({ date: current, y: (first <= current && current <= last) ? history.factor * history.values[i++] * 8 / 1000000 : 0 }); @@ -56,7 +52,7 @@ BwDrawer.extract_values = function(history, interval, minTime, maxTime) { return values; } -BwDrawer.color = d3.scale.ordinal(); +BwDrawer.color = d3.scaleOrdinal(); BwDrawer.color.domain(nos_oignons_relays.map(function(r) {return r.fingerprint})); BwDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color})); -- 2.39.5