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

Fix wrong yDomain for stacked area charts in MultiChart #2170

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix wrong yDomain for stacked area charts in MultiChart #2170

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7c4b97d
Fix wrong yDomain for stacked area charts in MultiChart
emanuele-f Jun 28, 2018
07e3c74
Fix multiChart scale with non-stacked lines
emanuele-f Jul 12, 2018
837e180
Fix stacked series ignoring non stacked series y scale in multiChart
emanuele-f Jul 12, 2018
b8027a8
Fix bar chart stacked check
emanuele-f Jul 13, 2018
b0d7d17
Fix multichart y scale
emanuele-f Jul 13, 2018
a4d8ffe
Fix issues with non stacked charts
emanuele-f Jul 13, 2018
f4851e0
Remove duplicate line
emanuele-f Jul 13, 2018
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
54 changes: 31 additions & 23 deletions src/models/multiChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,29 @@ nv.models.multiChart = function() {
container.selectAll('.nv-noData').remove();
}

var series1 = data.filter(function(d) {return !d.disabled && d.yAxis == 1})
.map(function(d) {
return d.values.map(function(d,i) {
return { x: getX(d), y: getY(d) }
})
var series_mapper = function(d) {
return d.values.map(function(d,i) {
return { x: getX(d), y: getY(d) }
});
}

var is_stacked = function(d) {
return (d.type == 'area')
|| (d.type == 'bar' && d.yAxis == 1 && bars1.stacked())
|| (d.type == 'bar' && d.yAxis == 2 && bars2.stacked());
}

var series1 = data.filter(function(d) {return !d.disabled && d.yAxis == 1})
.map(series_mapper);

var series1_stacked = data.filter(function(d) {return !d.disabled && d.yAxis == 1 && is_stacked(d)})
.map(series_mapper);

var series2 = data.filter(function(d) {return !d.disabled && d.yAxis == 2})
.map(function(d) {
return d.values.map(function(d,i) {
return { x: getX(d), y: getY(d) }
})
});
.map(series_mapper);

var series2_stacked = data.filter(function(d) {return !d.disabled && d.yAxis == 2 && is_stacked(d)})
.map(series_mapper);

x .domain(d3.extent(d3.merge(series1.concat(series2)), function(d) { return d.x }))
.range([0, availableWidth]);
Expand Down Expand Up @@ -240,31 +250,29 @@ nv.models.multiChart = function() {
});
}).map(function(x) {return d3.sum(x);})
}

yScale1 .domain(yDomain1 || d3.extent(d3.merge(series1).concat(extraValue1BarStacked), function(d) { return d.y } ))
.range([0, availableHeight]);
var series1_stacked_y_domain = d3.max(getStackedAreaYs(series1_stacked));
if(series1_stacked_y_domain) {
yScale1 .domain([0, Math.max(series1_stacked_y_domain, yScale1.domain()[1])]).range([0, availableHeight]);
}

yScale2 .domain(yDomain2 || d3.extent(d3.merge(series2).concat(extraValue2BarStacked), function(d) { return d.y } ))
.range([0, availableHeight]);
var series2_stacked_y_domain = d3.max(getStackedAreaYs(series2_stacked))
if(series2_stacked_y_domain) {
yScale2 .domain([0, Math.max(series2_stacked_y_domain, yScale2.domain()[1])]).range([0, availableHeight]);
}

lines1.yDomain(yScale1.domain());
scatters1.yDomain(yScale1.domain());
if(bars1.stacked()) {
var yStackScale1 = yScale1.domain([0, d3.max(getStackedAreaYs(series1))]).range([0, availableHeight]);
bars1.yDomain(yStackScale1.domain())
} else {
bars1.yDomain(yScale1.domain());
}
bars1.yDomain(yScale1.domain())
stack1.yDomain(yScale1.domain());

lines2.yDomain(yScale2.domain());
scatters2.yDomain(yScale2.domain());
if(bars2.stacked()) {
var yStackScale2 = yScale2.domain([0, d3.max(getStackedAreaYs(series2))]).range([0, availableHeight]);
bars2.yDomain(yStackScale2.domain())
} else {
bars2.yDomain(yScale2.domain());
}
bars2.yDomain(yScale2.domain())
stack2.yDomain(yScale2.domain());

if(dataStack1.length){d3.transition(stack1Wrap).call(stack1);}
Expand Down