blob42
/
nvd3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed two stacked area chart issues:

Browse Source 
1. When in expanded view in stacked area chart, if there is missing data (zero data), 'holes' will be displayed in the chart where data is missing.
2. Tooltips used to be disabled if the stacked area showed values less than zero. This functionality has been disabled.
master
Robin Hu 11 years ago
parent a1e6ad4d8b
commit 24b949d931
4 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File

54
nv.d3.js
Unescape Escape View File

@ -12437,30 +12437,34 @@ nv.models.stackedArea = function() {
// Injecting point index into each point because d3.layout.stack().out does not give index
// ***Also storing getY(d,i) as stackedY so that it can be set to 0 if series is disabled
data = data.map(function(aseries, i) {
aseries.seriesIndex = i;
aseries.values = aseries.values.map(function(d, j) {
d.index = j;
d.stackedY = aseries.disabled ? 0 : getY(d,j);
d.seriesIndex = i;
return d;
})
return aseries;
});
var dataFiltered = data.filter(function(series) {
return !series.disabled;
});
data = d3.layout.stack()
.order(order)
.offset(offset)
.values(function(d) { return d.values }) //TODO: make values customizeable in EVERY model in this fashion
.x(getX)
.y(function(d) { return d.stackedY })
.y(getY)
.out(function(d, y0, y) {
d.display = {
y: y,
y0: y0
};
var yHeight = (getY(d) === 0) ? 0 : y;
d.display = {
y: yHeight,
y0: y0
};
})
(data);
(dataFiltered);
//------------------------------------------------------------
@ -12487,12 +12491,12 @@ nv.models.stackedArea = function() {
.y(function(d) { return d.display.y + d.display.y0 })
.forceY([0])
.color(data.map(function(d,i) {
return d.color || color(d, i);
}).filter(function(d,i) { return !data[i].disabled }));
return d.color || color(d, d.seriesIndex);
}));
var scatterWrap = g.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }))
.datum(data);
//d3.transition(scatterWrap).call(scatter);
scatterWrap.call(scatter);
@ -12516,8 +12520,12 @@ nv.models.stackedArea = function() {
var area = d3.svg.area()
.x(function(d,i) { return x(getX(d,i)) })
.y0(function(d) { return y(d.display.y0) })
.y1(function(d) { return y(d.display.y + d.display.y0) })
.y0(function(d) {
return y(d.display.y0)
})
.y1(function(d) {
return y(d.display.y + d.display.y0)
})
.interpolate(interpolate);
var zeroArea = d3.svg.area()
@ -12527,7 +12535,9 @@ nv.models.stackedArea = function() {
var path = g.select('.nv-areaWrap').selectAll('path.nv-area')
.data(function(d) { return d });
.data(function(d) {
return d
});
//.data(function(d) { return d }, function(d) { return d.key });
path.enter().append('path').attr('class', function(d,i) { return 'nv-area nv-area-' + i })
.on('mouseover', function(d,i) {
@ -12562,11 +12572,15 @@ nv.models.stackedArea = function() {
.attr('d', function(d,i) { return zeroArea(d.values,i) })
.remove();
path
.style('fill', function(d,i){ return d.color || color(d, i) })
.style('stroke', function(d,i){ return d.color || color(d, i) });
.style('fill', function(d,i){
return d.color || color(d, d.seriesIndex)
})
.style('stroke', function(d,i){ return d.color || color(d, d.seriesIndex) });
//d3.transition(path)
path
.attr('d', function(d,i) { return area(d.values,i) })
.attr('d', function(d,i) {
return area(d.values,i)
})
//============================================================
@ -12757,12 +12771,6 @@ nv.models.stackedAreaChart = function() {
yAxis
.orient((rightAlignYAxis) ? 'right' : 'left')
;
stacked.scatter
.pointActive(function(d) {
//console.log(stacked.y()(d), !!Math.round(stacked.y()(d) * 100));
return !!Math.round(stacked.y()(d) * 100);
})
;
//============================================================

14
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

48
src/models/stackedArea.js
Unescape Escape View File

@ -59,30 +59,34 @@ nv.models.stackedArea = function() {
// Injecting point index into each point because d3.layout.stack().out does not give index
// ***Also storing getY(d,i) as stackedY so that it can be set to 0 if series is disabled
data = data.map(function(aseries, i) {
aseries.seriesIndex = i;
aseries.values = aseries.values.map(function(d, j) {
d.index = j;
d.stackedY = aseries.disabled ? 0 : getY(d,j);
d.seriesIndex = i;
return d;
})
return aseries;
});
var dataFiltered = data.filter(function(series) {
return !series.disabled;
});
data = d3.layout.stack()
.order(order)
.offset(offset)
.values(function(d) { return d.values }) //TODO: make values customizeable in EVERY model in this fashion
.x(getX)
.y(function(d) { return d.stackedY })
.y(getY)
.out(function(d, y0, y) {
d.display = {
y: y,
y0: y0
};
var yHeight = (getY(d) === 0) ? 0 : y;
d.display = {
y: yHeight,
y0: y0
};
})
(data);
(dataFiltered);
//------------------------------------------------------------
@ -109,12 +113,12 @@ nv.models.stackedArea = function() {
.y(function(d) { return d.display.y + d.display.y0 })
.forceY([0])
.color(data.map(function(d,i) {
return d.color || color(d, i);
}).filter(function(d,i) { return !data[i].disabled }));
return d.color || color(d, d.seriesIndex);
}));
var scatterWrap = g.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }))
.datum(data);
//d3.transition(scatterWrap).call(scatter);
scatterWrap.call(scatter);
@ -138,8 +142,12 @@ nv.models.stackedArea = function() {
var area = d3.svg.area()
.x(function(d,i) { return x(getX(d,i)) })
.y0(function(d) { return y(d.display.y0) })
.y1(function(d) { return y(d.display.y + d.display.y0) })
.y0(function(d) {
return y(d.display.y0)
})
.y1(function(d) {
return y(d.display.y + d.display.y0)
})
.interpolate(interpolate);
var zeroArea = d3.svg.area()
@ -149,7 +157,9 @@ nv.models.stackedArea = function() {
var path = g.select('.nv-areaWrap').selectAll('path.nv-area')
.data(function(d) { return d });
.data(function(d) {
return d
});
//.data(function(d) { return d }, function(d) { return d.key });
path.enter().append('path').attr('class', function(d,i) { return 'nv-area nv-area-' + i })
.on('mouseover', function(d,i) {
@ -184,11 +194,15 @@ nv.models.stackedArea = function() {
.attr('d', function(d,i) { return zeroArea(d.values,i) })
.remove();
path
.style('fill', function(d,i){ return d.color || color(d, i) })
.style('stroke', function(d,i){ return d.color || color(d, i) });
.style('fill', function(d,i){
return d.color || color(d, d.seriesIndex)
})
.style('stroke', function(d,i){ return d.color || color(d, d.seriesIndex) });
//d3.transition(path)
path
.attr('d', function(d,i) { return area(d.values,i) })
.attr('d', function(d,i) {
return area(d.values,i)
})
//============================================================

6
src/models/stackedAreaChart.js
Unescape Escape View File

@ -43,12 +43,6 @@ nv.models.stackedAreaChart = function() {
yAxis
.orient((rightAlignYAxis) ? 'right' : 'left')
;
stacked.scatter
.pointActive(function(d) {
//console.log(stacked.y()(d), !!Math.round(stacked.y()(d) * 100));
return !!Math.round(stacked.y()(d) * 100);
})
;
//============================================================

Write Preview
Loading…
Cancel
Save