Correction suite à un conflit git mal géré

[website.git] / assets / weights_graphs.js

diff --git a/assets/weights_graphs.js b/assets/weights_graphs.js
index 71a9fa32f70ce44fbfaaded5e9658ca381cc4655..1b949c59da95d2db9e2c83d429419c5e6fb17ff2 100644 (file)
--- a/assets/weights_graphs.js
+++ b/assets/weights_graphs.js
@@ -11,33 +11,37 @@ 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.width = 600 - WeightsDrawer.margin.left - WeightsDrawer.margin.right;
 WeightsDrawer.height = 400 - WeightsDrawer.margin.top - WeightsDrawer.margin.bottom;
 

-WeightsDrawer.parseTime = d3.timeFormat("%Y-%m-%d %H:%M:%S").parse;
-WeightsDrawer.percentFormatter = d3.format("2%");
+WeightsDrawer.parseTime = d3.time.format("%Y-%m-%d %H:%M:%S").parse;
+WeightsDrawer.percentFormatter = d3.format(".2%");

 
 

-WeightsDrawer.x = d3.timeDay
+WeightsDrawer.x = d3.time.scale()

     .range([0, WeightsDrawer.width]);
 
     .range([0, WeightsDrawer.width]);
 

-WeightsDrawer.y = d3.scaleLinear()
+WeightsDrawer.y = d3.scale.linear()

     .range([WeightsDrawer.height, 0]);
 
     .range([WeightsDrawer.height, 0]);
 

-WeightsDrawer.xAxis = d3.axisBottom(WeightsDrawer.x);
+WeightsDrawer.xAxis = d3.svg.axis()
+    .scale(WeightsDrawer.x)
+    .orient("bottom");

 
 

-WeightsDrawer.yAxis = d3.axisLeft(WeightsDrawer.y)
+WeightsDrawer.yAxis = d3.svg.axis()
+    .scale(WeightsDrawer.y)
+    .orient("left")

     .tickFormat(function(d) { return (d == 0) ? "" : WeightsDrawer.percentFormatter(d); });
 
     .tickFormat(function(d) { return (d == 0) ? "" : WeightsDrawer.percentFormatter(d); });
 

-WeightsDrawer.area = d3.area()
+WeightsDrawer.area = d3.svg.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); });
 
     .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.stack()
-    .value(function(d) { return d.values; });
+WeightsDrawer.stack = d3.layout.stack()
+    .values(function(d) { return d.values; });

 
 WeightsDrawer.onionoo_url = "https://onionoo.torproject.org/weights?type=relay&contact=adminsys@nos-oignons.net";
 
 WeightsDrawer.periods = [
     { id: "1_month", label: L10n.t_1_month },
 
 WeightsDrawer.onionoo_url = "https://onionoo.torproject.org/weights?type=relay&contact=adminsys@nos-oignons.net";
 
 WeightsDrawer.periods = [
     { id: "1_month", label: L10n.t_1_month },

-    { id: "3_months", label: L10n.t_3_months },
+    { id: "6_months", label: L10n.t_6_months },

     { id: "1_year", label: L10n.t_1_year },
     { id: "5_years", label: L10n.t_5_years },
   ];
     { id: "1_year", label: L10n.t_1_year },
     { id: "5_years", label: L10n.t_5_years },
   ];


@@ -64,7 +68,7 @@ WeightsDrawer.extract_values = function(history, interval, minTime, maxTime) {
   return values;
 }
 
   return values;
 }
 

-WeightsDrawer.color = d3.scaleOrdinal();
+WeightsDrawer.color = d3.scale.ordinal();

 WeightsDrawer.color.domain(nos_oignons_relays.map(function(r) {return r.fingerprint}));
 WeightsDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color}));
 
 WeightsDrawer.color.domain(nos_oignons_relays.map(function(r) {return r.fingerprint}));
 WeightsDrawer.color.range(nos_oignons_relays.map(function(r) {return r.color}));