From 84c4dfceb37e74eb709611d7524947bb77065bb7 Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Fri, 20 Sep 2013 02:26:42 -0400 Subject: [PATCH] fixed labels being squished together for non-stacked graphs --- web-static/graphs.html | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/web-static/graphs.html b/web-static/graphs.html index 5bd8daa..572b007 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); } } } -- 1.7.1