Skip to content

Unify voltage ranges #3435

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Unify voltage ranges #3435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8be5b51
first commit
carojeandat Oct 29, 2025
03c24b0
add color to base voltages constant
carojeandat Oct 30, 2025
436e68c
unify colors declaration
carojeandat Nov 4, 2025
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
10 changes: 10 additions & 0 deletions src/components/grid-layout/hooks/use-diagram-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import { useSnackMessage } from '@gridsuite/commons-ui';
import { NodeType } from 'components/graph/tree-node.type';
import { isThereTooManyOpenedNadDiagrams, mergePositions } from '../cards/diagrams/diagram-utils';
import { DiagramMetadata } from '@powsybl/network-viewer';
import { getBaseVoltagesConfigInfos } from 'utils/constants';

type UseDiagramModelProps = {
diagramTypes: DiagramType[];
Expand Down Expand Up @@ -304,13 +305,22 @@ export const useDiagramModel = ({ diagramTypes, onAddDiagram, onDiagramAlreadyEx
positions: diagram.positions,
nadPositionsGenerationMode:
networkVisuParams.networkAreaDiagramParameters.nadPositionsGenerationMode,
baseVoltagesConfigInfos: getBaseVoltagesConfigInfos(),
};
fetchOptions = {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(nadRequestInfos),
};
}
if (diagram.type === DiagramType.SUBSTATION || diagram.type === DiagramType.VOLTAGE_LEVEL) {
const sldRequestInfos = { baseVoltagesConfigInfos: getBaseVoltagesConfigInfos() };
fetchOptions = {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(sldRequestInfos),
};
}

setLoadingDiagrams((loadingDiagrams) => {
if (loadingDiagrams.includes(diagram.diagramUuid)) {
Expand Down
19 changes: 0 additions & 19 deletions src/components/network/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,22 +210,3 @@ export const REGULATING_TERMINAL_TYPES = [
export const NUMBER = 'number';
export const ENUM = 'enum';
export const BOOLEAN = 'boolean';

export interface VoltageLevelInterval {
name: string;
vlValue: number;
minValue: number;
maxValue: number;
}

export const BASE_VOLTAGES: VoltageLevelInterval[] = [
{ name: 'vl300to500', vlValue: 400, minValue: 300, maxValue: Infinity },
{ name: 'vl180to300', vlValue: 225, minValue: 180, maxValue: 300 },
{ name: 'vl120to180', vlValue: 150, minValue: 120, maxValue: 180 },
{ name: 'vl70to120', vlValue: 90, minValue: 70, maxValue: 120 },
{ name: 'vl50to70', vlValue: 63, minValue: 50, maxValue: 70 },
{ name: 'vl30to50', vlValue: 45, minValue: 30, maxValue: 50 },
{ name: 'vl0to30', vlValue: 20, minValue: 0, maxValue: 30 },
];

export const MAX_VOLTAGE = 500;
12 changes: 8 additions & 4 deletions src/components/network/nominal-voltage-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
import { Button, Checkbox, List, ListItem, ListItemButton, ListItemText, Paper, Tooltip } from '@mui/material';
import { FormattedMessage } from 'react-intl';
import { type MuiStyles } from '@gridsuite/commons-ui';
import { BASE_VOLTAGES, MAX_VOLTAGE, VoltageLevelInterval } from './constants';
import { getNominalVoltageIntervalName } from './utils/nominal-voltage-filter-utils';
import {
BASE_VOLTAGES,
MAX_VOLTAGE,
VoltageLevelInterval,
getNominalVoltageIntervalNameByVoltageValue,
} from 'utils/constants';

const styles = {
nominalVoltageZone: {
Expand Down Expand Up @@ -62,7 +66,7 @@ export default function NominalVoltageFilter({
useEffect(() => {
const newIntervals = BASE_VOLTAGES.map((interval) => {
const vlListValues = nominalVoltages.filter(
(vnom) => getNominalVoltageIntervalName(vnom) === interval.name
(vnom) => getNominalVoltageIntervalNameByVoltageValue(vnom) === interval.name
);
return { ...interval, vlListValues, isChecked: true };
});
Expand Down Expand Up @@ -134,7 +138,7 @@ export default function NominalVoltageFilter({
<ListItemText
sx={styles.nominalVoltageText}
disableTypography
primary={`${interval.vlValue} kV`}
primary={interval.label}
></ListItemText>
</ListItemButton>
</Tooltip>
Expand Down
15 changes: 0 additions & 15 deletions src/components/network/utils/nominal-voltage-filter-utils.tsx
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/services/study/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export function getVoltageLevelSingleLineDiagram({
if (componentLibrary !== null) {
queryParams.append('componentLibrary', String(componentLibrary));
}
//baseVoltagesConfig
return (
getStudyUrlWithNodeUuidAndRootNetworkUuid(studyUuid, currentNodeUuid, currentRootNetworkUuid) +
'/network/voltage-levels/' +
Expand Down Expand Up @@ -236,6 +237,7 @@ export function getSubstationSingleLineDiagram({
if (componentLibrary !== null) {
queryParams.append('componentLibrary', String(componentLibrary));
}
//baseVoltagesConfig
return (
getStudyUrlWithNodeUuidAndRootNetworkUuid(studyUuid, currentNodeUuid, currentRootNetworkUuid) +
'/network/substations/' +
Expand Down
214 changes: 4 additions & 210 deletions src/styles/dark-theme-css-vars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { DARK_THEME } from '@gridsuite/commons-ui';
import { cssColors } from 'utils/colors';

export const darkThemeCssVars = {
'.nad-edge-infos text': {
stroke: '#292e33', // Border outside of the displayed values on lines. Same color as the background.
Expand All @@ -18,214 +21,5 @@ export const darkThemeCssVars = {
'.nad-textnode-highlight': {
backgroundColor: '#32373bd9', // same displayed color as #6c6c6c20 but with 0.85 opacity
},
'.sld-vl0to30, .nad-vl0to30': {
'--vl-color': '#CCC93A',
},
'.sld-vl0to30.sld-bus-1, .nad-vl0to30.nad-bus-1': {
'--vl-color': '#5E835C',
},
'.sld-vl0to30.sld-bus-2, .nad-vl0to30.nad-bus-2': {
'--vl-color': '#B1B46C',
},
'.sld-vl0to30.sld-bus-3, .nad-vl0to30.nad-bus-3': {
'--vl-color': '#A156AA',
},
'.sld-vl0to30.sld-bus-4, .nad-vl0to30.nad-bus-4': {
'--vl-color': '#CB3DDD',
},
'.sld-vl0to30.sld-bus-5, .nad-vl0to30.nad-bus-5': {
'--vl-color': '#AC8AC2',
},
'.sld-vl0to30.sld-bus-6, .nad-vl0to30.nad-bus-6': {
'--vl-color': '#734097',
},
'.sld-vl0to30.sld-bus-7, .nad-vl0to30.nad-bus-7': {
'--vl-color': '#BCADCC',
},
'.sld-vl0to30.sld-bus-8, .nad-vl0to30.nad-bus-8': {
'--vl-color': '#A246E0',
},
'.sld-vl0to30.sld-bus-9, .nad-vl0to30.nad-bus-9': {
'--vl-color': '#C38CEB',
},
'.sld-vl30to50, .nad-vl30to50': {
'--vl-color': '#EA8E9B',
},
'.sld-vl30to50.sld-bus-1, .nad-vl30to50.nad-bus-1': {
'--vl-color': '#A43857',
},
'.sld-vl30to50.sld-bus-2, .nad-vl30to50.nad-bus-2': {
'--vl-color': '#CEAAB0',
},
'.sld-vl30to50.sld-bus-3, .nad-vl30to50.nad-bus-3': {
'--vl-color': '#459C63',
},
'.sld-vl30to50.sld-bus-4, .nad-vl30to50.nad-bus-4': {
'--vl-color': '#00E266',
},
'.sld-vl30to50.sld-bus-5, .nad-vl30to50.nad-bus-5': {
'--vl-color': '#A7B368',
},
'.sld-vl30to50.sld-bus-6, .nad-vl30to50.nad-bus-6': {
'--vl-color': '#3F7340',
},
'.sld-vl30to50.sld-bus-7, .nad-vl30to50.nad-bus-7': {
'--vl-color': '#C2CB92',
},
'.sld-vl30to50.sld-bus-8, .nad-vl30to50.nad-bus-8': {
'--vl-color': '#218B21',
},
'.sld-vl30to50.sld-bus-9, .nad-vl30to50.nad-bus-9': {
'--vl-color': '#58D058',
},
'.sld-vl50to70, .nad-vl50to70': {
'--vl-color': '#D47DFF',
},
'.sld-vl50to70.sld-bus-1, .nad-vl50to70.nad-bus-1': {
'--vl-color': '#C230D2',
},
'.sld-vl50to70.sld-bus-2, .nad-vl50to70.nad-bus-2': {
'--vl-color': '#AB94BF',
},
'.sld-vl50to70.sld-bus-3, .nad-vl50to70.nad-bus-3': {
'--vl-color': '#1F7620',
},
'.sld-vl50to70.sld-bus-4, .nad-vl50to70.nad-bus-4': {
'--vl-color': '#C5ED3B',
},
'.sld-vl50to70.sld-bus-5, .nad-vl50to70.nad-bus-5': {
'--vl-color': '#A7B368',
},
'.sld-vl50to70.sld-bus-6, .nad-vl50to70.nad-bus-6': {
'--vl-color': '#697046',
},
'.sld-vl50to70.sld-bus-7, .nad-vl50to70.nad-bus-7': {
'--vl-color': '#E1E444',
},
'.sld-vl50to70.sld-bus-8, .nad-vl50to70.nad-bus-8': {
'--vl-color': '#AAAE50',
},
'.sld-vl50to70.sld-bus-9, .nad-vl50to70.nad-bus-9': {
'--vl-color': '#D4D486',
},
'.sld-vl70to120, .nad-vl70to120': {
'--vl-color': '#FF6100',
},
'.sld-vl70to120.sld-bus-1, .nad-vl70to120.nad-bus-1': {
'--vl-color': '#B27153',
},
'.sld-vl70to120.sld-bus-2, .nad-vl70to120.nad-bus-2': {
'--vl-color': '#C6A68B',
},
'.sld-vl70to120.sld-bus-3, .nad-vl70to120.nad-bus-3': {
'--vl-color': '#25699D',
},
'.sld-vl70to120.sld-bus-4, .nad-vl70to120.nad-bus-4': {
'--vl-color': '#0057F9',
},
'.sld-vl70to120.sld-bus-5, .nad-vl70to120.nad-bus-5': {
'--vl-color': '#74AFEA',
},
'.sld-vl70to120.sld-bus-6, .nad-vl70to120.nad-bus-6': {
'--vl-color': '#44679C',
},
'.sld-vl70to120.sld-bus-7, .nad-vl70to120.nad-bus-7': {
'--vl-color': '#458BE8',
},
'.sld-vl70to120.sld-bus-8, .nad-vl70to120.nad-bus-8': {
'--vl-color': '#2862AE',
},
'.sld-vl70to120.sld-bus-9, .nad-vl70to120.nad-bus-9': {
'--vl-color': '#B0D4FE',
},
'.sld-vl120to180, .nad-vl120to180': {
'--vl-color': '#29AFB0',
},
'.sld-vl120to180.sld-bus-1, .nad-vl120to180.nad-bus-1': {
'--vl-color': '#336B6F',
},
'.sld-vl120to180.sld-bus-2, .nad-vl120to180.nad-bus-2': {
'--vl-color': '#84C6CC',
},
'.sld-vl120to180.sld-bus-3, .nad-vl120to180.nad-bus-3': {
'--vl-color': '#BA133C',
},
'.sld-vl120to180.sld-bus-4, .nad-vl120to180.nad-bus-4': {
'--vl-color': '#FF8290',
},
'.sld-vl120to180.sld-bus-5, .nad-vl120to180.nad-bus-5': {
'--vl-color': '#DAA8AD',
},
'.sld-vl120to180.sld-bus-6, .nad-vl120to180.nad-bus-6': {
'--vl-color': '#97353A',
},
'.sld-vl120to180.sld-bus-7, .nad-vl120to180.nad-bus-7': {
'--vl-color': '#EABCBD',
},
'.sld-vl120to180.sld-bus-8, .nad-vl120to180.nad-bus-8': {
'--vl-color': '#EA2E33',
},
'.sld-vl120to180.sld-bus-9, .nad-vl120to180.nad-bus-9': {
'--vl-color': '#EA6E72',
},
'.sld-vl180to300, .nad-vl180to300': {
'--vl-color': '#00FF50',
},
'.sld-vl180to300.sld-bus-1, .nad-vl180to300.nad-bus-1': {
'--vl-color': '#42954B',
},
'.sld-vl180to300.sld-bus-2, .nad-vl180to300.nad-bus-2': {
'--vl-color': '#A7B27E',
},
'.sld-vl180to300.sld-bus-3, .nad-vl180to300.nad-bus-3': {
'--vl-color': '#F57F17',
},
'.sld-vl180to300.sld-bus-4, .nad-vl180to300.nad-bus-4': {
'--vl-color': '#A3715C',
},
'.sld-vl180to300.sld-bus-5, .nad-vl180to300.nad-bus-5': {
'--vl-color': '#DBAB9D',
},
'.sld-vl180to300.sld-bus-6, .nad-vl180to300.nad-bus-6': {
'--vl-color': '#885239',
},
'.sld-vl180to300.sld-bus-7, .nad-vl180to300.nad-bus-7': {
'--vl-color': '#B39572',
},
'.sld-vl180to300.sld-bus-8, .nad-vl180to300.nad-bus-8': {
'--vl-color': '#C94119',
},
'.sld-vl180to300.sld-bus-9, .nad-vl180to300.nad-bus-9': {
'--vl-color': '#EABC45',
},
'.sld-vl300to500, .nad-vl300to500': {
'--vl-color': '#FF0007',
},
'.sld-vl300to500.sld-bus-1, .nad-vl300to500.nad-bus-1': {
'--vl-color': '#DD6484',
},
'.sld-vl300to500.sld-bus-2, .nad-vl300to500.nad-bus-2': {
'--vl-color': '#FFBCBE',
},
'.sld-vl300to500.sld-bus-3, .nad-vl300to500.nad-bus-3': {
'--vl-color': '#25699D',
},
'.sld-vl300to500.sld-bus-4, .nad-vl300to500.nad-bus-4': {
'--vl-color': '#0057F9',
},
'.sld-vl300to500.sld-bus-5, .nad-vl300to500.nad-bus-5': {
'--vl-color': '#74AFEA',
},
'.sld-vl300to500.sld-bus-6, .nad-vl300to500.nad-bus-6': {
'--vl-color': '#44679C',
},
'.sld-vl300to500.sld-bus-7, .nad-vl300to500.nad-bus-7': {
'--vl-color': '#458BE8',
},
'.sld-vl300to500.sld-bus-8, .nad-vl300to500.nad-bus-8': {
'--vl-color': '#2862AE',
},
'.sld-vl300to500.sld-bus-9, .nad-vl300to500.nad-bus-9': {
'--vl-color': '#B0D4FE',
},
...cssColors(DARK_THEME),
};
Loading
Loading