Skip to content
This repository was archived by the owner on Aug 5, 2025. It is now read-only.

Commit 1f16585

Browse files
anisometropieachrafmohye
authored andcommitted
ui-chart: fix cases where spaceOrigin != 0
Signed-off-by: Valentin Chanas <[email protected]> Signed-off-by: Achrafmohye <[email protected]>
1 parent fdf0198 commit 1f16585

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

storybook/stories/ui-charts/spaceTimeChart/rectangle-zoom.stories.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
type Point,
99
type PathData,
1010
type OperationalPoint,
11+
type SpaceScale,
1112
} from '@osrd-project/ui-charts';
1213
import { Button, Slider } from '@osrd-project/ui-core';
1314
import type { Meta } from '@storybook/react';
@@ -93,9 +94,8 @@ const RectangleZoomWrapper = ({
9394

9495
const timeOrigin = +new Date('2024-04-02T00:00:00');
9596
const timeScale = zoomValueToTimeScale(state.timeZoomValue);
96-
const spaceScale = [
97+
const spaceScale: SpaceScale[] = [
9798
{
98-
from: -100000,
9999
to: 100000,
100100
coefficient: zoomValueToSpaceScale(state.spaceZoomValue), // meter/px
101101
},

storybook/stories/ui-charts/trackOccupancyDiagram/rendering.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const TrackOccupancyDiagram = ({
152152
const getSpacePixel = getSpaceToPixel(spacePixelOffset, spaceScaleTree);
153153
const getPoint = getDataToPoint(getTimePixel, getSpacePixel, timeAxis, spaceAxis);
154154
const getTime = getPixelToTime(timeOrigin, timePixelOffset, timeScale);
155-
const getSpace = getPixelToSpace(spaceOrigin, spacePixelOffset, spaceScaleTree);
155+
const getSpace = getPixelToSpace(spacePixelOffset, spaceScaleTree);
156156
const getData = getPointToData(getTime, getSpace, timeAxis, spaceAxis);
157157

158158
const pickingElements: PickingElement[] = [];

ui-charts/src/spaceTimeChart/components/SpaceTimeChart.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export const SpaceTimeChart = (props: SpaceTimeChartProps) => {
115115
const getSpacePixel = getSpaceToPixel(spacePixelOffset, spaceScaleTree);
116116
const getPoint = getDataToPoint(getTimePixel, getSpacePixel, timeAxis, spaceAxis);
117117
const getTime = getPixelToTime(timeOrigin, timePixelOffset, timeScale);
118-
const getSpace = getPixelToSpace(spaceOrigin, spacePixelOffset, spaceScaleTree);
118+
const getSpace = getPixelToSpace(spacePixelOffset, spaceScaleTree);
119119
const getData = getPointToData(getTime, getSpace, timeAxis, spaceAxis);
120120

121121
const pickingElements: PickingElement[] = [];

ui-charts/src/spaceTimeChart/utils/scales.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ export function getSpaceToPixel(
182182
}
183183

184184
export function getPixelToSpace(
185-
spaceOrigin: number,
186185
pixelOffset: number,
187186
binaryTree: NormalizedScaleTree
188187
): PixelToSpace {
@@ -191,7 +190,7 @@ export function getPixelToSpace(
191190
spacePixel - pixelOffset,
192191
binaryTree
193192
);
194-
return spaceOrigin + from + (spacePixel - pixelOffset - pixelFrom) * coefficient;
193+
return from + (spacePixel - pixelOffset - pixelFrom) * coefficient;
195194
};
196195
}
197196

0 commit comments

Comments
 (0)