Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-21 23:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Added dataset option |cubicInterpolationMode| to allow for curves with different interpolation modes on the same graph (updated doc accordingly)

Browse Source 
- Added new sample file to demonstrate the monotone cubic interpolation mode
- Fixed a typo in a comment in updateBezierControlPoints
This commit is contained in:
MatthieuRivaud
2016-08-08 15:35:46 +02:00
parent 2409908027
commit d06fbc772f
3 changed files with 117 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/controller.line.js
View File

@@ -90,6 +90,7 @@ module.exports = function(Chart) {
borderJoinStyle: custom.borderJoinStyle ? custom.borderJoinStyle : (dataset.borderJoinStyle || lineElementOptions.borderJoinStyle),
fill: custom.fill ? custom.fill : (dataset.fill !== undefined ? dataset.fill : lineElementOptions.fill),
steppedLine: custom.steppedLine ? custom.steppedLine : helpers.getValueOrDefault(dataset.steppedLine, lineElementOptions.stepped),
cubicInterpolationMode: custom.cubicInterpolationMode ? custom.cubicInterpolationMode : helpers.getValueOrDefault(dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode),
// Scale
scaleTop: scale.top,
scaleBottom: scale.bottom,
@@ -248,7 +249,7 @@ module.exports = function(Chart) {
var meta = me.getMeta();
var area = me.chart.chartArea;
// only consider points that are drawn in case the spanGaps option is ued
// Only consider points that are drawn in case the spanGaps option is used
var points = (meta.data || []).filter(function(pt) { return !pt._model.skip; });
var i, ilen, point, model, controlPoints;
@@ -256,7 +257,7 @@ module.exports = function(Chart) {
return Math.max(Math.min(pt, max), min);
}
if (me.chart.options.elements.line.cubicInterpolationMode == 'monotone') {
if (meta.dataset._model.cubicInterpolationMode == 'monotone') {
helpers.splineCurveMonotone(points);
}
else {