|
|
|
@ -7424,6 +7424,7 @@ nv.models.multiBar = function() {
|
|
|
|
|
, yDomain
|
|
|
|
|
, xRange
|
|
|
|
|
, yRange
|
|
|
|
|
, groupSpacing = 0.1
|
|
|
|
|
, dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout')
|
|
|
|
|
, transitionDuration = 250
|
|
|
|
|
;
|
|
|
|
@ -7506,7 +7507,7 @@ nv.models.multiBar = function() {
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x }))
|
|
|
|
|
.rangeBands(xRange || [0, availableWidth], .1);
|
|
|
|
|
.rangeBands(xRange || [0, availableWidth], groupSpacing);
|
|
|
|
|
|
|
|
|
|
//y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return d.y + (stacked ? d.y1 : 0) }).concat(forceY)))
|
|
|
|
|
y .domain(yDomain || d3.extent(d3.merge(seriesData).map(function(d) { return stacked ? (d.y > 0 ? d.y1 : d.y1 + d.y ) : d.y }).concat(forceY)))
|
|
|
|
@ -7856,6 +7857,12 @@ nv.models.multiBar = function() {
|
|
|
|
|
return chart;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
chart.groupSpacing = function(_) {
|
|
|
|
|
if (!arguments.length) return groupSpacing;
|
|
|
|
|
groupSpacing = _;
|
|
|
|
|
return chart;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
//============================================================
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -8254,7 +8261,8 @@ nv.models.multiBarChart = function() {
|
|
|
|
|
chart.xAxis = xAxis;
|
|
|
|
|
chart.yAxis = yAxis;
|
|
|
|
|
|
|
|
|
|
d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'xRange', 'yRange', 'forceX', 'forceY', 'clipEdge', 'id', 'stacked', 'delay', 'barColor');
|
|
|
|
|
d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'xRange', 'yRange', 'forceX', 'forceY', 'clipEdge',
|
|
|
|
|
'id', 'stacked', 'delay', 'barColor','groupSpacing');
|
|
|
|
|
|
|
|
|
|
chart.margin = function(_) {
|
|
|
|
|
if (!arguments.length) return margin;
|
|
|
|
|