From 1cfb52c7feb799320b303da47f14920ebfa85c24 Mon Sep 17 00:00:00 2001 From: Bob Monteverde Date: Tue, 3 Apr 2012 03:19:09 -0400 Subject: [PATCH] Added stacked/stream/expanded chart with example --- examples/stackedArea.html | 11 +- examples/stackedAreaWithLegend.html | 157 +++++++++++++++++ src/models/stackedArea.js | 41 ++++- src/models/stackedAreaWithLegend.js | 250 ++++++++++++++++++++++++++++ 4 files changed, 448 insertions(+), 11 deletions(-) create mode 100644 examples/stackedAreaWithLegend.html create mode 100644 src/models/stackedAreaWithLegend.js diff --git a/examples/stackedArea.html b/examples/stackedArea.html index 48232fa..f01b652 100644 --- a/examples/stackedArea.html +++ b/examples/stackedArea.html @@ -32,10 +32,17 @@ text { nv.addGraph({ generate: function() { var n = 10, // number of layers - m = 200, // number of samples per layer - data = stream_layers(n, m); + m = 200; // number of samples per layer //color = d3.interpolateRgb("#aad", "#556"); + var data = stream_layers(n,m).map(function(data, i) { + return { + key: 'Stream' + i, + values: data + }; + }); + + var width = $(window).width() - 20, height = $(window).height() - 20; diff --git a/examples/stackedAreaWithLegend.html b/examples/stackedAreaWithLegend.html new file mode 100644 index 0000000..30b6339 --- /dev/null +++ b/examples/stackedAreaWithLegend.html @@ -0,0 +1,157 @@ + + + + + + + + +
+ +
+ + + + + + + + diff --git a/src/models/stackedArea.js b/src/models/stackedArea.js index 5b355c9..231a1fc 100644 --- a/src/models/stackedArea.js +++ b/src/models/stackedArea.js @@ -24,18 +24,25 @@ nv.models.stackedArea = function() { function chart(selection) { selection.each(function(data) { + // Need to leave data alone to switch between stacked, stream, and expanded + var dataCopy = JSON.parse(JSON.stringify(data)); + + //log(dataCopy); + dataCopy = dataCopy.map(function(series) { return series.values }) + //compute the data based on offset and order (calc's y0 for every point) - data = d3.layout.stack().offset(offset).order(order)(data); + //dataCopy = d3.layout.stack().offset(offset).order(order).values(function(d){ return d.values })(dataCopy); + dataCopy = d3.layout.stack().offset(offset).order(order)(dataCopy); - var mx = data[0].length - 1, // assumes that all layers have same # of samples & that there is at least one layer - my = d3.max(data, function(d) { + var mx = dataCopy[0].length - 1, // assumes that all layers have same # of samples & that there is at least one layer + my = d3.max(dataCopy, function(d) { return d3.max(d, function(d) { return d.y0 + d.y; }); }); // Select the wrapper g, if it exists. - var wrap = d3.select(this).selectAll('g.d3stream').data([data]); + var wrap = d3.select(this).selectAll('g.d3stream').data([dataCopy]); // Create the skeletal chart on first load. var gEnter = wrap.enter().append('g').attr('class', 'd3stream').append('g'); @@ -54,15 +61,25 @@ nv.models.stackedArea = function() { .y0(function(d) { return availableHeight - d.y0 * availableHeight / my; }) .y1(function(d) { return availableHeight - (d.y + d.y0) * availableHeight / my; }); - var path = g.selectAll('path').data(data); + var zeroArea = d3.svg.area() + .x(function(d) { return d.x * availableWidth / mx; }) + .y0(function(d) { return availableHeight - d.y0 * availableHeight / my; }) + .y1(function(d) { return availableHeight - d.y0 * availableHeight / my; }) + var path = g.selectAll('path') + .data(function(d) { return d }); + //.data(dataCopy); path.enter().append('path'); - path.exit().remove(); + d3.transition(path.exit()) + .attr('d', zeroArea) + .remove(); path - .style('fill', function(d,i){ return color[i % 10] }) - .style('stroke', function(d,i){ return color[i % 10] }); + .style('fill-opacity', .75) + .style('stroke-opacity', .75) + .style('fill', function(d,i){ return color[i % 10] }) + .style('stroke', function(d,i){ return color[i % 10] }); d3.transition(path) - .attr('d', area); + .attr('d', area); }); @@ -88,6 +105,12 @@ nv.models.stackedArea = function() { return chart; }; + chart.color = function(_) { + if (!arguments.length) return color; + color = _; + return chart; + }; + chart.offset = function(_) { if (!arguments.length) return offset; offset = _; diff --git a/src/models/stackedAreaWithLegend.js b/src/models/stackedAreaWithLegend.js new file mode 100644 index 0000000..cd7d742 --- /dev/null +++ b/src/models/stackedAreaWithLegend.js @@ -0,0 +1,250 @@ + +nv.models.stackedAreaWithLegend = function() { + var margin = {top: 30, right: 20, bottom: 50, left: 60}, + width = 960, + height = 500, + dotRadius = function() { return 2.5 }, + color = d3.scale.category10().range(), + dispatch = d3.dispatch('tooltipShow', 'tooltipHide'); + + var x = d3.scale.linear(), + y = d3.scale.linear(), + getX = function(d) { return d.x }, + getY = function(d) { return d.y }, + xAxis = nv.models.xaxis().scale(x), + yAxis = nv.models.yaxis().scale(y), + legend = nv.models.legend().height(30), + controls = nv.models.legend().height(30), + stacked = nv.models.stackedArea(); + + var controlsData = [ + { key: 'Stacked' }, + { key: 'Stream', disabled: true }, + { key: 'Expanded', disabled: true } + ]; + + + + function chart(selection) { + selection.each(function(data) { + var series = data.filter(function(d) { return !d.disabled }) + //.map(function(d) { return d.values }); + .reduce(function(prev, curr, index) { //sum up all the y's + curr.values.forEach(function(d,i) { + if (!index) prev[i] = {x: d.x, y:0}; + prev[i].y += getY(d); + }); + return prev; + }, []); + + + x .domain(d3.extent(d3.merge(series), getX )) + .range([0, width - margin.left - margin.right]); + + //TODO: remove if stream + y .domain(stacked.offset() == 'zero' ? + d3.extent(d3.merge(series), getY ) : + [0, 1] // 0 - 100% + ) + .range([height - margin.top - margin.bottom, 0]); + + stacked + .width(width - margin.left - margin.right) + .height(height - margin.top - margin.bottom) + + + var wrap = d3.select(this).selectAll('g.wrap').data([data]); + var gEnter = wrap.enter().append('g').attr('class', 'wrap d3stackedWithLegend').append('g'); + + gEnter.append('g').attr('class', 'x axis'); + gEnter.append('g').attr('class', 'y axis'); + gEnter.append('g').attr('class', 'stackedWrap'); + gEnter.append('g').attr('class', 'legendWrap'); + gEnter.append('g').attr('class', 'controlsWrap'); + + + legend.dispatch.on('legendClick', function(d,i) { + d.disabled = !d.disabled; + + if (d.disabled) + d.values.map(function(p) { p._y = p.y; p.y = 0; return p }); + else + d.values.map(function(p) { p.y = p._y; return p }); + + if (!data.filter(function(d) { return !d.disabled }).length) { + data.map(function(d) { + d.disabled = false; + d.values.map(function(p) { p.y = p._y; return p }); + //wrap.selectAll('.series').classed('disabled', false); + return d; + }); + } + + selection.transition().call(chart); + }); + + controls.dispatch.on('legendClick', function(d,i) { + if (!d.disabled) return; + + controlsData = controlsData.map(function(s) { + s.disabled = true; + return s; + }); + d.disabled = false; + + switch (d.key) { + case 'Stacked': + stacked.style('stack'); + break; + case 'Stream': + stacked.style('stream'); + break; + case 'Expanded': + stacked.style('expand'); + break; + } + + selection.transition().call(chart); + }); + + +/* + legend.dispatch.on('legendMouseover', function(d, i) { + d.hover = true; + selection.transition().call(chart) + }); + + legend.dispatch.on('legendMouseout', function(d, i) { + d.hover = false; + selection.transition().call(chart) + }); + + stacked.dispatch.on('pointMouseover.tooltip', function(e) { + dispatch.tooltipShow({ + point: e.point, + series: e.series, + pos: [e.pos[0] + margin.left, e.pos[1] + margin.top], + seriesIndex: e.seriesIndex, + pointIndex: e.pointIndex + }); + }); + + stacked.dispatch.on('pointMouseout.tooltip', function(e) { + dispatch.tooltipHide(e); + }); + + */ + + + //TODO: margins should be adjusted based on what components are used: axes, axis labels, legend + margin.top = legend.height(); + + var g = wrap.select('g') + .attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); + + + legend.width(width/2 - margin.right); + controls.width(260); + + g.select('.legendWrap') + .datum(data) + .attr('transform', 'translate(' + (width/2 - margin.left) + ',' + (-margin.top) +')') + .call(legend); + + + g.select('.controlsWrap') + .datum(controlsData) + .attr('transform', 'translate(0,' + (-margin.top) +')') + .call(controls); + + + + var stackedWrap = g.select('.stackedWrap') + .datum(data); + //.datum(data.filter(function(d) { return !d.disabled })) + + + d3.transition(stackedWrap).call(stacked); + + + xAxis + .domain(x.domain()) + .range(x.range()) + .ticks( width / 100 ) + .tickSize(-(height - margin.top - margin.bottom), 0); + + g.select('.x.axis') + .attr('transform', 'translate(0,' + y.range()[0] + ')'); + d3.transition(g.select('.x.axis')) + .call(xAxis); + + yAxis + .domain(y.domain()) + .range(y.range()) + .ticks( stacked.offset() == 'wiggle' ? 0 : height / 36 ) + .tickSize(-(width - margin.right - margin.left), 0) + .tickFormat(stacked.offset() == 'zero' ? d3.format(',2f') : d3.format('%')); //TODO: stacked format should be set by caller + + d3.transition(g.select('.y.axis')) + .call(yAxis); + + }); + + return chart; + } + + chart.dispatch = dispatch; + + chart.x = function(_) { + if (!arguments.length) return getX; + getX = _; + stacked.x(_); + return chart; + }; + + chart.y = function(_) { + if (!arguments.length) return getY; + getY = _; + stacked.y(_); + return chart; + }; + + chart.margin = function(_) { + if (!arguments.length) return margin; + margin = _; + return chart; + }; + + chart.width = function(_) { + if (!arguments.length) return width; + width = _; + return chart; + }; + + chart.height = function(_) { + if (!arguments.length) return height; + height = _; + return chart; + }; + + chart.dotRadius = function(_) { + if (!arguments.length) return dotRadius; + dotRadius = d3.functor(_); + stacked.dotRadius = _; + return chart; + }; + + + // Expose the x-axis' tickFormat method. + //chart.xAxis = {}; + //d3.rebind(chart.xAxis, xAxis, 'tickFormat'); + chart.xAxis = xAxis; + + // Expose the y-axis' tickFormat method. + //chart.yAxis = {}; + //d3.rebind(chart.yAxis, yAxis, 'tickFormat'); + chart.yAxis = yAxis; + + + return chart; +}