Skip to content

Commit

Permalink
Temporarily remopving all animations from stacked are chart
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobmonteverde
bobmonteverde committed Nov 14, 2012
1 parent 5bbba2f commit 8a846ef
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 20 deletions.
3 changes: 2 additions & 1 deletion examples/stackedAreaChart.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,8 @@

d3.select('#chart2')
.datum(histcatexpshort)
.transition().duration(500).call(chart);
//.transition().duration(500)
.call(chart);

nv.utils.windowResize(chart.update);

Expand Down
29 changes: 20 additions & 9 deletions nv.d3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10071,7 +10071,8 @@ nv.models.stackedArea = function() {
var scatterWrap = g.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }))

d3.transition(scatterWrap).call(scatter);
//d3.transition(scatterWrap).call(scatter);
scatterWrap.call(scatter);



Expand Down Expand Up @@ -10133,13 +10134,15 @@ nv.models.stackedArea = function() {
seriesIndex: i
});
})
d3.transition(path.exit())
//d3.transition(path.exit())
path.exit()
.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) });
d3.transition(path)
//d3.transition(path)
path
.attr('d', function(d,i) { return area(d.values,i) })


Expand Down Expand Up @@ -10483,7 +10486,8 @@ nv.models.stackedAreaChart = function() {

var stackedWrap = g.select('.nv-stackedWrap')
.datum(data);
d3.transition(stackedWrap).call(stacked);
//d3.transition(stackedWrap).call(stacked);
stackedWrap.call(stacked);

//------------------------------------------------------------

Expand All @@ -10498,7 +10502,9 @@ nv.models.stackedAreaChart = function() {

g.select('.nv-x.nv-axis')
.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);

yAxis
Expand All @@ -10507,7 +10513,9 @@ nv.models.stackedAreaChart = function() {
.tickSize(-availableWidth, 0)
.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);

//------------------------------------------------------------
Expand All @@ -10529,7 +10537,8 @@ nv.models.stackedAreaChart = function() {
return d
});

selection.transition().call(chart);
//selection.transition().call(chart);
chart(selection);
});

legend.dispatch.on('legendClick', function(d,i) {
Expand All @@ -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) {
Expand All @@ -10566,7 +10576,8 @@ nv.models.stackedAreaChart = function() {
break;
}

selection.transition().call(chart);
//selection.transition().call(chart);
chart(selection);
});

dispatch.on('tooltipShow', function(e) {
Expand Down
2 changes: 1 addition & 1 deletion nv.d3.min.js
View file

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions src/models/stackedArea.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ nv.models.stackedArea = function() {
var scatterWrap = g.select('.nv-scatterWrap')
.datum(data.filter(function(d) { return !d.disabled }))

d3.transition(scatterWrap).call(scatter);
//d3.transition(scatterWrap).call(scatter);
scatterWrap.call(scatter);



Expand Down Expand Up @@ -178,13 +179,15 @@ nv.models.stackedArea = function() {
seriesIndex: i
});
})
d3.transition(path.exit())
//d3.transition(path.exit())
path.exit()
.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) });
d3.transition(path)
//d3.transition(path)
path
.attr('d', function(d,i) { return area(d.values,i) })


Expand Down
20 changes: 14 additions & 6 deletions src/models/stackedAreaChart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ nv.models.stackedAreaChart = function() {

var stackedWrap = g.select('.nv-stackedWrap')
.datum(data);
d3.transition(stackedWrap).call(stacked);
//d3.transition(stackedWrap).call(stacked);
stackedWrap.call(stacked);

//------------------------------------------------------------

Expand All @@ -210,7 +211,9 @@ nv.models.stackedAreaChart = function() {

g.select('.nv-x.nv-axis')
.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);

yAxis
Expand All @@ -219,7 +222,9 @@ nv.models.stackedAreaChart = function() {
.tickSize(-availableWidth, 0)
.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);

//------------------------------------------------------------
Expand All @@ -241,7 +246,8 @@ nv.models.stackedAreaChart = function() {
return d
});

selection.transition().call(chart);
//selection.transition().call(chart);
chart(selection);
});

legend.dispatch.on('legendClick', function(d,i) {
Expand All @@ -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) {
Expand All @@ -278,7 +285,8 @@ nv.models.stackedAreaChart = function() {
break;
}

selection.transition().call(chart);
//selection.transition().call(chart);
chart(selection);
});

dispatch.on('tooltipShow', function(e) {
Expand Down

1 comment on commit 8a846ef

@okendoken
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was it done?
Do you plan to come back to animations?

Thanks!

Please sign in to comment.