archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Fixed truncation of pie chart borders

Browse Source
This commit is contained in:
nmac143 2016-06-28 16:33:43 -04:00 committed by Neil Macintyre
parent 266df5e877
commit 426466d051
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/controllers/controller.doughnut.js
View File

@ -166,8 +166,9 @@ module.exports = function(Chart) {
minSize = Math.min(availableWidth / size.width, availableHeight / size.height);
offset = {x: (max.x + min.x) * -0.5, y: (max.y + min.y) * -0.5};
}
chart.borderWidth = me.getMaxBorderWidth(meta.data);
chart.outerRadius = Math.max(minSize / 2, 0);
chart.outerRadius = Math.max((minSize - chart.borderWidth) / 2, 0);
chart.innerRadius = Math.max(cutoutPercentage ? (chart.outerRadius / 100) * (cutoutPercentage) : 1, 0);
chart.radiusLength = (chart.outerRadius - chart.innerRadius) / chart.getVisibleDatasetCount();
chart.offsetX = offset.x * chart.outerRadius;
@ -262,6 +263,20 @@ module.exports = function(Chart) {
} else {
return 0;
}
}
},
//gets the max border or hover width to properly scale pie charts
getMaxBorderWidth: function (elements) {
var max = 0;
for (var i = 0; i < elements.length; i++) {
var borderWidth = elements[i]._model ? elements[i]._model.borderWidth : 0,
hoverWidth = elements[i]._chart ? elements[i]._chart.config.data.datasets[this.index].hoverBorderWidth : 0;
max = borderWidth > max ? borderWidth : max;
max = hoverWidth > max ? hoverWidth : max;
}
return max;
}
});
};

4
src/core/core.datasetController.js
View File

@ -157,7 +157,9 @@ module.exports = function(Chart) {
model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : valueOrDefault(dataset.hoverBorderColor, index, getHoverColor(model.borderColor));
model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : valueOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
}
});
});
Chart.DatasetController.extend = helpers.inherits;
};