Skip to content

Commit

Permalink
Allow styling of line segments
Browse files Browse the repository at this point in the history
Gap styling

range styling

cache reset

Allow styling of line segments
  • Loading branch information
kurkle committed Apr 7, 2021
1 parent c6473da commit 93bcb33
Show file tree
Hide file tree
Showing 10 changed files with 176 additions and 23 deletions.
4 changes: 3 additions & 1 deletion src/controllers/controller.line.js
Expand Up @@ -33,9 +33,10 @@ export default class LineController extends DatasetController {
if (!me.options.showLine) {
options.borderWidth = 0;
}
options.segments = me.options.segments;
me.updateElement(line, undefined, {
animated: !animationsDisabled,
options
options,
}, mode);

// Update Points
Expand All @@ -62,6 +63,7 @@ export default class LineController extends DatasetController {
const y = properties.y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(_stacked ? me.applyStack(yScale, parsed, _stacked) : parsed.y, i);
properties.skip = isNaN(x) || isNaN(y);
properties.stop = i > 0 && (parsed.x - prevParsed.x) > maxGapLength;
properties.parsed = parsed;

if (includeOptions) {
properties.options = sharedOptions || me.resolveDataElementOptions(i, mode);
Expand Down
51 changes: 32 additions & 19 deletions src/elements/element.line.js
Expand Up @@ -3,18 +3,19 @@ import {_bezierInterpolation, _pointInLine, _steppedInterpolation} from '../help
import {_computeSegments, _boundSegments} from '../helpers/helpers.segment';
import {_steppedLineTo, _bezierCurveTo} from '../helpers/helpers.canvas';
import {_updateBezierControlPoints} from '../helpers/helpers.curve';
import {valueOrDefault} from '../helpers';

/**
* @typedef { import("./element.point").default } PointElement
*/

function setStyle(ctx, vm) {
ctx.lineCap = vm.borderCapStyle;
ctx.setLineDash(vm.borderDash);
ctx.lineDashOffset = vm.borderDashOffset;
ctx.lineJoin = vm.borderJoinStyle;
ctx.lineWidth = vm.borderWidth;
ctx.strokeStyle = vm.borderColor;
function setStyle(ctx, options, style = options) {
ctx.lineCap = valueOrDefault(style.borderCapStyle, options.borderCapStyle);
ctx.setLineDash(valueOrDefault(style.borderDash, options.borderDash));
ctx.lineDashOffset = valueOrDefault(style.borderDashOffset, options.borderDashOffset);
ctx.lineJoin = valueOrDefault(style.borderJoinStyle, options.borderJoinStyle);
ctx.lineWidth = valueOrDefault(style.borderWidth, options.borderWidth);
ctx.strokeStyle = valueOrDefault(style.borderColor, options.borderColor);
}

function lineTo(ctx, previous, target) {
Expand Down Expand Up @@ -206,18 +207,33 @@ function strokePathWithCache(ctx, line, start, count) {
path.closePath();
}
}
setStyle(ctx, line.options);
ctx.stroke(path);
}

function strokePathDirect(ctx, line, start, count) {
ctx.beginPath();
if (line.path(ctx, start, count)) {
ctx.closePath();
const {segments, options} = line;
const segmentMethod = _getSegmentMethod(line);

for (const segment of segments) {
setStyle(ctx, options, segment.style);
ctx.beginPath();
if (segmentMethod(ctx, line, segment, {start, end: start + count - 1})) {
ctx.closePath();
}
ctx.stroke();
}
ctx.stroke();
}

const usePath2D = typeof Path2D === 'function';
const strokePath = usePath2D ? strokePathWithCache : strokePathDirect;

function draw(ctx, line, start, count) {
if (usePath2D && line.segments.length === 1) {
strokePathWithCache(ctx, line, start, count);
} else {
strokePathDirect(ctx, line, start, count);
}
}

export default class LineElement extends Element {

Expand Down Expand Up @@ -262,7 +278,7 @@ export default class LineElement extends Element {
}

get segments() {
return this._segments || (this._segments = _computeSegments(this));
return this._segments || (this._segments = _computeSegments(this, this.options.segments));
}

/**
Expand Down Expand Up @@ -352,15 +368,14 @@ export default class LineElement extends Element {
path(ctx, start, count) {
const me = this;
const segments = me.segments;
const ilen = segments.length;
const segmentMethod = _getSegmentMethod(me);
let loop = me._loop;

start = start || 0;
count = count || (me.points.length - start);

for (let i = 0; i < ilen; ++i) {
loop &= segmentMethod(ctx, me, segments[i], {start, end: start + count - 1});
for (const segment of segments) {
loop &= segmentMethod(ctx, me, segment, {start, end: start + count - 1});
}
return !!loop;
}
Expand All @@ -383,9 +398,7 @@ export default class LineElement extends Element {

ctx.save();

setStyle(ctx, options);

strokePath(ctx, me, start, count);
draw(ctx, me, start, count);

ctx.restore();

Expand Down
1 change: 1 addition & 0 deletions src/elements/element.point.js
Expand Up @@ -14,6 +14,7 @@ export default class PointElement extends Element {
super();

this.options = undefined;
this.parsed = undefined;
this.skip = undefined;
this.stop = undefined;

Expand Down
62 changes: 59 additions & 3 deletions src/helpers/helpers.segment.js
Expand Up @@ -3,6 +3,7 @@ import {_angleBetween, _angleDiff, _normalizeAngle} from './helpers.math';
/**
* @typedef { import("../elements/element.line").default } LineElement
* @typedef { import("../elements/element.point").default } PointElement
* @typedef {{start: number, end: number, loop: boolean, style?: any}} Segment
*/

function propertyFn(property) {
Expand Down Expand Up @@ -221,9 +222,11 @@ function solidSegments(points, start, max, loop) {
* Compute the continuous segments that define the whole line
* There can be skipped points within a segment, if spanGaps is true.
* @param {LineElement} line
* @param {object} [segmentOptions]
* @return {Segment[]}
* @private
*/
export function _computeSegments(line) {
export function _computeSegments(line, segmentOptions) {
const points = line.points;
const spanGaps = line.options.spanGaps;
const count = points.length;
Expand All @@ -236,10 +239,63 @@ export function _computeSegments(line) {
const {start, end} = findStartAndEnd(points, count, loop, spanGaps);

if (spanGaps === true) {
return [{start, end, loop}];
return splitByStyles([{start, end, loop}], points, segmentOptions);
}

const max = end < start ? end + count : end;
const completeLoop = !!line._fullLoop && start === 0 && end === count - 1;
return solidSegments(points, start, max, completeLoop);
return splitByStyles(solidSegments(points, start, max, completeLoop), points, segmentOptions);
}

/**
* @param {Segment[]} segments
* @param {PointElement[]} points
* @param {object} [segmentOptions]
* @return {Segment[]}
*/
function splitByStyles(segments, points, segmentOptions) { // eslint-disable-line complexity, max-statements
const count = points.length;
if (!segmentOptions || !segmentOptions.setContext || !count) {
return segments;
}

const result = [];
let start = segments[0].start;
let i = start;
for (const segment of segments) {
let prevStyle, style;
let prev = points[start % count];
for (i = start + 1; i <= segment.end; i++) {
const pt = points[i % count];
style = readStyle(segmentOptions.setContext({type: 'segment', p1: prev, p2: pt}));
if (prevStyle && !compareStyle(style, prevStyle)) {
result.push({start: start, end: i - 1, loop: segment.loop, style: prevStyle});
prevStyle = style;
start = i - 1;
}
prev = pt;
prevStyle = style;
}
if (start < i - 1) {
result.push({start, end: i - 1, loop: segment.loop, style});
start = i - 1;
}
}

return result;
}

function readStyle(options) {
return {
borderCapStyle: options.borderCapStyle,
borderDash: options.borderDash,
borderDashOffset: options.borderDashOffset,
borderJoinStyle: options.borderJoinStyle,
borderWidth: options.borderWidth,
borderColor: options.borderColor,
};
}

function compareStyle(style1, style2) {
return JSON.stringify(style1) === JSON.stringify(style2);
}
22 changes: 22 additions & 0 deletions test/fixtures/controller.line/segments/gap.js
@@ -0,0 +1,22 @@
module.exports = {
config: {
type: 'line',
data: {
labels: ['a', 'b', 'c', 'd', 'e', 'f'],
datasets: [{
data: [1, 3, NaN, NaN, 2, 1],
borderColor: 'black',
segments: {
borderColor: ctx => ctx.p1.skip || ctx.p2.skip ? 'red' : undefined,
borderDash: ctx => ctx.p1.skip || ctx.p2.skip ? [5, 5] : undefined
}
}]
},
options: {
scales: {
x: {display: false},
y: {display: false}
}
}
}
};
Binary file added test/fixtures/controller.line/segments/gap.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions test/fixtures/controller.line/segments/range.js
@@ -0,0 +1,33 @@
function x(ctx, {min = -Infinity, max = Infinity}) {
return (ctx.p1.parsed.x >= min || ctx.p2.parsed.x >= min) && (ctx.p1.parsed.x < max && ctx.p1.parsed.x < max);
}

function y(ctx, {min = -Infinity, max = Infinity}) {
return (ctx.p1.parsed.y >= min || ctx.p2.parsed.y >= min) && (ctx.p1.parsed.y < max || ctx.p2.parsed.y < max);
}

function xy(ctx, xr, yr) {
return x(ctx, xr) && y(ctx, yr);
}

module.exports = {
config: {
type: 'line',
data: {
datasets: [{
data: [{x: 0, y: 0}, {x: 1, y: 1}, {x: 2, y: 2}, {x: 3, y: 3}, {x: 4, y: 4}, {x: 5, y: 5}, {x: 6, y: 7}, {x: 7, y: 8}],
borderColor: 'black',
segments: {
borderColor: ctx => x(ctx, {min: 3, max: 4}) ? 'red' : y(ctx, {min: 5}) ? 'green' : xy(ctx, {min: 0}, {max: 1}) ? 'blue' : undefined,
borderDash: ctx => x(ctx, {min: 3, max: 4}) || y(ctx, {min: 5}) ? [5, 5] : undefined,
}
}]
},
options: {
scales: {
x: {type: 'linear', display: false},
y: {display: false}
}
}
}
};
Binary file added test/fixtures/controller.line/segments/range.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions test/fixtures/controller.line/segments/slope.js
@@ -0,0 +1,26 @@
function slope({p1, p2}) {
return (p1.y - p2.y) / (p2.x - p1.x);
}

module.exports = {
config: {
type: 'line',
data: {
labels: ['a', 'b', 'c', 'd', 'e', 'f'],
datasets: [{
data: [1, 2, 3, 3, 2, 1],
borderColor: 'black',
segments: {
borderColor: ctx => slope(ctx) > 0 ? 'green' : slope(ctx) < 0 ? 'red' : undefined,
borderDash: ctx => slope(ctx) < 0 ? [5, 5] : undefined
}
}]
},
options: {
scales: {
x: {display: false},
y: {display: false}
}
}
}
};
Binary file added test/fixtures/controller.line/segments/slope.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 93bcb33

Please sign in to comment.