X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=web-static%2Fgraphs.html;h=b7fe3928e07aa44b8b9ba1098d79f48e44266fbd;hb=b70dff0a99a57d48a860a88106c120467a0e2cad;hp=62d8c745c150352cf7ac4915b1ce03db1f3484e2;hpb=97ade2b07daaf09d407a0be9254fb73a30a7faf8;p=p2pool.git

diff --git a/web-static/graphs.html b/web-static/graphs.html
index 62d8c74..b7fe392 100644
--- a/web-static/graphs.html
+++ b/web-static/graphs.html
@@ -290,6 +290,8 @@
                         d3.max(lines, function(line) { return d3.max(line.data, itemgetter(1)); } )
                     ]).range([h - margin_v, margin_v]);
                     
+                    var y_abs = d3.scale.linear().domain([0, 1]).range([h - margin_v, margin_v]);
+                    
                     g.selectAll().data(lines).enter().append("svg:path")
                         .attr("d", function(line) {
                             return d3.svg.line()
@@ -301,24 +303,32 @@
                         .style("stroke", function(line) { return line.color })
                         .attr("class", "plotline");
                     
+                    lines.sort(function(a, b) { return get_area_mean(a.data).mean > get_area_mean(b.data).mean; });
+                    
                     for(var i = 0; i < lines.length; ++i) {
                         var line = lines[i];
                         var stats = get_area_mean(line.data);
                         if(stats.mean != null) {
+                            g.append("svg:line")
+                                .style("stroke", line.color)
+                                .attr("x1", w - margin_h + 3)
+                                .attr("y1", y(stats.mean))
+                                .attr("x2", w - margin_h + 10)
+                                .attr("y2", y_abs(i/lines.length));
                             g.append("svg:text")
                                 .text(line.label)
                                 .attr("text-anchor", "start")
                                 .attr("dominant-baseline", "central")
                                 .attr("fill", line.color)
                                 .attr("x", w - margin_h + 10)
-                                .attr("y", y(stats.mean) - 12);
+                                .attr("y", y_abs(i/lines.length) - 12);
                             g.append("svg:text")
-                                .text("-Mean: " + d3.format(".3s")(stats.mean) + unit)
+                                .text("Mean: " + d3.format(".3s")(stats.mean) + unit)
                                 .attr("text-anchor", "start")
                                 .attr("dominant-baseline", "central")
                                 .attr("fill", line.color)
-                                .attr("x", w - margin_h)
-                                .attr("y", y(stats.mean));
+                                .attr("x", w - margin_h + 10)
+                                .attr("y", y_abs(i/lines.length));
                             if(total_unit != null)
                                 g.append("svg:text")
                                     .text("Area: " + d3.format(".3s")(stats.area) + total_unit)
@@ -326,7 +336,7 @@
                                     .attr("dominant-baseline", "central")
                                     .attr("fill", line.color)
                                     .attr("x", w - margin_h + 10)
-                                    .attr("y", y(stats.mean) + 12);
+                                    .attr("y", y_abs(i/lines.length) + 12);
                         }
                     }
                 }
@@ -420,20 +430,18 @@
                     {"url": "../web/graph_data/local_hash_rate/last_" + lowerperiod, "color": "#0000FF", "label": "Total"},
                     {"url": "../web/graph_data/local_dead_hash_rate/last_" + lowerperiod, "color": "#FF0000", "label": "Dead"}
                 ]);
-                plot_later(d3.select("#local_shares"), "H/s", "H", [
-                    {"url": "../web/graph_data/local_share_hash_rate/last_" + lowerperiod, "color": "#0000FF", "label": "Total"},
-                    //{"url": getData("../web/graph_data/local_dead_share_hash_rate/last_" + lowerperiod, "color": "#FF0000", "label": "Dead"}
-                ]);
+                d3.json("../web/graph_data/local_share_hash_rates/last_" + lowerperiod, function(data) {
+                    plot(d3.select('#local_shares'), 'H/s', 'H', data_to_lines(data), true);
+                });
                 plot_later(d3.select("#payout"), currency_info.symbol, null, [
                     {"url": "../web/graph_data/current_payout/last_" + lowerperiod, "color": "#0000FF"}
                 ]);
                 d3.json("../web/graph_data/pool_rates/last_" + lowerperiod, function(data) {
                     plot(d3.select('#pool'), 'H/s', 'H', data_to_lines(data), true);
                 });
-                plot_later(d3.select("#peers"), "", null, [
-                    {"url": "../web/graph_data/outgoing_peers/last_" + lowerperiod, "color": "#FF0000", "label": "Outgoing"},
-                    {"url": "../web/graph_data/incoming_peers/last_" + lowerperiod, "color": "#0000FF", "label": "Incoming"}
-                ], true);
+                d3.json("../web/graph_data/peers/last_" + lowerperiod, function(data) {
+                    plot(d3.select('#peers'), '', null, data_to_lines(data, function(line){ return line.label == "incoming" }), true);
+                });
                 
                 d3.json("../web/graph_data/miner_hash_rates/last_" + lowerperiod, function(data) {
                     d3.json("../web/graph_data/miner_dead_hash_rates/last_" + lowerperiod, function(dead_data) {