Skip to content
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

ui-manchette: fix space-time-chart proportional scale #398

Merged
merged 1 commit into from
Aug 29, 2024
Merged

ui-manchette: fix space-time-chart proportional scale #398

Show file tree
Hide file tree
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
17 changes: 5 additions & 12 deletions ui-manchette/src/components/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,13 @@ import type {
SpaceTimeChartProps,
} from '@osrd-project/ui-spacetimechart/dist/lib/types';

import {
BASE_OP_HEIGHT,
FOOTER_HEIGHT,
OP_LINE_HEIGHT,
MAX_TIME_WINDOW,
MAX_ZOOM_X,
MIN_ZOOM_X,
} from './consts';
import { BASE_OP_HEIGHT, MAX_TIME_WINDOW, MAX_ZOOM_X, MIN_ZOOM_X } from './consts';
import type {
OperationalPointType,
ProjectPathTrainResult,
StyledOperationalPointType,
} from '../types';
import { getHeightWithoutFooter, msToS } from '../utils';
import { getHeightWithoutLastWaypoint, msToS } from '../utils';

export const calcOperationalPointsToDisplay = (
operationalPoints: OperationalPointType[],
Expand All @@ -34,7 +27,7 @@ export const calcOperationalPointsToDisplay = (
const from = operationalPoints.at(0)!.position;
const to = operationalPoints.at(-1)!.position;
const totalDistance = to - from;
const heightWithoutFinalOp = getHeightWithoutFooter(height) - BASE_OP_HEIGHT;
const heightWithoutFinalOp = getHeightWithoutLastWaypoint(height);
let lastDisplayedOP = result[0];

// We iterate through all points, and only add them if they don't collide
Expand Down Expand Up @@ -81,7 +74,7 @@ export const operationalPointsHeight = (
const from = operationalPoints.at(0)!.position;
const to = operationalPoints.at(-1)!.position;
const totalDistance = to - from;
const heightWithoutFinalOp = getHeightWithoutFooter(height) - BASE_OP_HEIGHT;
const heightWithoutFinalOp = getHeightWithoutLastWaypoint(height);

return operationalPoints.map((op, index) => {
const nextOp = operationalPoints.at(index + 1);
Expand Down Expand Up @@ -144,7 +137,7 @@ export const getScales = (
const to = ops.at(-1)!.position;

const totalDistance = to - from;
const heightWithoutFinalOp = height - FOOTER_HEIGHT - OP_LINE_HEIGHT / 2;
const heightWithoutFinalOp = getHeightWithoutLastWaypoint(height);

const scaleCoeff = isProportional
? { coefficient: totalDistance / heightWithoutFinalOp / zoomY }
Expand Down
5 changes: 3 additions & 2 deletions ui-manchette/src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { FOOTER_HEIGHT } from '../components/consts';
import { BASE_OP_HEIGHT, FOOTER_HEIGHT } from '../components/consts';

export const getHeightWithoutFooter = (height: number) => height - FOOTER_HEIGHT;
export const getHeightWithoutLastWaypoint = (height: number) =>
height - FOOTER_HEIGHT - BASE_OP_HEIGHT;

export const positionMmToKm = (position: number) => Math.round((position / 1000000) * 10) / 10;

Expand Down
Loading