-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor and optimise creation of
DataCurve geometries
- Loading branch information
Showing
4 changed files
with
195 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,6 @@ | ||
| import type { NumArray } from '@h5web/shared'; | ||
| import { useMemo } from 'react'; | ||
| import { Vector3 } from 'three'; | ||
| import { createMemo } from '@h5web/shared'; | ||
|
|
||
| import { useVisCanvasContext } from '../shared/VisCanvasProvider'; | ||
| import { getValueToErrorPositions, getValueToPosition } from './utils'; | ||
|
|
||
| const CAMERA_FAR = 1000; // R3F's default | ||
|
|
||
| export function useCanvasPoints( | ||
| abscissas: NumArray, | ||
| ordinates: NumArray, | ||
| errors?: NumArray, | ||
| ignoreValue?: (val: number) => boolean | ||
| ) { | ||
| const { abscissaScale, ordinateScale } = useVisCanvasContext(); | ||
|
|
||
| return useMemo(() => { | ||
| const dataPoints: Vector3[] = []; | ||
| const errorBarSegments: Vector3[] = []; | ||
| const errorCapPoints: Vector3[] = []; | ||
|
|
||
| ordinates.forEach((val, index) => { | ||
| const x = abscissaScale(abscissas[index]); | ||
| const y = ordinateScale(val); | ||
|
|
||
| const hasFiniteCoords = | ||
| !ignoreValue?.(val) && Number.isFinite(x) && Number.isFinite(y); | ||
| const dataVector = hasFiniteCoords | ||
| ? new Vector3(x, y, 0) | ||
| : /* Render points with NaN/Infinity coordinates (i.e. values <= 0 in log) | ||
| * at origin to avoid Three warning, and outside of camera's field of view | ||
| * to hide them and any segments connecting them. */ | ||
| new Vector3(0, 0, CAMERA_FAR); | ||
|
|
||
| dataPoints.push(dataVector); | ||
|
|
||
| const error = errors?.[index]; | ||
| if (!error || !hasFiniteCoords) { | ||
| return; | ||
| } | ||
|
|
||
| const yErrBottom = ordinateScale(val - error); | ||
| const yErrTop = ordinateScale(val + error); | ||
|
|
||
| if (Number.isFinite(yErrBottom)) { | ||
| const errBottomVector = new Vector3(x, yErrBottom, 0); | ||
| errorBarSegments.push(errBottomVector, dataVector); | ||
| errorCapPoints.push(errBottomVector); | ||
| } | ||
|
|
||
| if (Number.isFinite(yErrTop)) { | ||
| const errTopVector = new Vector3(x, yErrTop, 0); | ||
| errorBarSegments.push(dataVector, errTopVector); | ||
| errorCapPoints.push(errTopVector); | ||
| } | ||
| }); | ||
|
|
||
| return { data: dataPoints, bars: errorBarSegments, caps: errorCapPoints }; | ||
| }, [abscissaScale, abscissas, errors, ordinateScale, ordinates, ignoreValue]); | ||
| } | ||
| export const useValueToPosition = createMemo(getValueToPosition); | ||
| export const useValueToErrorPositions = createMemo(getValueToErrorPositions); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| import type { NumArray } from '@h5web/shared'; | ||
|
|
||
| import type { AxisScale } from '../models'; | ||
|
|
||
| const NO_ERROR_POSITIONS = { | ||
| topCap: undefined, | ||
| bottomCap: undefined, | ||
| bar: undefined, | ||
| }; | ||
|
|
||
| export function getValueToPosition( | ||
| abscissas: NumArray, | ||
| abscissaScale: AxisScale, | ||
| ordinateScale: AxisScale, | ||
| ignoreValue?: (val: number) => boolean | ||
| ): (value: number, index: number) => [number, number] | undefined { | ||
| return (value: number, index: number) => { | ||
| const x = abscissaScale(abscissas[index]); | ||
| const y = ordinateScale(value); | ||
|
|
||
| const isIgnored = ignoreValue ? ignoreValue(value) : false; | ||
| const hasFiniteCoords = Number.isFinite(x) && Number.isFinite(y); | ||
|
|
||
| return !isIgnored && hasFiniteCoords ? [x, y] : undefined; | ||
| }; | ||
| } | ||
|
|
||
| // eslint-disable-next-line sonarjs/cognitive-complexity | ||
| export function getValueToErrorPositions( | ||
| errors: NumArray | undefined, | ||
| ordinateScale: AxisScale | ||
| ): ( | ||
| value: number, | ||
| index: number, | ||
| position: [number, number] | undefined | ||
| ) => { | ||
| topCap: [number, number] | undefined; | ||
| bottomCap: [number, number] | undefined; | ||
| bar: [number, number, number, number] | undefined; | ||
| } { | ||
| if (!errors) { | ||
| return () => NO_ERROR_POSITIONS; | ||
| } | ||
|
|
||
| return (value, index, position) => { | ||
| if (!position) { | ||
| return NO_ERROR_POSITIONS; | ||
| } | ||
|
|
||
| const [x, y] = position; | ||
| const error = errors[index]; | ||
| if (error < 0) { | ||
| return NO_ERROR_POSITIONS; | ||
| } | ||
|
|
||
| const yCapTop = ordinateScale(value + error); | ||
| const yCapBottom = ordinateScale(value - error); | ||
|
|
||
| const showTopCap = Number.isFinite(yCapTop); | ||
| const showBottomCap = Number.isFinite(yCapBottom); | ||
|
|
||
| const yBarTop = showTopCap ? yCapTop : y; | ||
| const yBarBottom = showBottomCap ? yCapBottom : y; | ||
| const showBar = showTopCap || showBottomCap; | ||
|
|
||
| return { | ||
| topCap: showTopCap ? [x, yCapTop] : undefined, | ||
| bottomCap: showBottomCap ? [x, yCapBottom] : undefined, | ||
| bar: showBar ? [x, yBarTop, x, yBarBottom] : undefined, | ||
| }; | ||
| }; | ||
| } |