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

added bar-target-graph and some fixed to barchart. #692

Closed
wants to merge 1 commit into from
Closed

added bar-target-graph and some fixed to barchart. #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 40 additions & 8 deletions src/bar-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,21 @@ dc.barChart = function (parent, chartGroup) {

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

/** _isTarget controls how the bar is rendered. If it is a 'cap'
we render the bar as a thick line of the top instead of
to the bottom */
var _isTarget = false;

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


/** _padding adds whitespace between the barwidth
(the brackets where bars are rendered in) and de bar
itself, putting the rendered bar in the center. */


var _padding =0;
var _barWidth;

dc.override(_chart, 'rescale', function () {
Expand Down Expand Up @@ -103,7 +114,10 @@ dc.barChart = function (parent, chartGroup) {
.attr("x", function (d) {
var x = _chart.x()(d.x);
if (_centerBar) x -= _barWidth / 2;
if (_chart.isOrdinal()) x += _gap/2;
if (_chart.isOrdinal() && _gap!==undefined) x += _gap/2;

x+=_padding;

return dc.utils.safeNumber(x);
})
.attr("y", function (d) {
Expand All @@ -114,9 +128,9 @@ dc.barChart = function (parent, chartGroup) {

return dc.utils.safeNumber(y);
})
.attr("width", _barWidth)
.attr("width", function (d) { return _barWidth - 2 * _padding;})
.attr("height", function (d) {
return barHeight(d);
return _isTarget ? 2 : barHeight(d);
})
.attr("fill", dc.pluck('data',_chart.getColor))
.select("title").text(dc.pluck('data',_chart.title(d.name)));
Expand All @@ -126,19 +140,24 @@ dc.barChart = function (parent, chartGroup) {
.remove();
}

function calculateBarWidth() {
function calculateBarWidth() {
if (_barWidth === undefined) {


var numberOfBars = _chart.xUnitCount();

numberOfBars = (_chart.isOrdinal()) ? numberOfBars + 1 : numberOfBars;

if (_chart.isOrdinal() && !_gap)
_barWidth = Math.floor(_chart.x().rangeBand());
_barWidth = Math.ceil(_chart.x().rangeBand());
else if (_gap)
_barWidth = Math.floor((_chart.xAxisLength() - (numberOfBars - 1) * _gap) / numberOfBars);
_barWidth = Math.ceil((_chart.xAxisLength() - (numberOfBars - 1) * _gap) / numberOfBars);
else
_barWidth = Math.floor(_chart.xAxisLength() / (1 + _chart.barPadding()) / numberOfBars);
_barWidth = Math.ceil(_chart.xAxisLength() / (1 + _chart.barPadding()) / numberOfBars);

if (_barWidth == Infinity || isNaN(_barWidth) || _barWidth < MIN_BAR_WIDTH)
_barWidth = MIN_BAR_WIDTH;

}
}

Expand Down Expand Up @@ -222,6 +241,19 @@ dc.barChart = function (parent, chartGroup) {
return _chart;
};

_chart.target = function (_) {
if (!arguments.length) return _isTarget;
_isTarget = _;
return _chart;
};


_chart.padding = function (_) {
if (!arguments.length) return _padding;
_padding = _;
return _chart;
};

_chart.extendBrush = function () {
var extent = _chart.brush().extent();
if (_chart.round() && (!_centerBar || _alwaysUseRounding)) {
Expand Down
94 changes: 94 additions & 0 deletions web/examples/bar-targets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>dc.js - Bar Chart Example</title>
<meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="../css/dc.css"/>
</head>
<body>

<div id="test"></div>

<script type="text/javascript" src="../js/d3.js"></script>
<script type="text/javascript" src="../js/crossfilter.js"></script>
<script type="text/javascript" src="../js/dc.js"></script>
<script type="text/javascript">

var compositeBar = dc.compositeChart("#test");
d3.csv("data.csv", function(error, experiments) {

var targets = {};
targets['01M'] = 7;
targets['03M'] = 5;
targets['06M'] = 3;
targets['12M'] = 0.1;

var actuals = {};
actuals['01M'] = 4;
actuals['03M'] = 4;
actuals['06M'] = 1.5;
actuals['12M'] = 1.8;


var ndx = crossfilter();
ndx.add(experiments);

var d2acolors = d3.scale.ordinal ().range (["rgb(188,35,36)","rgb(224,128,128)","rgb(224,226,228)"]);
var dim = ndx.dimension(dc.pluck('Period')),
dateGroup = dim.group(),
perf = dim.group().reduceSum(function(d) { return d.Cat == 'perf' ? 1: 0 ;}),
local = dim.group().reduceSum(function(d) { return d.Cat == 'local' ? 1: 0 ;}),
other = dim.group().reduceSum(function(d) { return d.Cat == 'other' ? 1: 0 ;});
target = dim.group().reduceSum(function(d) { return targets[d.D]});

compositeBar
.width(480)
.height(480)
.x(d3.scale.ordinal().domain(['01M','03M','06M','12M'] ))
.xUnits(dc.units.ordinal)
.compose([
dc.barChart(compositeBar)
.dimension(dim)
.group(perf , "Perf")
.stack(local, "Local")
.stack(other , "Other")
.colors(d2acolors)
.gap(10)
.padding(10)
,

dc.barChart(compositeBar)
.dimension(dim)
.colors("black")
.padding(8)
.target(true)
.gap(10)
.group(dateGroup, "Target")
.valueAccessor(function(p) {
return targets[p.key];
})
,
dc.barChart(compositeBar)
.dimension(dim)
.colors("black")
.padding(30)
.gap(10)
.group(dateGroup, "Actual")
.valueAccessor(function(p) {
return actuals[p.key];
})


])

.yAxisLabel("Number of vendors")
.xAxisLabel("Inactive for")
.colors(d2acolors)
.render();

});

</script>

</body>
</html>
22 changes: 22 additions & 0 deletions web/examples/data.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Cat,VendorName,Period,dc
perf,Aap,01M,0
perf,Aap,03M,1
perf,Noot,01M,0
perf,Mies,01M,0
perf,Mies,03M,1
perf,Mies,06M,2
perf,Wim,01M,0
perf,Zus,01M,0
local,Jet,01M,0
local,Jet,03M,1
local,Jet,06M,2
local,Kees,01M,0
local,Kees,03M,1
local,Does,01M,0
other,ak1,01M,0
other,ak1,03M,1
other,ak1,06M,2
other,ak1,12M,3
other,ak3,01M,0
other,ak4,01M,0
other,ak4,03M,1
48 changes: 40 additions & 8 deletions web/js/dc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3634,10 +3634,21 @@ dc.barChart = function (parent, chartGroup) {

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

/** _isTarget controls how the bar is rendered. If it is a 'cap'
we render the bar as a thick line of the top instead of
to the bottom */
var _isTarget = false;

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


/** _padding adds whitespace between the barwidth
(the brackets where bars are rendered in) and de bar
itself, putting the rendered bar in the center. */


var _padding =0;
var _barWidth;

dc.override(_chart, 'rescale', function () {
Expand Down Expand Up @@ -3698,7 +3709,10 @@ dc.barChart = function (parent, chartGroup) {
.attr("x", function (d) {
var x = _chart.x()(d.x);
if (_centerBar) x -= _barWidth / 2;
if (_chart.isOrdinal()) x += _gap/2;
if (_chart.isOrdinal() && _gap!==undefined) x += _gap/2;

x+=_padding;

return dc.utils.safeNumber(x);
})
.attr("y", function (d) {
Expand All @@ -3709,9 +3723,9 @@ dc.barChart = function (parent, chartGroup) {

return dc.utils.safeNumber(y);
})
.attr("width", _barWidth)
.attr("width", function (d) { return _barWidth - 2 * _padding;})
.attr("height", function (d) {
return barHeight(d);
return _isTarget ? 2 : barHeight(d);
})
.attr("fill", dc.pluck('data',_chart.getColor))
.select("title").text(dc.pluck('data',_chart.title(d.name)));
Expand All @@ -3721,19 +3735,24 @@ dc.barChart = function (parent, chartGroup) {
.remove();
}

function calculateBarWidth() {
function calculateBarWidth() {
if (_barWidth === undefined) {


var numberOfBars = _chart.xUnitCount();

numberOfBars = (_chart.isOrdinal()) ? numberOfBars + 1 : numberOfBars;

if (_chart.isOrdinal() && !_gap)
_barWidth = Math.floor(_chart.x().rangeBand());
_barWidth = Math.ceil(_chart.x().rangeBand());
else if (_gap)
_barWidth = Math.floor((_chart.xAxisLength() - (numberOfBars - 1) * _gap) / numberOfBars);
_barWidth = Math.ceil((_chart.xAxisLength() - (numberOfBars - 1) * _gap) / numberOfBars);
else
_barWidth = Math.floor(_chart.xAxisLength() / (1 + _chart.barPadding()) / numberOfBars);
_barWidth = Math.ceil(_chart.xAxisLength() / (1 + _chart.barPadding()) / numberOfBars);

if (_barWidth == Infinity || isNaN(_barWidth) || _barWidth < MIN_BAR_WIDTH)
_barWidth = MIN_BAR_WIDTH;

}
}

Expand Down Expand Up @@ -3817,6 +3836,19 @@ dc.barChart = function (parent, chartGroup) {
return _chart;
};

_chart.target = function (_) {
if (!arguments.length) return _isTarget;
_isTarget = _;
return _chart;
};


_chart.padding = function (_) {
if (!arguments.length) return _padding;
_padding = _;
return _chart;
};

_chart.extendBrush = function () {
var extent = _chart.brush().extent();
if (_chart.round() && (!_centerBar || _alwaysUseRounding)) {
Expand Down