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

Jump to bottom

front: fix longitudinal curve in op studies #5767

Merged
merged 1 commit into from
Jan 5, 2024
Merged

front: fix longitudinal curve in op studies #5767

merged 1 commit into from
Jan 5, 2024

Conversation

RomainValls
Copy link
Contributor

Add one additional Y axis on the right of the chart
Red curve (speed slopes) now stays in the frame

closes #4312

@RomainValls RomainValls requested a review from a team as a code owner November 21, 2023 10:55
alexandredamiron
alexandredamiron previously requested changes Nov 21, 2023
View reviewed changes
Copy link
Contributor

@alexandredamiron alexandredamiron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this request. I am not sure about the whole duplication of behavior logic. Could you expand the capabilities of defineChart and drawCurve instead ?

front/src/modules/simulationResult/components/ChartHelpers/defineChartDoubleY.tsx Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/SpaceCurvesSlopes.tsx Outdated Show resolved Hide resolved
@RomainValls RomainValls self-assigned this Nov 22, 2023
@RomainValls RomainValls force-pushed the rvs/front-fix-longitudinal-curve-in-op-studies branch from 03ce570 to 449962f Compare November 29, 2023 10:02
@codecov Codecov
Copy link

codecov bot commented Nov 29, 2023 •
edited
Loading

Codecov Report

Attention: 227 lines in your changes are missing coverage. Please review.

Comparison is base (53f282c) 27.63% compared to head (8e12a5f) 27.64%.
Report is 1 commits behind head on dev.

Files Patch % Lines
...lt/components/ChartHelpers/enableInteractivity.tsx 0.00% 42 Missing ⚠️
...tionResult/components/SpeedSpaceChart/d3Helpers.ts 0.00% 34 Missing ⚠️
.../simulationResult/components/SpaceCurvesSlopes.tsx 0.00% 31 Missing ⚠️
...ationResult/components/ChartHelpers/defineChart.ts 0.00% 30 Missing ⚠️
...t/components/ChartHelpers/drawElectricalProfile.ts 0.00% 28 Missing ⚠️
...lt/components/ChartHelpers/drawPowerRestriction.ts 0.00% 14 Missing ⚠️
...ulationResult/components/ChartHelpers/drawCurve.ts 0.00% 10 Missing ⚠️
...ult/components/SpeedSpaceChart/SpeedSpaceChart.tsx 0.00% 9 Missing ⚠️
...ionResult/components/SpeedSpaceChart/sampleData.ts 0.00% 9 Missing ⚠️
...tionResult/components/ChartHelpers/ChartHelpers.ts 50.00% 5 Missing and 2 partials ⚠️
... and 3 more
Additional details and impacted files 
@@            Coverage Diff            @@
##                dev    #5767   +/-   ##
=========================================
  Coverage     27.63%   27.64%           
  Complexity     2136     2136           
=========================================
  Files           990      990           
  Lines        125811   125843   +32     
  Branches       2575     2575           
=========================================
+ Hits          34771    34784   +13     
- Misses        89550    89569   +19     
  Partials       1490     1490
Flag Coverage Δ
core 78.88% <ø> (ø)
editoast 75.46% <ø> (-0.01%) ⬇️
front 8.70% <5.80%> (+0.01%) ⬆️
gateway 2.50% <ø> (ø)
railjson_generator 87.43% <ø> (ø)
tests 81.77% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Yohh
Yohh requested changes Nov 29, 2023
View reviewed changes
Copy link
Contributor

@Yohh Yohh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very nice work!

one small issue:
curves start jump to zero when draging speedSpaceChart or slopesChart, maybe should you look to enableInteractivity

front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts Outdated Show resolved Hide resolved
@RomainValls RomainValls force-pushed the rvs/front-fix-longitudinal-curve-in-op-studies branch 2 times, most recently from dc2f281 to 93ea6a2 Compare December 6, 2023 09:13
@Yohh Yohh force-pushed the rvs/front-fix-longitudinal-curve-in-op-studies branch from da219c6 to ced9dde Compare December 6, 2023 22:30
@RomainValls RomainValls force-pushed the rvs/front-fix-longitudinal-curve-in-op-studies branch from ced9dde to 2e1f388 Compare December 7, 2023 09:06
@RomainValls RomainValls requested a review from Math-R December 7, 2023 10:34
clarani
clarani requested changes Dec 8, 2023
View reviewed changes
Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there, great work !! 🎉 I left some comments

Thanks for the comments on enableInteractivity, it's super clear now :)

front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/drawCurve.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/drawCurve.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/SpeedSpaceChart/d3Helpers.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/simulationResultsConsts.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.tsx Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.tsx Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/enableInteractivity.tsx Outdated Show resolved Hide resolved
clarani
clarani reviewed Dec 19, 2023
View reviewed changes
Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left 4 small comments, and 2 previous comments are still not resolved :)

front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ChartHelpers/defineChart.ts Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart.tsx Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/SpaceTimeChart/SpaceTimeChart.tsx Outdated Show resolved Hide resolved
@RomainValls RomainValls force-pushed the rvs/front-fix-longitudinal-curve-in-op-studies branch from 7ccf6fd to 1f865c7 Compare December 20, 2023 16:31
clarani
clarani approved these changes Dec 20, 2023
View reviewed changes
Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and tested !! ✅ Very nice PR ✅

@RomainValls RomainValls requested review from alexandredamiron and removed request for alexandredamiron December 20, 2023 16:42
@RomainValls RomainValls dismissed alexandredamiron’s stale review January 5, 2024 12:53

already reviewed by maintainer

@RomainValls
front: fix longitudinal curve and remove rotate in speedSpaceChart
8e12a5f 
- add second Y axis to gev
- modify enableInteractivity for new Y axis
- comment enableInteractivity
@RomainValls RomainValls force-pushed the rvs/front-fix-longitudinal-curve-in-op-studies branch from 1f865c7 to 8e12a5f Compare January 5, 2024 14:02
@RomainValls RomainValls added this pull request to the merge queue Jan 5, 2024
Merged via the queue into dev with commit c0a3242 Jan 5, 2024
20 checks passed
@RomainValls RomainValls deleted the rvs/front-fix-longitudinal-curve-in-op-studies branch January 5, 2024 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@clarani clarani clarani approved these changes

@Yohh Yohh Yohh approved these changes

@SarahBellaha SarahBellaha Awaiting requested review from SarahBellaha

@Math-R Math-R Awaiting requested review from Math-R

@alexandredamiron alexandredamiron Awaiting requested review from alexandredamiron

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

longitudinal section get out of frame
4 participants
@RomainValls @alexandredamiron @Yohh @clarani