Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show all values in a series on mouse hover #2245

Merged
merged 4 commits into from
Sep 21, 2017
Merged

Show all values in a series on mouse hover #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f06efc1
Show all values in a series on mouse hover
Sep 11, 2017
e3efe62
Revise D3 class naming to be more generic
Sep 21, 2017
5ec5062
Remove pointer events from chart bar elements
Sep 21, 2017
58d07fc
Don't treat "0" values differently in bar chart
Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 193 additions & 2 deletions src/mmw/js/src/core/chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,199 @@ function renderCompareMultibarChart(chartEl, name, label, colors, stacked, yMax,
}

d3.select(svg)
.datum(data)
.call(chart);
.datum(data)
.call(chart);

// filter definition for drop shadows
var filter =
d3.select(svg)
.selectAll("defs")
.append("filter")
.attr("id","drop-shadow")
.attr("height", "120%");

filter.append("feGaussianBlur")
.attr("in", "SourceAlpha")
.attr("stdDeviation", 2)
.attr("result", "blur");

filter.append("feOffset")
.attr("in", "blur")
.attr("dx", 2)
.attr("dy", 2)
.attr("result", "offsetBlur");

var feMerge = filter.append("feMerge");
feMerge.append("feMergeNode")
.attr("in", "offsetBlur");
feMerge.append("feMergeNode")
.attr("in", "SourceGraphic");

var chartContainerId = chartEl.id + "-chart-container";

// iterate over the series names to add the svg elements to the chart
_.forEach(["nv-series-0", "nv-series-1", "nv-series-2"],
function(el) {
d3.select("#" + chartEl.id).select("svg").selectAll("g." + el).each(function() {
var g = d3.select(this);
var parentG = d3.select(this.parentNode);
parentG.attr("id", chartContainerId);

g.selectAll(".nv-bar").each(function(bar) {
var b = d3.select(this);
var barWidth = b.attr("width");
var bgWidth = 40.0;
var bgHeight = 20.0;
var bgVertOffset = -20.0;

var dialogTickSize = 5.0;

// add drop-shadow
parentG.append("rect")
.each(function () {
d3.select(this).attr({
"transform": b.attr("transform"),
"y": (parseFloat(b.attr("y")) + bgVertOffset - 1),
"x": (parseFloat(b.attr("x")) + (parseFloat(barWidth) / 2) - (bgWidth / 2) - 1),
"width": bgWidth + 2,
"height": bgHeight + 2,
"stroke": 1,
"class": ("bar-value-text-bg-shadow " + el)
});

d3.select(this).style({
"fill": "#aaaaaa",
"opacity": 0,
"fill-opacity": 0,
"filter": "url(#drop-shadow)"
});
});

// add background shape
parentG.append("rect")
.each(function() {
d3.select(this).attr({
"transform": b.attr("transform"),
"y": (parseFloat(b.attr("y")) + bgVertOffset),
"x": (parseFloat(b.attr("x")) + (parseFloat(barWidth) / 2) - (bgWidth / 2)),
"width": bgWidth,
"height": bgHeight,
"stroke": "#aaaaaa",
"stroke-width": 0.5,
"class": ("bar-value-text-bg " + el)
});

d3.select(this).style({
"fill": "white",
"opacity": "0",
"fill-opacity": "0",
"stroke-opacity": 0.75
});
});

// add tick mark under shape
parentG.append("rect")
.each(function() {
var rotatedX = parseFloat(b.attr("x")) + parseFloat(barWidth) / 2;
var rotatedY = parseFloat(b.attr("y")) + bgHeight + bgVertOffset - (dialogTickSize / 2);
d3.select(this).attr({
"transform": (b.attr("transform") + " rotate(45," + rotatedX +"," + rotatedY + ")"),
"y": (parseFloat(b.attr("y")) + bgHeight + bgVertOffset - dialogTickSize),
"x": (parseFloat(b.attr("x")) + (parseFloat(barWidth) / 2)),
"width": dialogTickSize,
"height": dialogTickSize,
"class": ("bar-value-text-bg-tick " + el)
});

d3.select(this).style({
"fill": "white",
"fill-opacity": "0",
"opacity": "0"
});
});

// add the text value
parentG.append("text")
.each(function() {
d3.select(this).text(function() {
return parseFloat(bar.y).toFixed(2);
});

var width = this.getBBox().width;

d3.select(this).attr({
"transform": b.attr("transform"),
"y": (parseFloat(b.attr("y")) + 15 + bgVertOffset),
"x": (parseFloat(b.attr("x")) + (parseFloat(barWidth) / 2) - (width / 2)),
"font-size": "0.8rem",
"font-weight": "normal",
"font-family": "helvetica",
"class": ("bar-value-text " + el)
});

d3.select(this).style({
"stroke": "black",
"stroke-width": 0.2,
"opacity": 0,
"font-weight": "normal",
"font-family": "arial"
});

});
});
});

d3.select(svg)
.select("#" + chartContainerId)
.selectAll("g." + el)
.selectAll("rect.nv-bar")
.on("mouseover", function () {
d3.select("#" + chartContainerId)
.selectAll(".bar-value-text." + el)
.style("opacity", "1");

d3.select("#" + chartContainerId)
.selectAll(".bar-value-text-bg-shadow." + el)
.style("opacity", "0.5")
.style("fill-opacity", "0.5");

d3.select("#" + chartContainerId)
.selectAll(".bar-value-text-bg." + el)
.style("opacity", "1")
.style("fill-opacity", "1");

d3.select("#" + chartContainerId)
.selectAll(".bar-value-text-bg-tick." + el)
.style("opacity", "1")
.style("fill-opacity", "1");
});

d3.select(svg)
.select("#" + chartContainerId)
.selectAll("g." + el)
.selectAll("rect.nv-bar")
.on("mouseout", function () {
d3.select("#" + chartContainerId)
.selectAll(".bar-value-text." + el)
.style("opacity", "0");

d3.select("#" + chartContainerId)
.selectAll(".bar-value-text-bg-shadow." + el)
.style("opacity", "0")
.style("fill-opacity", "0");

d3.select("#" + chartContainerId)
.selectAll(".bar-value-text-bg." + el)
.style("opacity", "0")
.style("fill-opacity", "0");

d3.select("#" + chartContainerId)
.selectAll(".bar-value-text-bg-tick." + el)
.style("opacity", "0")
.style("fill-opacity", "0");
});
});


return chart;
}, onRenderComplete);
Expand Down
7 changes: 7 additions & 0 deletions src/mmw/sass/pages/_compare.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,13 @@ $compare-chart-table-height: calc(100vh - #{$height-lg} - #{$compare-footer-heig
rect {
transition: opacity 0.3s ease-in-out;
}

.bar-value-text-bg-shadow,
.bar-value-text-bg,
.bar-value-text-bg-tick,
.bar-value-text {
pointer-events: none;
}
}

.compare-scenario-gradient {
Expand Down