Some minor tweaks to the multiBar, and created the first cut horizontal version of the model
parent
037332dfda
commit
5ca0f2b310
@ -0,0 +1,153 @@
|
||||
<!DOCTYPE html>
|
||||
<meta charset="utf-8">
|
||||
|
||||
<link href="../src/d3.css" rel="stylesheet" type="text/css">
|
||||
|
||||
<style>
|
||||
|
||||
body {
|
||||
overflow-y:scroll;
|
||||
}
|
||||
|
||||
text {
|
||||
font: 12px sans-serif;
|
||||
}
|
||||
|
||||
#chart1 {
|
||||
height: 500px;
|
||||
margin: 10px;
|
||||
min-width: 100px;
|
||||
min-height: 100px;
|
||||
/*
|
||||
Minimum height and width is a good idea to prevent negative SVG dimensions...
|
||||
For example width should be =< margin.left + margin.right + 1,
|
||||
of course 1 pixel for the entire chart would not be very useful, BUT should not have errors
|
||||
*/
|
||||
}
|
||||
|
||||
</style>
|
||||
<body>
|
||||
|
||||
<div id="chart1">
|
||||
</div>
|
||||
|
||||
<script src="../lib/d3.v2.js"></script>
|
||||
<script src="../nv.d3.js"></script>
|
||||
<script src="../src/tooltip.js"></script>
|
||||
<script src="../src/models/legend.js"></script>
|
||||
<script src="../src/models/axis.js"></script>
|
||||
<script src="../src/models/multiBarHorizontal.js"></script>
|
||||
<script src="../src/models/multiBarHorizontalWithLegend.js"></script>
|
||||
<script src="stream_layers.js"></script>
|
||||
<script>
|
||||
|
||||
var test_data = stream_layers(3,12,.1).map(function(data, i) {
|
||||
return {
|
||||
key: 'Stream' + i,
|
||||
values: data
|
||||
};
|
||||
});
|
||||
|
||||
var selector = '#chart1',
|
||||
chart = nv.models.multiBarHorizontalWithLegend(),
|
||||
data = test_data,
|
||||
xTickFormat = d3.format(',r'),
|
||||
yTickFormat = d3.format(',.2f'),
|
||||
xAxisLabel = null,
|
||||
yAxisLabel = null,
|
||||
duration = 500;
|
||||
|
||||
nv.addGraph({
|
||||
generate: function() {
|
||||
var container = d3.select(selector),
|
||||
width = function() { return parseInt(container.style('width')) },
|
||||
height = function() { return parseInt(container.style('height')) },
|
||||
svg = container.append('svg');
|
||||
|
||||
chart
|
||||
.width(width)
|
||||
.height(height);
|
||||
|
||||
chart.xAxis
|
||||
.tickFormat(xTickFormat);
|
||||
|
||||
chart.yAxis
|
||||
.tickFormat(yTickFormat)
|
||||
.axisLabel(yAxisLabel);
|
||||
|
||||
svg
|
||||
.attr('width', width())
|
||||
.attr('height', height())
|
||||
.datum(data)
|
||||
.transition().duration(duration).call(chart);
|
||||
|
||||
return chart;
|
||||
},
|
||||
callback: function(chart) {
|
||||
var showTooltip = function(e) {
|
||||
var offsetElement = document.getElementById(selector.substr(1)),
|
||||
left = e.pos[0] + offsetElement.offsetLeft,
|
||||
top = e.pos[1] + offsetElement.offsetTop,
|
||||
formatY = chart.yAxis.tickFormat(), //Assumes using same format as axis, can customize to show higher precision, etc.
|
||||
formatX = chart.xAxis.tickFormat();
|
||||
|
||||
// uses the chart's getX and getY, you may customize if x position is not the same as the value you want
|
||||
// ex. daily data without weekends, x is the index, while you want the date
|
||||
var content = '<h3>' + e.series.key + '</h3>' +
|
||||
'<p>' +
|
||||
formatY(chart.y()(e.point)) + ' at ' + formatX(chart.x()(e.point)) +
|
||||
'</p>';
|
||||
|
||||
nv.tooltip.show([left, top], content);
|
||||
};
|
||||
|
||||
chart.dispatch.on('tooltipShow', showTooltip);
|
||||
chart.dispatch.on('tooltipHide', nv.tooltip.cleanup);
|
||||
|
||||
|
||||
window.onresize= function() {
|
||||
// now that width and height are functions, should be automatic..of course you can always override them
|
||||
|
||||
d3.select('#chart1 svg')
|
||||
.attr('width', chart.width()()) //need to set SVG dimensions, chart is not aware of the SVG component
|
||||
.attr('height', chart.height()())
|
||||
.transition().duration(duration)
|
||||
.call(chart);
|
||||
|
||||
/*
|
||||
d3.select('#chart1 svg')
|
||||
.attr('width', chart.width()()) //need to set SVG dimensions, chart is not aware of the SVG component
|
||||
.attr('height', chart.height()())
|
||||
.call(chart);
|
||||
*/
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
function sinAndCos() {
|
||||
var sin = [],
|
||||
cos = [];
|
||||
|
||||
for (var i = 0; i < 100; i++) {
|
||||
sin.push({x: i, y: Math.sin(i/10)});
|
||||
cos.push({x: i, y: .5 * Math.cos(i/10)});
|
||||
}
|
||||
|
||||
return [
|
||||
{
|
||||
values: sin,
|
||||
key: "Sine Wave",
|
||||
color: "#ff7f0e"
|
||||
},
|
||||
{
|
||||
values: cos,
|
||||
key: "Cosine Wave",
|
||||
color: "#2ca02c"
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
</script>
|
@ -0,0 +1,330 @@
|
||||
|
||||
/***
|
||||
* This should be pretty close to identical to the multiBar model, but this model
|
||||
* has the bars horizontal.
|
||||
* Currently naming the vertical axis X, due to helper functions that think the
|
||||
* bars are vertical
|
||||
*/
|
||||
|
||||
nv.models.multiBarHorizontal = function() {
|
||||
var margin = {top: 0, right: 0, bottom: 0, left: 0},
|
||||
width = 960,
|
||||
height = 500,
|
||||
id = Math.floor(Math.random() * 10000), //Create semi-unique ID in case user doesn't select one
|
||||
getX = function(d) { return d.x },
|
||||
getY = function(d) { return d.y },
|
||||
forceY = [],
|
||||
clipEdge = true,
|
||||
stacked = false,
|
||||
color = d3.scale.category20().range(),
|
||||
xDomain, yDomain,
|
||||
x0, y0;
|
||||
|
||||
//var x = d3.scale.linear(),
|
||||
var x = d3.scale.ordinal(),
|
||||
y = d3.scale.linear(),
|
||||
dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout');
|
||||
|
||||
|
||||
function chart(selection) {
|
||||
selection.each(function(data) {
|
||||
var availableWidth = width - margin.left - margin.right,
|
||||
availableHeight = height - margin.top - margin.bottom;
|
||||
|
||||
//store old scales if they exist
|
||||
x0 = x0 || x;
|
||||
y0 = y0 || y;
|
||||
|
||||
if (stacked) {
|
||||
//var stackedData = d3.layout.stack()
|
||||
data = d3.layout.stack()
|
||||
.offset('zero')
|
||||
.values(function(d){ return d.values })
|
||||
.y(getY)
|
||||
(data);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//add series index to each data point for reference
|
||||
data = data.map(function(series, i) {
|
||||
series.values = series.values.map(function(point) {
|
||||
point.series = i;
|
||||
return point;
|
||||
});
|
||||
return series;
|
||||
});
|
||||
|
||||
|
||||
var seriesData = (xDomain && yDomain) ? [] : // if we know xDomain and yDomain, no need to calculate
|
||||
data.map(function(d) {
|
||||
return d.values.map(function(d,i) {
|
||||
return { x: getX(d,i), y: getY(d,i), y0: d.y0 }
|
||||
})
|
||||
});
|
||||
|
||||
x .domain(d3.merge(seriesData).map(function(d) { return d.x }))
|
||||
.rangeBands([0, availableHeight], .1);
|
||||
|
||||
y .domain(yDomain || [0,d3.max(d3.merge(seriesData).map(function(d) { return d.y + (stacked ? d.y0 : 0) }).concat(forceY))])
|
||||
.range([0, availableWidth]);
|
||||
|
||||
|
||||
|
||||
var wrap = d3.select(this).selectAll('g.d3multibar').data([data]);
|
||||
var wrapEnter = wrap.enter().append('g').attr('class', 'd3multibar');
|
||||
var defsEnter = wrapEnter.append('defs');
|
||||
var gEnter = wrapEnter.append('g');
|
||||
|
||||
gEnter.append('g').attr('class', 'groups');
|
||||
|
||||
var g = wrap.select('g')
|
||||
wrap.attr('transform', 'translate(' + margin.left + ',' + margin.top + ')');
|
||||
|
||||
|
||||
|
||||
defsEnter.append('clipPath')
|
||||
.attr('id', 'edge-clip-' + id)
|
||||
.append('rect');
|
||||
wrap.select('#edge-clip-' + id + ' rect')
|
||||
.attr('width', availableWidth)
|
||||
.attr('height', availableHeight);
|
||||
|
||||
g .attr('clip-path', clipEdge ? 'url(#edge-clip-' + id + ')' : '');
|
||||
|
||||
|
||||
|
||||
var groups = wrap.select('.groups').selectAll('.group')
|
||||
.data(function(d) { return d }, function(d) { return d.key });
|
||||
groups.enter().append('g')
|
||||
.style('stroke-opacity', 1e-6)
|
||||
.style('fill-opacity', 1e-6)
|
||||
/*
|
||||
.attr('transform', function(d,i) {
|
||||
return stacked ?
|
||||
'translate(0,0)'
|
||||
: 'translate(' + (i * x.rangeBand() / data.length ) + ',0)'
|
||||
});
|
||||
*/
|
||||
d3.transition(groups.exit())
|
||||
.style('stroke-opacity', 1e-6)
|
||||
.style('fill-opacity', 1e-6)
|
||||
.remove();
|
||||
groups
|
||||
.attr('class', function(d,i) { return 'group series-' + i })
|
||||
.classed('hover', function(d) { return d.hover })
|
||||
.style('fill', function(d,i){ return color[i % 10] })
|
||||
.style('stroke', function(d,i){ return color[i % 10] });
|
||||
d3.transition(groups)
|
||||
/*
|
||||
.attr('transform', function(d,i) {
|
||||
return stacked ?
|
||||
'translate(0,0)'
|
||||
: 'translate(' + (i * x.rangeBand() / data.length ) + ',0)'
|
||||
})
|
||||
*/
|
||||
.style('stroke-opacity', 1)
|
||||
.style('fill-opacity', .75);
|
||||
|
||||
|
||||
var bars = groups.selectAll('rect.bar')
|
||||
.data(function(d) { return d.values });
|
||||
|
||||
bars.exit().remove();
|
||||
|
||||
|
||||
var barsEnter = bars.enter().append('rect')
|
||||
.attr('class', function(d,i) { return getY(d,i) < 0 ? 'bar negative' : 'bar positive'})
|
||||
//.attr('fill', function(d,i) { return color[0]; })
|
||||
.attr('y', function(d,i,j) {
|
||||
return stacked ? 0 : (j * x.rangeBand() / data.length )
|
||||
})
|
||||
//.attr('y', function(d,i) { return y(Math.max(0, getY(d,i))) })
|
||||
//.attr('height', function(d,i) { return Math.abs(y(getY(d,i)) - y(0)) })
|
||||
.attr('x', function(d) { return y0(stacked ? d.y0 : 0) })
|
||||
.attr('width', 0)
|
||||
.attr('height', x.rangeBand() / (stacked ? 1 : data.length) )
|
||||
.on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here
|
||||
d3.select(this).classed('hover', true);
|
||||
dispatch.elementMouseover({
|
||||
value: getY(d,i),
|
||||
point: d,
|
||||
series: data[d.series],
|
||||
pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted
|
||||
pointIndex: i,
|
||||
seriesIndex: d.series,
|
||||
e: d3.event
|
||||
});
|
||||
})
|
||||
.on('mouseout', function(d,i) {
|
||||
d3.select(this).classed('hover', false);
|
||||
dispatch.elementMouseout({
|
||||
value: getY(d,i),
|
||||
point: d,
|
||||
series: data[d.series],
|
||||
pointIndex: i,
|
||||
seriesIndex: d.series,
|
||||
e: d3.event
|
||||
});
|
||||
})
|
||||
.on('click', function(d,i) {
|
||||
dispatch.elementClick({
|
||||
value: getY(d,i),
|
||||
point: d,
|
||||
series: data[d.series],
|
||||
pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted
|
||||
pointIndex: i,
|
||||
seriesIndex: d.series,
|
||||
e: d3.event
|
||||
});
|
||||
d3.event.stopPropagation();
|
||||
})
|
||||
.on('dblclick', function(d,i) {
|
||||
dispatch.elementDblClick({
|
||||
value: getY(d,i),
|
||||
point: d,
|
||||
series: data[d.series],
|
||||
pos: [x(getX(d,i)) + (x.rangeBand() * (stacked ? data.length / 2 : d.series + .5) / data.length), y(getY(d,i) + (stacked ? d.y0 : 0))], // TODO: Figure out why the value appears to be shifted
|
||||
pointIndex: i,
|
||||
seriesIndex: d.series,
|
||||
e: d3.event
|
||||
});
|
||||
d3.event.stopPropagation();
|
||||
});
|
||||
bars
|
||||
.attr('class', function(d,i) { return getY(d,i) < 0 ? 'bar negative' : 'bar positive'})
|
||||
.attr('transform', function(d,i) { return 'translate(0,' + x(getX(d,i)) + ')'; })
|
||||
if (stacked)
|
||||
d3.transition(bars)
|
||||
.delay(function(d,i) { return i * 1000 / data[0].values.length })
|
||||
.attr('x', function(d,i) {
|
||||
return y(d.y0);
|
||||
//return y(getY(d,i) + d.y0);
|
||||
//return y(getY(d,i) + (stacked ? d.y0 : 0));
|
||||
})
|
||||
.attr('width', function(d,i) {
|
||||
return Math.abs(y(d.y + d.y0) - y(d.y0))
|
||||
})
|
||||
.each('end', function() {
|
||||
d3.transition(d3.select(this))
|
||||
.attr('y', function(d,i) {
|
||||
return 0
|
||||
})
|
||||
.attr('height', x.rangeBand() );
|
||||
})
|
||||
else
|
||||
d3.transition(bars)
|
||||
.delay(function(d,i) { return i * 1200 / data[0].values.length })
|
||||
.attr('y', function(d,i) {
|
||||
return d.series * x.rangeBand() / data.length
|
||||
})
|
||||
.attr('height', x.rangeBand() / data.length )
|
||||
.each('end', function() {
|
||||
d3.transition(d3.select(this))
|
||||
.attr('x', function(d,i) {
|
||||
return getY(d,i) < 0 ? //TODO: stacked must be all positive or all negative, not both?
|
||||
y(getY(d,i)) :
|
||||
y(0)
|
||||
})
|
||||
.attr('width', function(d,i) {
|
||||
return Math.abs(y(d.y) - y(0))
|
||||
//return Math.abs(y(d.y + (stacked ? d.y0 : 0)) - y((stacked ? d.y0 : 0)))
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
//TODO: decide if this makes sense to add into all the models for ease of updating (updating without needing the selection)
|
||||
chart.update = function() {
|
||||
selection.transition().call(chart);
|
||||
}
|
||||
|
||||
//store old scales for use in transitions on update, to animate from old to new positions, and sizes
|
||||
x0 = x.copy();
|
||||
y0 = y.copy();
|
||||
|
||||
});
|
||||
|
||||
return chart;
|
||||
}
|
||||
|
||||
|
||||
chart.dispatch = dispatch;
|
||||
|
||||
chart.x = function(_) {
|
||||
if (!arguments.length) return getX;
|
||||
getX = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.y = function(_) {
|
||||
if (!arguments.length) return getY;
|
||||
getY = _;
|
||||
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.xDomain = function(_) {
|
||||
if (!arguments.length) return xDomain;
|
||||
xDomain = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.yDomain = function(_) {
|
||||
if (!arguments.length) return yDomain;
|
||||
yDomain = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.forceY = function(_) {
|
||||
if (!arguments.length) return forceY;
|
||||
forceY = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.stacked = function(_) {
|
||||
if (!arguments.length) return stacked;
|
||||
stacked = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.clipEdge = function(_) {
|
||||
if (!arguments.length) return clipEdge;
|
||||
clipEdge = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.color = function(_) {
|
||||
if (!arguments.length) return color;
|
||||
color = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.id = function(_) {
|
||||
if (!arguments.length) return id;
|
||||
id = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
|
||||
|
||||
return chart;
|
||||
}
|
@ -0,0 +1,225 @@
|
||||
|
||||
nv.models.multiBarHorizontalWithLegend = function() {
|
||||
var margin = {top: 30, right: 20, bottom: 50, left: 60},
|
||||
width = function() { return 960 },
|
||||
height = function() { return 500 },
|
||||
color = d3.scale.category20().range();
|
||||
|
||||
//var x = d3.scale.linear(),
|
||||
var x = d3.scale.ordinal(),
|
||||
y = d3.scale.linear(),
|
||||
xAxis = nv.models.axis().scale(x).orient('left').highlightZero(false),
|
||||
yAxis = nv.models.axis().scale(y).orient('bottom'),
|
||||
legend = nv.models.legend().height(30),
|
||||
controls = nv.models.legend().height(30),
|
||||
multibar = nv.models.multiBarHorizontal().stacked(false),
|
||||
dispatch = d3.dispatch('tooltipShow', 'tooltipHide');
|
||||
|
||||
//TODO: let user select default
|
||||
var controlsData = [
|
||||
{ key: 'Grouped' },
|
||||
{ key: 'Stacked', disabled: true },
|
||||
];
|
||||
|
||||
function chart(selection) {
|
||||
selection.each(function(data) {
|
||||
var availableWidth = width() - margin.left - margin.right,
|
||||
availableHeight = height() - margin.top - margin.bottom,
|
||||
seriesData;
|
||||
|
||||
if (multibar.stacked()) {
|
||||
seriesData = data.filter(function(d) { return !d.disabled })
|
||||
.reduce(function(prev, curr, index) { //sum up all the y's
|
||||
curr.values.forEach(function(d,i) {
|
||||
if (!index) prev[i] = {x: multibar.x()(d,i), y:0};
|
||||
prev[i].y += multibar.y()(d,i);
|
||||
});
|
||||
return prev;
|
||||
}, []);
|
||||
} else {
|
||||
seriesData = data.filter(function(d) { return !d.disabled })
|
||||
.map(function(d) {
|
||||
return d.values.map(function(d,i) {
|
||||
return { x: multibar.x()(d,i), y: multibar.y()(d,i) }
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
//x .domain(d3.extent(d3.merge(seriesData).map(function(d) { return d.x }).concat(multibar.forceX) ))
|
||||
//.range([0, availableWidth]);
|
||||
|
||||
x .domain(d3.merge(seriesData).map(function(d) { return d.x }))
|
||||
.rangeBands([0, availableHeight], .1);
|
||||
//.rangeRoundBands([0, availableWidth], .1);
|
||||
|
||||
y .domain(d3.extent(d3.merge(seriesData).map(function(d) { return d.y }).concat(multibar.forceY) ))
|
||||
.range([0, availableWidth]);
|
||||
|
||||
multibar
|
||||
.width(availableWidth)
|
||||
.height(availableHeight)
|
||||
//.xDomain(x.domain())
|
||||
//.yDomain(y.domain())
|
||||
.color(data.map(function(d,i) {
|
||||
return d.color || color[i % 10];
|
||||
}).filter(function(d,i) { return !data[i].disabled }))
|
||||
|
||||
|
||||
|
||||
var wrap = d3.select(this).selectAll('g.wrap').data([data]);
|
||||
var gEnter = wrap.enter().append('g').attr('class', 'wrap d3lineWithLegend').append('g');
|
||||
|
||||
gEnter.append('g').attr('class', 'x axis');
|
||||
gEnter.append('g').attr('class', 'y axis');
|
||||
gEnter.append('g').attr('class', 'linesWrap');
|
||||
gEnter.append('g').attr('class', 'legendWrap');
|
||||
gEnter.append('g').attr('class', 'controlsWrap');
|
||||
|
||||
|
||||
|
||||
//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(availableWidth / 2);
|
||||
|
||||
g.select('.legendWrap')
|
||||
.datum(data)
|
||||
.attr('transform', 'translate(' + (availableWidth / 2) + ',' + (-margin.top) +')')
|
||||
.call(legend);
|
||||
|
||||
controls.width(180).color(['#444', '#444', '#444']);
|
||||
g.select('.controlsWrap')
|
||||
.datum(controlsData)
|
||||
.attr('transform', 'translate(0,' + (-margin.top) +')')
|
||||
.call(controls);
|
||||
|
||||
|
||||
var linesWrap = g.select('.linesWrap')
|
||||
.datum(data.filter(function(d) { return !d.disabled }))
|
||||
|
||||
|
||||
d3.transition(linesWrap).call(multibar);
|
||||
|
||||
|
||||
xAxis
|
||||
.scale(x)
|
||||
//.domain(x.domain())
|
||||
//.range(x.range())
|
||||
.ticks( availableHeight / 24 )
|
||||
.tickSize(-availableWidth, 0);
|
||||
|
||||
//g.select('.x.axis')
|
||||
//.attr('transform', 'translate(0,' + y.range()[0] + ')');
|
||||
d3.transition(g.select('.x.axis'))
|
||||
.call(xAxis);
|
||||
|
||||
var xTicks = g.select('.x.axis').selectAll('g');
|
||||
|
||||
xTicks
|
||||
.selectAll('line, text')
|
||||
.style('opacity', 1)
|
||||
|
||||
xTicks.filter(function(d,i) {
|
||||
return i % Math.ceil(data[0].values.length / (availableWidth / 100)) !== 0;
|
||||
})
|
||||
.selectAll('line, text')
|
||||
.style('opacity', 0)
|
||||
|
||||
yAxis
|
||||
.domain(y.domain())
|
||||
.range(y.range())
|
||||
.ticks( availableWidth / 100 )
|
||||
.tickSize( -availableHeight, 0);
|
||||
|
||||
g.select('.y.axis')
|
||||
.attr('transform', 'translate(0,' + availableHeight + ')');
|
||||
d3.transition(g.select('.y.axis'))
|
||||
.call(yAxis);
|
||||
|
||||
|
||||
|
||||
|
||||
legend.dispatch.on('legendClick', function(d,i) {
|
||||
d.disabled = !d.disabled;
|
||||
|
||||
if (!data.filter(function(d) { return !d.disabled }).length) {
|
||||
data.map(function(d) {
|
||||
d.disabled = false;
|
||||
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 'Grouped':
|
||||
multibar.stacked(false);
|
||||
break;
|
||||
case 'Stacked':
|
||||
multibar.stacked(true);
|
||||
break;
|
||||
}
|
||||
|
||||
selection.transition().call(chart);
|
||||
});
|
||||
|
||||
|
||||
multibar.dispatch.on('elementMouseover.tooltip', function(e) {
|
||||
e.pos = [e.pos[0] + margin.left, e.pos[1] + margin.top];
|
||||
dispatch.tooltipShow(e);
|
||||
});
|
||||
|
||||
multibar.dispatch.on('elementMouseout.tooltip', function(e) {
|
||||
dispatch.tooltipHide(e);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
return chart;
|
||||
}
|
||||
|
||||
|
||||
chart.dispatch = dispatch;
|
||||
chart.legend = legend;
|
||||
chart.xAxis = xAxis;
|
||||
chart.yAxis = yAxis;
|
||||
|
||||
d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id');
|
||||
|
||||
|
||||
chart.margin = function(_) {
|
||||
if (!arguments.length) return margin;
|
||||
margin = _;
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.width = function(_) {
|
||||
if (!arguments.length) return width;
|
||||
width = d3.functor(_);
|
||||
return chart;
|
||||
};
|
||||
|
||||
chart.height = function(_) {
|
||||
if (!arguments.length) return height;
|
||||
height = d3.functor(_);
|
||||
return chart;
|
||||
};
|
||||
|
||||
|
||||
return chart;
|
||||
}
|
Loading…
Reference in New Issue