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

Fixing transition issues with linePlusBarWithFocusChart.

Browse Source
This commit is contained in:
Robin Hu 2013-08-24 11:22:02 -04:00
parent 6244f27d0e
commit ad1a18d761
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/linePlusBarWithFocusChart.html
View File

@ -119,7 +119,7 @@ nv.addGraph(function() {
nv.log(testdata);
d3.select('#chart1 svg')
.datum(testdata)
.transition().duration(500).call(chart);
.call(chart);
// nv.utils.windowResize(chart.update);

23
src/models/linePlusBarWithFocusChart.js
View File

@ -43,6 +43,7 @@ nv.models.linePlusBarWithFocusChart = function() {
, y4
, noData = "No Data Available."
, dispatch = d3.dispatch('tooltipShow', 'tooltipHide', 'brush')
, transitionDuration = 0
;
lines
@ -107,7 +108,7 @@ nv.models.linePlusBarWithFocusChart = function() {
- margin.top - margin.bottom - height2,
availableHeight2 = height2 - margin2.top - margin2.bottom;
chart.update = function() { container.transition().call(chart); };
chart.update = function() { container.transition().duration(transitionDuration).call(chart); };
chart.container = this;
@ -258,8 +259,8 @@ nv.models.linePlusBarWithFocusChart = function() {
g.select('.nv-context')
.attr('transform', 'translate(0,' + ( availableHeight1 + margin.bottom + margin2.top) + ')')
d3.transition(bars2Wrap).call(bars2);
d3.transition(lines2Wrap).call(lines2);
bars2Wrap.transition().call(bars2);
lines2Wrap.transition().call(lines2);
//------------------------------------------------------------
@ -310,7 +311,7 @@ nv.models.linePlusBarWithFocusChart = function() {
g.select('.nv-context .nv-x.nv-axis')
.attr('transform', 'translate(0,' + y3.range()[0] + ')');
d3.transition(g.select('.nv-context .nv-x.nv-axis'))
g.select('.nv-context .nv-x.nv-axis').transition()
.call(x2Axis);
@ -323,7 +324,7 @@ nv.models.linePlusBarWithFocusChart = function() {
.style('opacity', dataBars.length ? 1 : 0)
.attr('transform', 'translate(0,' + x2.range()[0] + ')');
d3.transition(g.select('.nv-context .nv-y1.nv-axis'))
g.select('.nv-context .nv-y1.nv-axis').transition()
.call(y3Axis);
@ -336,7 +337,7 @@ nv.models.linePlusBarWithFocusChart = function() {
.style('opacity', dataLines.length ? 1 : 0)
.attr('transform', 'translate(' + x2.range()[1] + ',0)');
d3.transition(g.select('.nv-context .nv-y2.nv-axis'))
g.select('.nv-context .nv-y2.nv-axis').transition()
.call(y4Axis);
//------------------------------------------------------------
@ -467,7 +468,7 @@ nv.models.linePlusBarWithFocusChart = function() {
xAxis.domain([Math.ceil(extent[0]), Math.floor(extent[1])]);
d3.transition(g.select('.nv-x.nv-axis'))
g.select('.nv-x.nv-axis').transition().duration(transitionDuration)
.call(xAxis);
//------------------------------------------------------------
@ -475,8 +476,8 @@ nv.models.linePlusBarWithFocusChart = function() {
//------------------------------------------------------------
// Update Main (Focus) Bars and Lines
d3.transition(focusBarsWrap).call(bars);
d3.transition(focusLinesWrap).call(lines);
focusBarsWrap.transition().duration(transitionDuration).call(bars);
focusLinesWrap.transition().duration(transitionDuration).call(lines);
//------------------------------------------------------------
@ -506,9 +507,9 @@ nv.models.linePlusBarWithFocusChart = function() {
.style('opacity', dataLines.length ? 1 : 0)
.attr('transform', 'translate(' + x.range()[1] + ',0)');
d3.transition(g.select('.nv-focus .nv-y1.nv-axis'))
g.select('.nv-focus .nv-y1.nv-axis').transition().duration(transitionDuration)
.call(y1Axis);
d3.transition(g.select('.nv-focus .nv-y2.nv-axis'))
g.select('.nv-focus .nv-y2.nv-axis').transition().duration(transitionDuration)
.call(y2Axis);
}