Skip to content

Fix for fill fragmentation in rangeArea plots with nulls in data #4366

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

Merged
merged 1 commit into from
Mar 30, 2024
Merged

Fix for fill fragmentation in rangeArea plots with nulls in data #4366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 35 additions & 12 deletions src/charts/Line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,16 @@ class Line {
isRangeStart: false,
})

paths.linePaths[0] = rangePaths.linePath + paths.linePath
paths.pathFromLine = rangePaths.pathFromLine + paths.pathFromLine
if (w.globals.hasNullValues) {
let segments = paths.linePaths.length / 2
for (let s = 0; s < segments; s++) {
paths.linePaths[s] = rangePaths.linePaths[s+2] + paths.linePaths[s]
}
paths.linePaths.splice(segments)
} else {
paths.linePaths[0] = rangePaths.linePath + paths.linePath
paths.pathFromLine = rangePaths.pathFromLine + paths.pathFromLine
}
}

this._handlePaths({ type, realIndex, i, paths })
Expand Down Expand Up @@ -838,20 +846,29 @@ class Line {
case 0:
// Beginning of segment
segmentStartX = pX
linePath =
graphics.move(pX, pY)
+ graphics.curve(pX + length, pY, x - length, y, x + 1, y)
if (type === 'rangeArea' && isRangeStart) {
linePath =
graphics.move(pX, y2Arrj[j])
+ graphics.line(pX, pY)
} else {
linePath = graphics.move(pX, pY)
}
linePath +=
graphics.curve(pX + length, pY, x - length, y, x, y)
areaPath =
graphics.move(pX + 1, pY)
+ graphics.curve(pX + length, pY, x - length, y, x + 1, y)
+ graphics.curve(pX + length, pY, x - length, y, x, y)
pathState = 1
break
case 1:
// Continuing with segment
if (series[i][j + 1] === null) {
// Segment ends here
linePath +=
graphics.move(pX, pY)
if (type === 'rangeArea' && isRangeStart) {
linePath += graphics.line(pX, y2)
} else {
linePath += graphics.move(pX, pY)
}
areaPath +=
graphics.line(pX, areaBottomY)
+ graphics.line(segmentStartX, areaBottomY)
Expand All @@ -860,12 +877,18 @@ class Line {
areaPaths.push(areaPath)
} else {
linePath +=
graphics.curve(pX + length, pY, x - length, y, x + 1, y)
graphics.curve(pX + length, pY, x - length, y, x, y)
areaPath +=
graphics.curve(pX + length, pY, x - length, y, x + 1, y)
graphics.curve(pX + length, pY, x - length, y, x, y)
if (j >= series[i].length - 2) {
linePath +=
graphics.move(x, y)
if (type === 'rangeArea' && isRangeStart) {
linePath +=
graphics.curve(x, y, x, y, x, y2)
+ graphics.move(x, y2)
} else {
linePath +=
graphics.move(x, y)
}
areaPath +=
graphics.curve(x, y, x, y, x, areaBottomY)
+ graphics.move(x, y)
Expand Down