Skip to content

Update RangeBar.js #1146

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
Dec 18, 2019
Merged

Update RangeBar.js #1146

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
168 changes: 74 additions & 94 deletions src/charts/RangeBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,113 +94,93 @@ class RangeBar extends Bar {
}
}

let itemsLen = 1
let y1 = this.seriesRangeStart[i][j]
let y2 = this.seriesRangeEnd[i][j]

const srt =
w.globals.seriesRangeBarTimeline.length &&
w.globals.seriesRangeBarTimeline[i][j]
let paths = null
let barYPosition = null
const params = { x, y, pathTo, pathFrom, strokeWidth, elSeries }

if (srt) {
itemsLen = srt.y.length
y = 0
}

for (let ii = 0; ii < itemsLen; ii++) {
let paths = null
let barYPosition = null
const params = { x, y, pathTo, pathFrom, strokeWidth, elSeries }

if (this.isHorizontal) {
barYPosition = y + barHeight * this.visibleI

if (srt) {
let srty = (yDivision - barHeight * this.seriesLen) / 2
const rt = srt.y[ii]
y1 = rt.y1
y2 = rt.y2

const yPosition = w.globals.labels.indexOf(srt.x)

barYPosition =
srty + barHeight * this.visibleI + yDivision * yPosition
} else {
// no item exists for further indices in a timeline, hence break
if (this.isTimelineBar) {
break
}
}

paths = this.drawRangeBarPaths({
indexes: { i, j, realIndex, bc },
barHeight,
barYPosition,
zeroW,
yDivision,
y1,
y2,
...params
})

barWidth = paths.barWidth
} else {
paths = this.drawRangeColumnPaths({
indexes: { i, j, realIndex, bc },
zeroH,
barWidth,
xDivision,
...params
})

barHeight = paths.barHeight
}

pathTo = paths.pathTo
pathFrom = paths.pathFrom
y = paths.y
x = paths.x
if (this.isHorizontal) {
barYPosition = y + barHeight * this.visibleI

// push current X
let fillColor = null
let srty = (yDivision - barHeight * this.seriesLen) / 2

if (
w.config.series[i].data[j] &&
w.config.series[i].data[j].fillColor
) {
fillColor = w.config.series[i].data[j].fillColor
}

let pathFill = fill.fillPath({
seriesNumber: realIndex,
color: fillColor
})
const yPosition = w.globals.labels.indexOf(
w.config.series[i].data[j].x
)

let lineFill = w.globals.stroke.colors[realIndex]
barYPosition =
srty + barHeight * this.visibleI + yDivision * yPosition

this.renderSeries({
realIndex,
pathFill,
lineFill,
j,
i,
x,
y,
y1,
y2,
pathFrom,
pathTo,
strokeWidth,
elSeries,
series,
paths = this.drawRangeBarPaths({
indexes: { i, j, realIndex, bc },
barHeight,
barYPosition,
zeroW,
yDivision,
y1,
y2,
...params
})

barWidth = paths.barWidth
} else {
paths = this.drawRangeColumnPaths({
indexes: { i, j, realIndex, bc },
zeroH,
barWidth,
elDataLabelsWrap,
visibleSeries: this.visibleI,
type: 'rangebar'
xDivision,
...params
})

barHeight = paths.barHeight
}

pathTo = paths.pathTo
pathFrom = paths.pathFrom
y = paths.y
x = paths.x

// push current X
let fillColor = null

if (
w.config.series[i].data[j] &&
w.config.series[i].data[j].fillColor
) {
fillColor = w.config.series[i].data[j].fillColor
}

let pathFill = fill.fillPath({
seriesNumber: realIndex,
color: fillColor
})

let lineFill = w.globals.stroke.colors[realIndex]

this.renderSeries({
realIndex,
pathFill,
lineFill,
j,
i,
x,
y,
y1,
y2,
pathFrom,
pathTo,
strokeWidth,
elSeries,
series,
barHeight,
barYPosition,
barWidth,
elDataLabelsWrap,
visibleSeries: this.visibleI,
type: 'rangebar'
})
}

ret.add(elSeries)
Expand Down