Skip to content

Added new label rendering mode "aside" to render labels in two vertical stacks instead of around the circle. #161

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

Open
mnori wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added new label rendering mode "aside" to render labels in two vertical stacks instead of around the circle. #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899c823
Added a new label drawing mode, "aside", which aligns the labels alon…
mnori Aug 3, 2018
9d23a24
Fixed a positioning bug in the "aside" modification
mnori Aug 3, 2018
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
71 changes: 57 additions & 14 deletions d3pie-source/_labels.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,31 +158,42 @@ var labels = {
quarter = 1;
}

var lineEndX, lineEndY;
if (pie.options.labels.lines.style == "aside") {
// lines will end at the same x position along the left and right hand sides of the pie.
lineEndLeft = pie.labelEdges.left - pie.outerLabelGroupData[i].w;
lineEndRight = pie.labelEdges.right;

} else {
// lines will end at computed position around the circle.
lineEndLeft = lineEndRight = pie.outerLabelGroupData[i].x;
}

switch (quarter) {
case 0:
x2 = pie.outerLabelGroupData[i].x - labelXMargin - ((pie.outerLabelGroupData[i].x - labelXMargin - originCoords.x) / 2);
x2 = lineEndRight - labelXMargin - ((lineEndRight - labelXMargin - originCoords.x) / 2);
y2 = pie.outerLabelGroupData[i].y + ((originCoords.y - pie.outerLabelGroupData[i].y) / midPoint);
x3 = pie.outerLabelGroupData[i].x - labelXMargin;
x3 = lineEndRight - labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
case 1:
x2 = originCoords.x + (pie.outerLabelGroupData[i].x - originCoords.x) / midPoint;
x2 = originCoords.x + (lineEndRight - originCoords.x) / midPoint;
y2 = originCoords.y + (pie.outerLabelGroupData[i].y - originCoords.y) / midPoint;
x3 = pie.outerLabelGroupData[i].x - labelXMargin;
x3 = lineEndRight - labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
case 2:
var startOfLabelX = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
var startOfLabelX = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
x2 = originCoords.x - (originCoords.x - startOfLabelX) / midPoint;
y2 = originCoords.y + (pie.outerLabelGroupData[i].y - originCoords.y) / midPoint;
x3 = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
x3 = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
case 3:
var startOfLabel = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
var startOfLabel = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
x2 = startOfLabel + ((originCoords.x - startOfLabel) / midPoint);
y2 = pie.outerLabelGroupData[i].y + (originCoords.y - pie.outerLabelGroupData[i].y) / midPoint;
x3 = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
x3 = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
}
Expand Down Expand Up @@ -237,16 +248,26 @@ var labels = {
},

positionLabelGroups: function(pie, section) {
if (pie.options.labels[section].format === "none") {
return;
}
if (pie.options.labels[section].format === "none") {
return;
}

d3.selectAll("." + pie.cssPrefix + "labelGroup-" + section)
.style("opacity", 0)
.attr("transform", function(d, i) {
var x, y;
if (section === "outer") {
x = pie.outerLabelGroupData[i].x;
if (pie.options.labels.lines.style === "aside") {
// in aside mode, we are aligning the labels across the left and right flanks of the pie.
if (pie.outerLabelGroupData[i].hs == "left") {
x = pie.labelEdges.left - pie.outerLabelGroupData[i].w;
} else {
x = pie.labelEdges.right;
}
} else {
// other options involve drawing the labels around the circle.
x = pie.outerLabelGroupData[i].x;
}
y = pie.outerLabelGroupData[i].y;
} else {
var pieCenterCopy = extend(true, {}, pie.pieCenter);
Expand Down Expand Up @@ -347,11 +368,11 @@ var labels = {
};
},


/**
* This does the heavy-lifting to compute the actual coordinates for the outer label groups. It does two things:
* This does the heavy-lifting to compute the actual coordinates for the outer label groups. It does three things:
* 1. Make a first pass and position them in the ideal positions, based on the pie sizes
* 2. Do some basic collision avoidance.
* 3. If "aside" mode is specified, shift the labels to the left and right flanks of the chart.
*/
computeOuterLabelCoords: function(pie) {

Expand All @@ -363,6 +384,28 @@ var labels = {

// 2. now adjust those positions to try to accommodate conflicts
labels.resolveOuterLabelCollisions(pie);

// 3. if aside mode is specified, calculate some useful stuff for that.
if (pie.options.labels.lines.style === "aside") {
labels.calcAsideLabelPositions(pie);
}
},

/**
* "aside" mode will display the labels in a straight stack along the left and right hand side of the pie
* This solves an issue where label lines sometimes overlap.
*/
calcAsideLabelPositions: function(pie) {
pie.labelEdges = { left: null, right: null };
for (var i = 0; i < pie.outerLabelGroupData.length; i++) {
var entry = pie.outerLabelGroupData[i];
if (entry.hs == "left" && (pie.labelEdges.left === null || (entry.x + entry.w) < pie.labelEdges.left)) {
pie.labelEdges.left = entry.x + entry.w;
}
if (entry.hs == "right" && (pie.labelEdges.right === null || entry.x > pie.labelEdges.right)) {
pie.labelEdges.right = entry.x;
}
}
},

/**
Expand Down
71 changes: 57 additions & 14 deletions d3pie/d3pie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,31 +940,42 @@ var labels = {
quarter = 1;
}

var lineEndX, lineEndY;
if (pie.options.labels.lines.style == "aside") {
// lines will end at the same x position along the left and right hand sides of the pie.
lineEndLeft = pie.labelEdges.left - pie.outerLabelGroupData[i].w;
lineEndRight = pie.labelEdges.right;

} else {
// lines will end at computed position around the circle.
lineEndLeft = lineEndRight = pie.outerLabelGroupData[i].x;
}

switch (quarter) {
case 0:
x2 = pie.outerLabelGroupData[i].x - labelXMargin - ((pie.outerLabelGroupData[i].x - labelXMargin - originCoords.x) / 2);
x2 = lineEndRight - labelXMargin - ((lineEndRight - labelXMargin - originCoords.x) / 2);
y2 = pie.outerLabelGroupData[i].y + ((originCoords.y - pie.outerLabelGroupData[i].y) / midPoint);
x3 = pie.outerLabelGroupData[i].x - labelXMargin;
x3 = lineEndRight - labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
case 1:
x2 = originCoords.x + (pie.outerLabelGroupData[i].x - originCoords.x) / midPoint;
x2 = originCoords.x + (lineEndRight - originCoords.x) / midPoint;
y2 = originCoords.y + (pie.outerLabelGroupData[i].y - originCoords.y) / midPoint;
x3 = pie.outerLabelGroupData[i].x - labelXMargin;
x3 = lineEndRight - labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
case 2:
var startOfLabelX = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
var startOfLabelX = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
x2 = originCoords.x - (originCoords.x - startOfLabelX) / midPoint;
y2 = originCoords.y + (pie.outerLabelGroupData[i].y - originCoords.y) / midPoint;
x3 = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
x3 = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
case 3:
var startOfLabel = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
var startOfLabel = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
x2 = startOfLabel + ((originCoords.x - startOfLabel) / midPoint);
y2 = pie.outerLabelGroupData[i].y + (originCoords.y - pie.outerLabelGroupData[i].y) / midPoint;
x3 = pie.outerLabelGroupData[i].x + pie.outerLabelGroupData[i].w + labelXMargin;
x3 = lineEndLeft + pie.outerLabelGroupData[i].w + labelXMargin;
y3 = pie.outerLabelGroupData[i].y - heightOffset;
break;
}
Expand Down Expand Up @@ -1019,16 +1030,26 @@ var labels = {
},

positionLabelGroups: function(pie, section) {
if (pie.options.labels[section].format === "none") {
return;
}
if (pie.options.labels[section].format === "none") {
return;
}

d3.selectAll("." + pie.cssPrefix + "labelGroup-" + section)
.style("opacity", 0)
.attr("transform", function(d, i) {
var x, y;
if (section === "outer") {
x = pie.outerLabelGroupData[i].x;
if (pie.options.labels.lines.style === "aside") {
// in aside mode, we are aligning the labels across the left and right flanks of the pie.
if (pie.outerLabelGroupData[i].hs == "left") {
x = pie.labelEdges.left - pie.outerLabelGroupData[i].w;
} else {
x = pie.labelEdges.right;
}
} else {
// other options involve drawing the labels around the circle.
x = pie.outerLabelGroupData[i].x;
}
y = pie.outerLabelGroupData[i].y;
} else {
var pieCenterCopy = extend(true, {}, pie.pieCenter);
Expand Down Expand Up @@ -1129,11 +1150,11 @@ var labels = {
};
},


/**
* This does the heavy-lifting to compute the actual coordinates for the outer label groups. It does two things:
* This does the heavy-lifting to compute the actual coordinates for the outer label groups. It does three things:
* 1. Make a first pass and position them in the ideal positions, based on the pie sizes
* 2. Do some basic collision avoidance.
* 3. If "aside" mode is specified, shift the labels to the left and right flanks of the chart.
*/
computeOuterLabelCoords: function(pie) {

Expand All @@ -1145,6 +1166,28 @@ var labels = {

// 2. now adjust those positions to try to accommodate conflicts
labels.resolveOuterLabelCollisions(pie);

// 3. if aside mode is specified, calculate some useful stuff for that.
if (pie.options.labels.lines.style === "aside") {
labels.calcAsideLabelPositions(pie);
}
},

/**
* "aside" mode will display the labels in a straight stack along the left and right hand side of the pie
* This solves an issue where label lines sometimes overlap.
*/
calcAsideLabelPositions: function(pie) {
pie.labelEdges = { left: null, right: null };
for (var i = 0; i < pie.outerLabelGroupData.length; i++) {
var entry = pie.outerLabelGroupData[i];
if (entry.hs == "left" && (pie.labelEdges.left === null || (entry.x + entry.w) < pie.labelEdges.left)) {
pie.labelEdges.left = entry.x + entry.w;
}
if (entry.hs == "right" && (pie.labelEdges.right === null || entry.x > pie.labelEdges.right)) {
pie.labelEdges.right = entry.x;
}
}
},

/**
Expand Down
Loading
⚡