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

Line chart labels #1045

Closed
wants to merge 2 commits into from
+83 −0
Closed

Line chart labels #1045

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1d80d
label rendering for lineChart
gazal-k Nov 23, 2015
244ce51
lint fixes
gazal-k Nov 23, 2015
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
Prev Previous commit
lint fixes
@gazal-k
gazal-k committed Nov 23, 2015
commit 244ce516ee4265b5e21ebc2ccb07e2ef4aa594af
15 changes: 8 additions & 7 deletions spec/line-chart-spec.js
View file
Original file line number Diff line number Diff line change
@@ -686,12 +686,13 @@ describe('dc.lineChart', function () {
}

function lineLabelPositions () {
var LABEL_PADDING = 3;
chart.selectAll('.stack')[0].forEach(function (stack, i) {
d3.select(stack).selectAll('text.lineLabel')[0].forEach(function (lineLabel, j) {
expect(+d3.select(lineLabel).attr('x')).toBeCloseTo(chart.x()(chart.data()[i].values[j].x));
expect(+d3.select(lineLabel).attr('y') + LABEL_PADDING).toBeCloseTo(chart.y()(chart.data()[i].values[j].y + chart.data()[i].values[j].y0));
});
});
var LABEL_PADDING = 3;
chart.selectAll('.stack')[0].forEach(function (stack, i) {
d3.select(stack).selectAll('text.lineLabel')[0].forEach(function (lineLabel, j) {
expect(+d3.select(lineLabel).attr('x')).toBeCloseTo(chart.x()(chart.data()[i].values[j].x));
expect(+d3.select(lineLabel).attr('y') + LABEL_PADDING).toBeCloseTo(chart.y()(chart.data()[i].values[j].y +
chart.data()[i].values[j].y0));
});
});
}
});
48 changes: 24 additions & 24 deletions src/line-chart.js
View file
Original file line number Diff line number Diff line change
@@ -320,30 +320,30 @@ dc.lineChart = function (parent, chartGroup) {

function drawLabels (layers) {
layers.each(function (d, layerIndex) {
var layer = d3.select(this);
var labels = layer.selectAll('text.lineLabel')
.data(d.values, dc.pluck('x'));

labels.enter()
.append('text')
.attr('class', 'lineLabel')
.attr('text-anchor', 'middle');

dc.transition(labels, _chart.transitionDuration())
.attr('x', function (d) {
return dc.utils.safeNumber(_chart.x()(d.x));
})
.attr('y', function (d) {
var y = _chart.y()(d.y + d.y0) - LABEL_PADDING;
return dc.utils.safeNumber(y);
})
.text(function (d) {
return _chart.label()(d);
});

dc.transition(labels.exit(), _chart.transitionDuration())
.attr('height', 0)
.remove();
var layer = d3.select(this);
var labels = layer.selectAll('text.lineLabel')
.data(d.values, dc.pluck('x'));

labels.enter()
.append('text')
.attr('class', 'lineLabel')
.attr('text-anchor', 'middle');

dc.transition(labels, _chart.transitionDuration())
.attr('x', function (d) {
return dc.utils.safeNumber(_chart.x()(d.x));
})
.attr('y', function (d) {
var y = _chart.y()(d.y + d.y0) - LABEL_PADDING;
return dc.utils.safeNumber(y);
})
.text(function (d) {
return _chart.label()(d);
});

dc.transition(labels.exit(), _chart.transitionDuration())
.attr('height', 0)
.remove();
});
}