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

front: implement new nomenclature part 2 #5062

Merged
merged 1 commit into from
Oct 3, 2023
+162 −143
Merged

front: implement new nomenclature part 2 #5062

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
2 changes: 1 addition & 1 deletion front/src/applications/editor/Map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { withTranslation } from 'react-i18next';
import { TFunction } from 'i18next';
import { isEmpty, isEqual } from 'lodash';

import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers';
import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
import colors from 'common/Map/Consts/colors';
import 'common/Map/Map.scss';

Expand Down
6 changes: 4 additions & 2 deletions front/src/applications/operationalStudies/views/ImportTrainSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { useEffect, useState } from 'react';
import ImportTrainScheduleConfig from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig';
import ImportTrainScheduleTrainsList from 'applications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleTrainsList';
import {
ImportTrainScheduleConfig,
ImportTrainScheduleTrainsList,
} from 'modules/trainschedule/components/ImportTrainSchedule';
import Loader from 'common/Loader';
import { TrainSchedule } from 'applications/operationalStudies/types';
import { enhancedEditoastApi } from 'common/api/enhancedEditoastApi';
Expand Down
14 changes: 7 additions & 7 deletions front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';

import TrainSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainSettings';
import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
import TrainSettings from 'modules/trainschedule/components/ManageTrainSchedule/TrainSettings';
import Itinerary from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary';
import Map from 'modules/trainschedule/components/ManageTrainSchedule/Map';
import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
import PowerRestrictionsSelector from 'applications/operationalStudies/components/ManageTrainSchedule/PowerRestrictionsSelector';
import adjustConfWithTrainToModify from 'applications/operationalStudies/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
import ElectricalProfiles from 'applications/operationalStudies/components/ManageTrainSchedule/ElectricalProfiles';
import Allowances from 'applications/operationalStudies/components/ManageTrainSchedule/Allowances/Allowances';
import PowerRestrictionsSelector from 'modules/trainschedule/components/ManageTrainSchedule/PowerRestrictionsSelector';
import adjustConfWithTrainToModify from 'modules/trainschedule/components/ManageTrainSchedule/helpers/adjustConfWithTrainToModify';
import ElectricalProfiles from 'modules/trainschedule/components/ManageTrainSchedule/ElectricalProfiles';
import Allowances from 'modules/trainschedule/components/ManageTrainSchedule/Allowances/Allowances';
import {
getPathfindingID,
getRollingStockID,
Expand Down
4 changes: 2 additions & 2 deletions front/src/applications/operationalStudies/views/Scenario.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React, { useEffect, useState } from 'react';
import NavBarSNCF from 'common/BootstrapSNCF/NavBarSNCF';
import logo from 'assets/pictures/home/operationalStudies.svg';
import { useTranslation } from 'react-i18next';
import Timetable from 'applications/operationalStudies/components/Scenario/Timetable';
import Timetable from 'modules/trainschedule/components/Timetable/Timetable';
import infraLogo from 'assets/pictures/components/tracks.svg';
import { useSelector, useDispatch } from 'react-redux';
import { MODES, MANAGE_TRAIN_SCHEDULE_TYPES } from 'applications/operationalStudies/consts';
import { updateInfraID, updateMode, updateTimetableID } from 'reducers/osrdconf';
import TimetableManageTrainSchedule from 'applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule';
import TimetableManageTrainSchedule from 'modules/trainschedule/components/Timetable/TimetableManageTrainSchedule';
import BreadCrumbs from 'applications/operationalStudies/components/BreadCrumbs';
import {
getInfraID,
Expand Down
24 changes: 13 additions & 11 deletions front/src/applications/operationalStudies/views/SimulationResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,23 @@ import {
getSelectedProjection,
getSelectedTrain,
} from 'reducers/osrdsimulation/selectors';
import { updateViewport, Viewport } from 'reducers/map';
import { getTimetableID } from 'reducers/osrdconf/selectors';
import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulation/actions';

import SimulationWarpedMap from 'common/Map/WarpedMap/SimulationWarpedMap';
import SimulationResultsMap from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap';
import SpaceCurvesSlopes from 'applications/operationalStudies/components/SimulationResults/SpaceCurvesSlopes';
import SpaceTimeChartIsolated from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData';
import SpeedSpaceChart from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart';
import TimeButtons from 'applications/operationalStudies/components/SimulationResults/TimeButtons';
import TimeLine from 'applications/operationalStudies/components/SimulationResults/TimeLine/TimeLine';
import TrainDetails from 'applications/operationalStudies/components/SimulationResults/TrainDetails';

import { updateSelectedProjection, updateSimulation } from 'reducers/osrdsimulation/actions';

import SimulationResultsMap from 'modules/simulationResult/components/SimulationResultsMap';
import SpaceCurvesSlopes from 'modules/simulationResult/components/SpaceCurvesSlopes';
import SpaceTimeChartIsolated from 'modules/simulationResult/components/SpaceTimeChart/withOSRDData';
import SpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart';
import TimeButtons from 'modules/simulationResult/components/TimeButtons';
import TimeLine from 'modules/simulationResult/components/TimeLine/TimeLine';
import TrainDetails from 'modules/simulationResult/components/TrainDetails';
import getSimulationResults from 'applications/operationalStudies/components/Scenario/getSimulationResults';
import DriverTrainSchedule from 'applications/operationalStudies/components/SimulationResults/DriverTrainSchedule/DriverTrainSchedule';

import { updateViewport, Viewport } from 'reducers/map';
import DriverTrainSchedule from 'modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule';
import { getTimetableID } from 'reducers/osrdconf/selectors';
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';

const MAP_MIN_HEIGHT = 450;
Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/operationalStudies/views/Study.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import {
StudyResult,
osrdEditoastApi,
} from 'common/api/osrdEditoastApi';
import AddOrEditStudyModal from 'modules/study/components/AddOrEditStudyModal';
import BreadCrumbs from '../components/BreadCrumbs';
import AddOrEditStudyModal from '../components/Study/AddOrEditStudyModal';
import FilterTextField from '../components/FilterTextField';
import { studyStates } from '../consts';

Expand Down
2 changes: 1 addition & 1 deletion front/src/applications/referenceMap/Map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { getTerrain3DExaggeration } from 'reducers/map/selectors';
/* Main data & layers */
import Background from 'common/Map/Layers/Background';
import Terrain from 'common/Map/Layers/Terrain';
import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers';
import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
import BufferStops from 'common/Map/Layers/BufferStops';
/* Settings & Buttons */
import MapButtons from 'common/Map/Buttons/MapButtons';
Expand Down
8 changes: 4 additions & 4 deletions front/src/applications/rollingStockEditor/views/RollingStockEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ import { useDispatch } from 'react-redux';
import Loader from 'common/Loader';
import { useTranslation } from 'react-i18next';
import { LightRollingStock, osrdEditoastApi } from 'common/api/osrdEditoastApi';
import RollingStockEditorButtons from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorButtons';
import RollingStockEditorCard from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorCard';
import RollingStockEditorForm from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorForm';
import RollingStockEditorButtons from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorButtons';
import RollingStockEditorCard from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorCard';
import RollingStockEditorForm from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorForm';
import { STANDARD_COMFORT_LEVEL } from 'modules/rollingStock/consts';
import {
updateComfortLvl,
updateTractionMode,
updateElectricalProfile,
updatePowerRestriction,
} from 'reducers/rollingstockEditor';
import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
import { useModal } from 'common/BootstrapSNCF/ModalSNCF';

type RollingStockEditorProps = {
Expand Down
5 changes: 2 additions & 3 deletions front/src/applications/stdcm/views/OSRDCStdcmConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';

import { STDCM_REQUEST_STATUS } from 'applications/operationalStudies/consts';
import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
import { Itinerary, Map } from 'modules/trainschedule/components/ManageTrainSchedule';
import ScenarioExplorer from 'common/ScenarioExplorer/ScenarioExplorer';
import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
import {
Expand All @@ -19,7 +18,7 @@ import {
import { getSelectedTrain } from 'reducers/osrdsimulation/selectors';
import { RollingStockSelector } from 'modules/rollingStock/components/RollingStockSelector';
import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
import STDCMAllowances from '../../../modules/allowances/components/STDCMAllowances';
import STDCMAllowances from 'modules/stdcmAllowances/components/STDCMAllowances';
import OSRDStdcmResults from './OSRDStdcmResults';
import RunningTime from '../components/RunningTime';

Expand Down
4 changes: 2 additions & 2 deletions front/src/applications/stdcm/views/OSRDStdcmResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import SpaceTimeChart from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/withOSRDData';
import SpeedSpaceChart from 'applications/operationalStudies/components/SimulationResults/SpeedSpaceChart/SpeedSpaceChart';
import SpaceTimeChart from 'modules/simulationResult/components/SpaceTimeChart/withOSRDData';
import SpeedSpaceChart from 'modules/simulationResult/components/SpeedSpaceChart/SpeedSpaceChart';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
import { getPresentSimulation, getSelectedTrain } from 'reducers/osrdsimulation/selectors';
Expand Down
4 changes: 2 additions & 2 deletions front/src/applications/stdcm/views/StdcmRequestModal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import {
} from 'reducers/osrdsimulation/actions';
import { useDispatch, useSelector } from 'react-redux';

import { KEY_VALUES_FOR_CONSOLIDATED_SIMULATION } from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts';
import { KEY_VALUES_FOR_CONSOLIDATED_SIMULATION } from 'modules/simulationResult/components/simulationResultsConsts';
import { getConf } from 'reducers/osrdconf/selectors';
// Generic components
import ModalBodySNCF from 'common/BootstrapSNCF/ModalSNCF/ModalBodySNCF';
import ModalHeaderSNCF from 'common/BootstrapSNCF/ModalSNCF/ModalHeaderSNCF';
import PropTypes from 'prop-types';
import ReactModal from 'react-modal';
// OSRD helpers
import createTrain from 'applications/operationalStudies/components/SimulationResults/SpaceTimeChart/createTrain';
import createTrain from 'modules/simulationResult/components/SpaceTimeChart/createTrain';
import formatStdcmConf from 'applications/stdcm/formatStcmConf';
// Static Data and Assets
import { setFailure } from 'reducers/main';
Expand Down
4 changes: 2 additions & 2 deletions front/src/common/Map/WarpedMap/SimulationWarpedMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { LayerType } from 'applications/editor/tools/types';
import DataLoader from 'common/Map/WarpedMap/DataLoader';
import getWarping, { WarpingFunction } from 'common/Map/WarpedMap/getWarping';
import WarpedMap from 'common/Map/WarpedMap/WarpedMap';
import { TrainPosition } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types';
import { TrainPosition } from 'modules/simulationResult/components/SimulationResultsMap/types';
import { getInfraID } from 'reducers/osrdconf/selectors';
import { getImprovedOSRDData } from 'common/Map/WarpedMap/core/helpers';
import {
Expand All @@ -27,7 +27,7 @@ import {
} from 'reducers/osrdsimulation/selectors';
import { Train } from 'reducers/osrdsimulation/types';
import { AsyncMemoState, getAsyncMemoData, useAsyncMemo } from 'utils/useAsyncMemo';
import { getSimulationHoverPositions } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/helpers';
import { getSimulationHoverPositions } from 'modules/simulationResult/components/SimulationResultsMap/helpers';
import { clip } from 'utils/mapHelper';

import './SimulationWarpedMap.scss';
Expand Down
8 changes: 4 additions & 4 deletions front/src/common/Map/WarpedMap/WarpedMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import { LAYER_GROUPS_ORDER, LAYERS } from 'config/layerOrder';
import colors from 'common/Map/Consts/colors';
import { ALL_SIGNAL_LAYERS } from 'common/Map/Consts/SignalsNames';
import { LayerType } from 'applications/editor/tools/types';
import { TrainPosition } from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/types';
import VirtualLayers from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/VirtualLayers';
import RenderItinerary from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/RenderItinerary';
import TrainHoverPosition from 'applications/operationalStudies/components/SimulationResults/SimulationResultsMap/TrainHoverPosition';
import { TrainPosition } from 'modules/simulationResult/components/SimulationResultsMap/types';
import VirtualLayers from 'modules/simulationResult/components/SimulationResultsMap/VirtualLayers';
import RenderItinerary from 'modules/simulationResult/components/SimulationResultsMap/RenderItinerary';
import TrainHoverPosition from 'modules/simulationResult/components/SimulationResultsMap/TrainHoverPosition';
import { LayerContext } from 'common/Map/Layers/types';
import { EditorSource, SourcesDefinitionsIndex } from 'common/Map/Layers/GeoJSONs';
import OrderedLayer, { OrderedLayerProps } from 'common/Map/Layers/OrderedLayer';
Expand Down
2 changes: 1 addition & 1 deletion front/src/common/Pathfinding/Pathfinding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
getGeojson,
} from 'reducers/osrdconf/selectors';

import ModalPathJSONDetail from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail';
import ModalPathJSONDetail from 'modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalPathJSONDetail';
import infraLogo from 'assets/pictures/components/tracks.svg';
import InfraLoadingState from 'applications/operationalStudies/components/Scenario/InfraLoadingState';
import { Spinner } from '../Loader';
Expand Down
0 ...llingStockEditor/AddRollingstockParam.tsx → ...llingStockEditor/AddRollingstockParam.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...StockEditor/RollingStockEditorButtons.tsx → ...StockEditor/RollingStockEditorButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useDispatch } from 'react-redux';
import { useTranslation } from 'react-i18next';
import { setSuccess, setFailure } from 'reducers/main';
import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';

type RollingStockEditorButtonsProps = {
rollingStock: RollingStock;
Expand Down
0 ...ingStockEditor/RollingStockEditorCard.tsx → ...ingStockEditor/RollingStockEditorCard.tsx
View file
Open in desktop
File renamed without changes.
0 ...gStockEditor/RollingStockEditorCurves.tsx → ...gStockEditor/RollingStockEditorCurves.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ingStockEditor/RollingStockEditorForm.tsx → ...ingStockEditor/RollingStockEditorForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
import { useDispatch, useSelector } from 'react-redux';
import { setFailure, setSuccess } from 'reducers/main';
import Tabs, { TabProps } from 'common/Tabs';
import RollingStockEditorFormModal from 'modules/rollingStock/components/rollingStockEditor/RollingStockEditorFormModal';
import RollingStockEditorFormModal from 'modules/rollingStock/components/RollingStockEditor/RollingStockEditorFormModal';
import getRollingStockEditorDefaultValues, {
getDefaultRollingStockMode,
rollingStockEditorQueryArg,
Expand Down
0 ...kEditor/RollingStockEditorFormHelpers.tsx → ...kEditor/RollingStockEditorFormHelpers.tsx
View file
Open in desktop
File renamed without changes.
0 ...ockEditor/RollingStockEditorFormModal.tsx → ...ockEditor/RollingStockEditorFormModal.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ationResults/ChartHelpers/ChartHelpers.ts → ...t/components/ChartHelpers/ChartHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
Stop,
SimulationD3Scale,
} from 'reducers/osrdsimulation/types';
import { TIME } from '../simulationResultsConsts';
import { TIME } from 'modules/simulationResult/components/simulationResultsConsts';

export function sec2d3datetime(time: number) {
return d3.timeParse('%H:%M:%S')(sec2time(time));
Expand Down
6 changes: 3 additions & 3 deletions ...artHelpers/__tests__/ChartHelpers.spec.ts → ...artHelpers/__tests__/ChartHelpers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { SimulationTrain } from 'reducers/osrdsimulation/types';
import { LIST_VALUES_NAME_SPACE_TIME } from 'modules/simulationResult/components/simulationResultsConsts';
import {
mergeDatasArea,
interpolateOnTime,
trainWithDepartureAndArrivalTimes,
} from '../ChartHelpers';
import { LIST_VALUES_NAME_SPACE_TIME } from '../../simulationResultsConsts';

import train from '../../../../../../../tests/assets/operationStudies/trainExample';
import simulationTrain from '../../../../../../../tests/assets/operationStudies/simulationTrain';
import train from '../../../../../../tests/assets/operationStudies/trainExample';
import simulationTrain from '../../../../../../tests/assets/operationStudies/simulationTrain';

describe('mergeDatasArea', () => {
test('avoid crash', () => {
Expand Down
8 changes: 2 additions & 6 deletions ...lationResults/ChartHelpers/defineChart.ts → ...lt/components/ChartHelpers/defineChart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import * as d3 from 'd3';
import { select as d3select } from 'd3-selection';
import {
gridX,
gridY,
isGET,
} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers';
import { gridX, gridY, isGET } from 'modules/simulationResult/components/ChartHelpers/ChartHelpers';
import nextId from 'react-id-generator';
import svgDefs from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/svgDefs';
import svgDefs from 'modules/simulationResult/components/ChartHelpers/svgDefs';
import { Chart, SimulationD3Scale } from 'reducers/osrdsimulation/types';

// keyValues ['position', 'gradient']
Expand Down
2 changes: 1 addition & 1 deletion ...imulationResults/ChartHelpers/drawArea.ts → ...esult/components/ChartHelpers/drawArea.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as d3 from 'd3';
import { isEmpty } from 'lodash';
import { Chart } from 'reducers/osrdsimulation/types';
import { AreaBlock } from '../SpeedSpaceChart/prepareData';
import { AreaBlock } from 'modules/simulationResult/components/SpeedSpaceChart/prepareData';

/**
* Draw area for the SpeedSpaceChart or the SpaceCurvesSlopesChart
Expand Down
0 ...ulationResults/ChartHelpers/drawCurve.jsx → ...ult/components/ChartHelpers/drawCurve.jsx
View file
Open in desktop
File renamed without changes.
0 ...ts/ChartHelpers/drawElectricalProfile.jsx → ...ts/ChartHelpers/drawElectricalProfile.jsx
View file
Open in desktop
File renamed without changes.
0 ...ionResults/ChartHelpers/drawGuideLines.ts → ...components/ChartHelpers/drawGuideLines.ts
View file
Open in desktop
File renamed without changes.
0 ...lts/ChartHelpers/drawPowerRestriction.jsx → ...nts/ChartHelpers/drawPowerRestriction.jsx
View file
Open in desktop
File renamed without changes.
0 ...imulationResults/ChartHelpers/drawRect.ts → ...esult/components/ChartHelpers/drawRect.ts
View file
Open in desktop
File renamed without changes.
0 ...imulationResults/ChartHelpers/drawText.ts → ...esult/components/ChartHelpers/drawText.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ults/ChartHelpers/enableInteractivity.jsx → ...ents/ChartHelpers/enableInteractivity.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
interpolateOnPosition,
interpolateOnTime,
isGET,
} from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/ChartHelpers';
} from 'modules/simulationResult/components/ChartHelpers/ChartHelpers';
import {
updateContextMenu,
updateMustRedraw,
Expand All @@ -18,8 +18,8 @@ import { datetime2sec, sec2datetime } from 'utils/timeManipulation';
import {
LIST_VALUES_NAME_SPACE_TIME,
LIST_VALUES_NAME_SPEED_SPACE,
} from 'applications/operationalStudies/components/SimulationResults/simulationResultsConsts';
import drawGuideLines from 'applications/operationalStudies/components/SimulationResults/ChartHelpers/drawGuideLines';
} from 'modules/simulationResult/components/simulationResultsConsts';
import drawGuideLines from 'modules/simulationResult/components/ChartHelpers/drawGuideLines';
import { store } from 'Store';

export const displayGuide = (chart, opacity) => {
Expand Down
0 ...imulationResults/ChartHelpers/svgDefs.jsx → ...esult/components/ChartHelpers/svgDefs.jsx
View file
Open in desktop
File renamed without changes.
0 ...mulationResults/ChartModal/ChartModal.jsx → ...sult/components/ChartModal/ChartModal.jsx
View file
Open in desktop
File renamed without changes.
0 ...ts/SimulationResults/ChartModal/index.jsx → ...ionResult/components/ChartModal/index.jsx
View file
Open in desktop
File renamed without changes.
0 ...ponents/SimulationResults/ContextMenu.jsx → ...mulationResult/components/ContextMenu.jsx
View file
Open in desktop
File renamed without changes.
Loading