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.color = d3.scale.category20();
+BwDrawer.xAxis = d3.axisBottom(BwDrawer.x);
-BwDrawer.xAxis = d3.svg.axis()
- .scale(BwDrawer.x)
- .orient("bottom");
-
-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";
BwDrawer.periods = [
- { id: "3_days", label: L10n.t_3_days },
- { id: "1_week", label: L10n.t_1_week },
- { id: "1_month", label: L10n.t_1_month },
{ id: "3_months", label: L10n.t_3_months },
{ id: "1_year", label: L10n.t_1_year },
+ { id: "5_years", label: L10n.t_5_years },
];
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
});
return values;
}
+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}));
+
BwDrawer.draw_bandwidth_graph = function(raw_data, selector, period) {
+ // Purge non running relays
+ raw_data.relays.forEach(function(r, i) {
+ if (typeof r.read_history === 'undefined' || typeof r.write_history === 'undefined') {
+ raw_data.relays.splice(i, 1);
+ }
+ });
+
var update_period;
var svg = d3.select(selector).append("svg")
.attr("transform", "translate(" + BwDrawer.margin.left + "," + BwDrawer.margin.top + ")");
var form = d3.select(selector).append("form")
+ .attr("class", "graph-period")
.attr("action", "#");
BwDrawer.periods.forEach(function(p) {
var div = form.append("div");
var radio = div.append("input")
.attr("type", "radio")
.attr("name", "period")
- .attr("id", "period_" + p.id)
+ .attr("id", "bw_period_" + p.id)
.on("click", function() { update_period(p.id); });
div.append("label")
- .attr("for", "period_" + p.id)
+ .attr("for", "bw_period_" + p.id)
.text(p.label);
if (p.id == BwDrawer.periods[0].id) {
radio.attr("checked", true);
}
});
- var valid_fingerprints = [];
- nos_oignons_relays.forEach(function(r) {
- var relay_data = raw_data["relays"].filter(function(d) { return d.fingerprint == r.fingerprint; })[0];
- valid_fingerprints.push(r.fingerprint);
- });
- BwDrawer.color.domain(valid_fingerprints);
-
var bw_data = {};
BwDrawer.periods.map(function(p) { return p.id; }).forEach(function(period) {
var interval = d3.max(raw_data.relays, function(d) {