Skip to content

Fix Candlestick & OHLC charts #2562

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 11, 2024
Merged

Fix Candlestick & OHLC charts #2562

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
28 changes: 8 additions & 20 deletions packages/perspective-viewer-d3fc/src/ts/data/ohlcData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,6 @@ export function ohlcData(settings: Settings, data: DataRowsWithKey) {
);
}

function getOHLCValue(realValue: string, col: DataRow): number | undefined {
if (!!realValue) {
let value = col[realValue];

if (typeof value === "string") {
return parseFloat(value);
}

if (typeof value !== "number") {
return undefined;
}
}

return undefined;
}

function seriesToOHLC(
settings: Settings,
data: DataRowsWithKey
Expand All @@ -60,8 +44,12 @@ function seriesToOHLC(
const getNextOpen = (i) =>
data[i < data.length - 1 ? i + 1 : i][settings.realValues[0]];
const mappedSeries: any = data.map((col, i) => {
const openValue = getOHLCValue(settings.realValues[0], col);
const closeValue = getOHLCValue(settings.realValues[1], col);
const openValue = !!settings.realValues[0]
? col[settings.realValues[0]]
: undefined;
const closeValue = !!settings.realValues[1]
? col[settings.realValues[1]]
: getNextOpen(i);

return {
crossValue: labelfn(col, i),
Expand All @@ -70,10 +58,10 @@ function seriesToOHLC(
closeValue: closeValue,
highValue: !!settings.realValues[2]
? col[settings.realValues[2]]
: Math.max(openValue, closeValue),
: Math.max(openValue as number, closeValue as number),
lowValue: !!settings.realValues[3]
? col[settings.realValues[3]]
: Math.min(openValue, closeValue),
: Math.min(openValue as number, closeValue as number),
key: data.key,
row: col,
};
Expand Down