This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 1a26485 Fix brush with annotations (#4773)
1a26485 is described below
commit 1a26485da4ae9edf4a46d2c274f26983f4c8152c
Author: Beto Dealmeida <robe...@dealmeida.net>
AuthorDate: Fri Apr 6 16:18:49 2018 -0700
Fix brush with annotations (#4773)
* Make annotation work with brush
* Add dispatch for events
* Fix lint
* Use xScale.clamp
---
superset/assets/visualizations/nvd3_vis.js | 58 +++++++++++++++++-------------
1 file changed, 33 insertions(+), 25 deletions(-)
diff --git a/superset/assets/visualizations/nvd3_vis.js
b/superset/assets/visualizations/nvd3_vis.js
index 9ce02bd..c5b2433 100644
--- a/superset/assets/visualizations/nvd3_vis.js
+++ b/superset/assets/visualizations/nvd3_vis.js
@@ -586,6 +586,7 @@ function nvd3Vis(slice, payload) {
xMax = chart.xAxis.scale().domain()[1].valueOf();
xScale = chart.xScale ? chart.xScale() : d3.scale.linear();
}
+ xScale.clamp(true);
if (Array.isArray(formulas) && formulas.length) {
const xValues = [];
@@ -622,7 +623,9 @@ function nvd3Vis(slice, payload) {
}));
data.push(...formulaData);
}
+ const xAxis = chart.xAxis1 ? chart.xAxis1 : chart.xAxis;
const yAxis = chart.yAxis1 ? chart.yAxis1 : chart.yAxis;
+ const chartWidth = xAxis.scale().range()[1];
const annotationHeight = yAxis.scale().range()[0];
const tipFactory = layer => d3tip()
.attr('class', 'd3-tip')
@@ -663,19 +666,7 @@ function nvd3Vis(slice, payload) {
};
}).filter(record =>
!Number.isNaN(record[e.timeColumn].getMilliseconds()));
- // account for the annotation in the x domain
- records.forEach((record) => {
- const timeValue = record[e.timeColumn];
-
- xMin = Math.min(...[xMin, timeValue]);
- xMax = Math.max(...[xMax, timeValue]);
- });
-
if (records.length) {
- const domain = [xMin, xMax];
- xScale.domain(domain);
- chart.xDomain(domain);
-
annotations.selectAll('line')
.data(records)
.enter()
@@ -693,6 +684,22 @@ function nvd3Vis(slice, payload) {
.on('mouseout', tip.hide)
.call(tip);
}
+
+ // update annotation positions on brush event
+ chart.focus.dispatch.on('onBrush.event-annotation', function () {
+ annotations.selectAll('line')
+ .data(records)
+ .attr({
+ x1: d => xScale(new Date(d[e.timeColumn])),
+ y1: 0,
+ x2: d => xScale(new Date(d[e.timeColumn])),
+ y2: annotationHeight,
+ opacity: (d) => {
+ const x = xScale(new Date(d[e.timeColumn]));
+ return (x > 0) && (x < chartWidth) ? 1 : 0;
+ },
+ });
+ });
});
// Interval annotations
@@ -721,20 +728,7 @@ function nvd3Vis(slice, payload) {
!Number.isNaN(record[e.intervalEndColumn].getMilliseconds())
));
- // account for the annotation in the x domain
- records.forEach((record) => {
- const timeValue = record[e.timeColumn];
- const intervalEndValue = record[e.intervalEndColumn];
-
- xMin = Math.min(...[xMin, timeValue, intervalEndValue]);
- xMax = Math.max(...[xMax, timeValue, intervalEndValue]);
- });
-
if (records.length) {
- const domain = [xMin, xMax];
- xScale.domain(domain);
- chart.xDomain(domain);
-
annotations.selectAll('rect')
.data(records)
.enter()
@@ -756,6 +750,20 @@ function nvd3Vis(slice, payload) {
.on('mouseout', tip.hide)
.call(tip);
}
+
+ // update annotation positions on brush event
+ chart.focus.dispatch.on('onBrush.interval-annotation', function ()
{
+ annotations.selectAll('rect')
+ .data(records)
+ .attr({
+ x: d => xScale(new Date(d[e.timeColumn])),
+ width: (d) => {
+ const x1 = xScale(new Date(d[e.timeColumn]));
+ const x2 = xScale(new Date(d[e.intervalEndColumn]));
+ return x2 - x1;
+ },
+ });
+ });
});
}
}
--
To stop receiving notification emails like this one, please contact
maximebeauche...@apache.org.
