Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grouped and Stacked Bars #1356

Closed
wants to merge 2 commits into from
Closed

Grouped and Stacked Bars #1356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
885dcb8
Grouped and Staked Bars
OivalfMarques Dec 12, 2017
296b5d0
Change validation of parent in bar chart
OivalfMarques Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 89 additions & 17 deletions src/bar-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,22 @@
dc.barChart = function (parent, chartGroup) {
var MIN_BAR_WIDTH = 1;
var DEFAULT_GAP_BETWEEN_BARS = 2;
var DEFAULT_GAP_BETWEEN_BAR_SERIES = 5;
var LABEL_PADDING = 3;
var _type = "dc.BAR_CHART";

var _chart = dc.stackMixin(dc.coordinateGridMixin({}));

var _gap = DEFAULT_GAP_BETWEEN_BARS;
var _serieGap = DEFAULT_GAP_BETWEEN_BAR_SERIES;
var _centerBar = false;
var _alwaysUseRounding = false;

var _barWidth;


_chart.type = _type;

dc.override(_chart, 'rescale', function () {
_chart._rescale();
_barWidth = undefined;
Expand All @@ -46,7 +52,7 @@ dc.barChart = function (parent, chartGroup) {
dc.override(_chart, 'render', function () {
if (_chart.round() && _centerBar && !_alwaysUseRounding) {
dc.logger.warn('By default, brush rounding is disabled if bars are centered. ' +
'See dc.js bar chart API documentation for details.');
'See dc.js bar chart API documentation for details.');
}

return _chart._render();
Expand Down Expand Up @@ -81,11 +87,25 @@ dc.barChart = function (parent, chartGroup) {
});
};

function barHeight (d) {
function barHeight(d) {
return dc.utils.safeNumber(Math.abs(_chart.y()(d.y + d.y0) - _chart.y()(d.y0)));
}

function renderLabels (layer, layerIndex, d) {

function getCharts() {
if (dc.instanceOfChart(parent) && typeof parent.children === 'function') {
var children = parent.children();
if (children instanceof Array) {
return children.filter(function (chart) {
return chart.type === _type;
});
}
}
return [];

}

function renderLabels(layer, layerIndex, d) {
var labels = layer.selectAll('text.barLabel')
.data(d.values, dc.pluck('x'));

Expand All @@ -102,8 +122,19 @@ dc.barChart = function (parent, chartGroup) {
dc.transition(labels, _chart.transitionDuration(), _chart.transitionDelay())
.attr('x', function (d) {
var x = _chart.x()(d.x);
if (!_centerBar) {
x += _barWidth / 2;
var charts = getCharts();
if (charts.length > 1) {
x += _chart.serieGap() / 2;
x += layerIndex * (_barWidth + _gap);
x += _gap / 2;
}
x += _barWidth / 2;
if (_centerBar && !_chart.isOrdinal()) {
if (charts.length > 1) {
x -= ((_barWidth + _gap) * charts.length + _chart.serieGap()) / 2;
} else {
x -= _barWidth / 2;
}
}
return dc.utils.safeNumber(x);
})
Expand All @@ -125,7 +156,7 @@ dc.barChart = function (parent, chartGroup) {
.remove();
}

function renderBars (layer, layerIndex, d) {
function renderBars(layer, layerIndex, d) {
var bars = layer.selectAll('rect.bar')
.data(d.values, dc.pluck('x'));

Expand All @@ -147,8 +178,19 @@ dc.barChart = function (parent, chartGroup) {
dc.transition(bars, _chart.transitionDuration(), _chart.transitionDelay())
.attr('x', function (d) {
var x = _chart.x()(d.x);
if (_centerBar) {
x -= _barWidth / 2;
var charts = getCharts();
var chartIndex = charts.indexOf(_chart);
if (charts.length > 1) {
x += _chart.serieGap() / 2;
x += chartIndex * (_barWidth + _gap);
x += _gap / 2;
}
if (_centerBar && !_chart.isOrdinal()) {
if (charts.length > 1) {
x -= ((_barWidth + _gap) * charts.length + _chart.serieGap()) / 2;
} else {
x -= _barWidth / 2;
}
}
if (_chart.isOrdinal() && _gap !== undefined) {
x += _gap / 2;
Expand Down Expand Up @@ -177,19 +219,31 @@ dc.barChart = function (parent, chartGroup) {
.remove();
}

function calculateBarWidth () {
function calculateBarWidth() {
if (_barWidth === undefined) {
var numberOfBars = _chart.xUnitCount();

// please can't we always use rangeBands for bar charts?
if (_chart.isOrdinal() && _gap === undefined) {
_barWidth = Math.floor(_chart.x().rangeBand());
} else if (_gap) {
_barWidth = Math.floor((_chart.xAxisLength() - (numberOfBars - 1) * _gap) / numberOfBars);
var charts = getCharts();
if (charts.length > 1) {
var numberOfCharts = charts.length;
if (_chart.isOrdinal()) {
_barWidth = Math.floor((_chart.x().rangeBand() - _chart.serieGap()) / numberOfCharts - _gap);
} else {
_barWidth = Math.floor((_chart.xAxisLength() - (_chart.xUnitCount() - 1) * _chart.serieGap() -
(numberOfBars - 1) * (numberOfCharts) * _gap) / (numberOfBars * numberOfCharts));
}
} else {
_barWidth = Math.floor(_chart.xAxisLength() / (1 + _chart.barPadding()) / numberOfBars);
// please can't we always use rangeBands for bar charts?
if (_chart.isOrdinal() && _gap === undefined) {
_barWidth = Math.floor(_chart.x().rangeBand());
} else if (_gap) {
_barWidth = Math.floor((_chart.xAxisLength() - (numberOfBars - 1) * _gap) / numberOfBars);
} else {
_barWidth = Math.floor(_chart.xAxisLength() / (1 + _chart.barPadding()) / numberOfBars);
}
}



if (_barWidth === Infinity || isNaN(_barWidth) || _barWidth < MIN_BAR_WIDTH) {
_barWidth = MIN_BAR_WIDTH;
}
Expand Down Expand Up @@ -299,6 +353,24 @@ dc.barChart = function (parent, chartGroup) {
return _chart;
};

/**
* Manually set fixed gap (in px) between bar groups instead of relying on the default auto-generated
* gap. Only applicable for grouped bar charts.
* @name serieGap
* @memberof dc.barChart
* @instance
* @param {Number} [serieGap=5]
* @return {Number}
* @return {dc.barChart}
*/
_chart.serieGap = function (serieGap) {
if (!arguments.length) {
return _serieGap;
}
_serieGap = serieGap;
return _chart;
};

_chart.extendBrush = function () {
var extent = _chart.brush().extent();
if (_chart.round() && (!_centerBar || _alwaysUseRounding)) {
Expand Down Expand Up @@ -335,7 +407,7 @@ dc.barChart = function (parent, chartGroup) {
return _chart;
};

function colorFilter (color, inv) {
function colorFilter(color, inv) {
return function () {
var item = d3.select(this);
var match = item.attr('fill') === color;
Expand Down