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

Temporarily remopving all animations from stacked are chart

Browse Source
This commit is contained in:
Bob Monteverde 2012-11-14 14:54:01 -05:00
parent 5bbba2fcf0
commit 8a846ef030
5 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/stackedAreaChart.html
View File

@ -227,7 +227,8 @@ nv.addGraph(function() {
d3.select('#chart2') d3.select('#chart2')
.datum(histcatexpshort) .datum(histcatexpshort)
.transition().duration(500).call(chart); //.transition().duration(500)
.call(chart);
nv.utils.windowResize(chart.update); nv.utils.windowResize(chart.update);

29
nv.d3.js
View File

@ -10071,7 +10071,8 @@ nv.models.stackedArea = function() {
var scatterWrap = g.select('.nv-scatterWrap') var scatterWrap = g.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled })) .datum(data.filter(function(d) { return !d.disabled }))
d3.transition(scatterWrap).call(scatter); //d3.transition(scatterWrap).call(scatter);
scatterWrap.call(scatter);
@ -10133,13 +10134,15 @@ nv.models.stackedArea = function() {
seriesIndex: i seriesIndex: i
}); });
}) })
d3.transition(path.exit()) //d3.transition(path.exit())
path.exit()
.attr('d', function(d,i) { return zeroArea(d.values,i) }) .attr('d', function(d,i) { return zeroArea(d.values,i) })
.remove(); .remove();
path path
.style('fill', function(d,i){ return d.color || color(d, i) }) .style('fill', function(d,i){ return d.color || color(d, i) })
.style('stroke', function(d,i){ return d.color || color(d, i) }); .style('stroke', function(d,i){ return d.color || color(d, i) });
d3.transition(path) //d3.transition(path)
path
.attr('d', function(d,i) { return area(d.values,i) }) .attr('d', function(d,i) { return area(d.values,i) })
@ -10483,7 +10486,8 @@ nv.models.stackedAreaChart = function() {
var stackedWrap = g.select('.nv-stackedWrap') var stackedWrap = g.select('.nv-stackedWrap')
.datum(data); .datum(data);
d3.transition(stackedWrap).call(stacked); //d3.transition(stackedWrap).call(stacked);
stackedWrap.call(stacked);
//------------------------------------------------------------ //------------------------------------------------------------
@ -10498,7 +10502,9 @@ nv.models.stackedAreaChart = function() {
g.select('.nv-x.nv-axis') g.select('.nv-x.nv-axis')
.attr('transform', 'translate(0,' + availableHeight + ')'); .attr('transform', 'translate(0,' + availableHeight + ')');
d3.transition(g.select('.nv-x.nv-axis')) //d3.transition(g.select('.nv-x.nv-axis'))
g.select('.nv-x.nv-axis')
.transition().duration(0)
.call(xAxis); .call(xAxis);
yAxis yAxis
@ -10507,7 +10513,9 @@ nv.models.stackedAreaChart = function() {
.tickSize(-availableWidth, 0) .tickSize(-availableWidth, 0)
.setTickFormat(stacked.offset() == 'expand' ? d3.format('%') : yAxisTickFormat); .setTickFormat(stacked.offset() == 'expand' ? d3.format('%') : yAxisTickFormat);
d3.transition(g.select('.nv-y.nv-axis')) //d3.transition(g.select('.nv-y.nv-axis'))
g.select('.nv-y.nv-axis')
.transition().duration(0)
.call(yAxis); .call(yAxis);
//------------------------------------------------------------ //------------------------------------------------------------
@ -10529,7 +10537,8 @@ nv.models.stackedAreaChart = function() {
return d return d
}); });
selection.transition().call(chart); //selection.transition().call(chart);
chart(selection);
}); });
legend.dispatch.on('legendClick', function(d,i) { legend.dispatch.on('legendClick', function(d,i) {
@ -10542,7 +10551,8 @@ nv.models.stackedAreaChart = function() {
}); });
} }
selection.transition().call(chart); //selection.transition().call(chart);
chart(selection);
}); });
controls.dispatch.on('legendClick', function(d,i) { controls.dispatch.on('legendClick', function(d,i) {
@ -10566,7 +10576,8 @@ nv.models.stackedAreaChart = function() {
break; break;
} }
selection.transition().call(chart); //selection.transition().call(chart);
chart(selection);
}); });
dispatch.on('tooltipShow', function(e) { dispatch.on('tooltipShow', function(e) {

2
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
src/models/stackedArea.js
View File

@ -116,7 +116,8 @@ nv.models.stackedArea = function() {
var scatterWrap = g.select('.nv-scatterWrap') var scatterWrap = g.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled })) .datum(data.filter(function(d) { return !d.disabled }))
d3.transition(scatterWrap).call(scatter); //d3.transition(scatterWrap).call(scatter);
scatterWrap.call(scatter);
@ -178,13 +179,15 @@ nv.models.stackedArea = function() {
seriesIndex: i seriesIndex: i
}); });
}) })
d3.transition(path.exit()) //d3.transition(path.exit())
path.exit()
.attr('d', function(d,i) { return zeroArea(d.values,i) }) .attr('d', function(d,i) { return zeroArea(d.values,i) })
.remove(); .remove();
path path
.style('fill', function(d,i){ return d.color || color(d, i) }) .style('fill', function(d,i){ return d.color || color(d, i) })
.style('stroke', function(d,i){ return d.color || color(d, i) }); .style('stroke', function(d,i){ return d.color || color(d, i) });
d3.transition(path) //d3.transition(path)
path
.attr('d', function(d,i) { return area(d.values,i) }) .attr('d', function(d,i) { return area(d.values,i) })

20
src/models/stackedAreaChart.js
View File

@ -195,7 +195,8 @@ nv.models.stackedAreaChart = function() {
var stackedWrap = g.select('.nv-stackedWrap') var stackedWrap = g.select('.nv-stackedWrap')
.datum(data); .datum(data);
d3.transition(stackedWrap).call(stacked); //d3.transition(stackedWrap).call(stacked);
stackedWrap.call(stacked);
//------------------------------------------------------------ //------------------------------------------------------------
@ -210,7 +211,9 @@ nv.models.stackedAreaChart = function() {
g.select('.nv-x.nv-axis') g.select('.nv-x.nv-axis')
.attr('transform', 'translate(0,' + availableHeight + ')'); .attr('transform', 'translate(0,' + availableHeight + ')');
d3.transition(g.select('.nv-x.nv-axis')) //d3.transition(g.select('.nv-x.nv-axis'))
g.select('.nv-x.nv-axis')
.transition().duration(0)
.call(xAxis); .call(xAxis);
yAxis yAxis
@ -219,7 +222,9 @@ nv.models.stackedAreaChart = function() {
.tickSize(-availableWidth, 0) .tickSize(-availableWidth, 0)
.setTickFormat(stacked.offset() == 'expand' ? d3.format('%') : yAxisTickFormat); .setTickFormat(stacked.offset() == 'expand' ? d3.format('%') : yAxisTickFormat);
d3.transition(g.select('.nv-y.nv-axis')) //d3.transition(g.select('.nv-y.nv-axis'))
g.select('.nv-y.nv-axis')
.transition().duration(0)
.call(yAxis); .call(yAxis);
//------------------------------------------------------------ //------------------------------------------------------------
@ -241,7 +246,8 @@ nv.models.stackedAreaChart = function() {
return d return d
}); });
selection.transition().call(chart); //selection.transition().call(chart);
chart(selection);
}); });
legend.dispatch.on('legendClick', function(d,i) { legend.dispatch.on('legendClick', function(d,i) {
@ -254,7 +260,8 @@ nv.models.stackedAreaChart = function() {
}); });
} }
selection.transition().call(chart); //selection.transition().call(chart);
chart(selection);
}); });
controls.dispatch.on('legendClick', function(d,i) { controls.dispatch.on('legendClick', function(d,i) {
@ -278,7 +285,8 @@ nv.models.stackedAreaChart = function() {
break; break;
} }
selection.transition().call(chart); //selection.transition().call(chart);
chart(selection);
}); });
dispatch.on('tooltipShow', function(e) { dispatch.on('tooltipShow', function(e) {