Skip to content

Commit 905fecd

Browse files
quinarygioquinarygio
committed
Fixes after review
Signed-off-by: Giovanni Ferrari <giovanni.ferrari@soft.it>
1 parent f9fe1db commit 905fecd

3 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/styles/AbstractVoltageStyleProvider.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected AbstractVoltageStyleProvider(BaseVoltagesConfig baseVoltagesConfig) {
4747
public List<String> getEdgeStyles(Graph graph, Edge edge) {
4848
List<String> edgesStyles = new ArrayList<>();
4949
edgesStyles.add(WIRE_STYLE_CLASS);
50-
edgesStyles.addAll(getVoltageLevelEdgeStyle(graph, edge));
50+
edgesStyles.addAll(getVoltageLevelEdgeStyles(graph, edge));
5151
getDanglingLineStyle(edge).ifPresent(edgesStyles::add);
5252
return edgesStyles;
5353
}
@@ -73,15 +73,15 @@ private Optional<String> getDanglingLineStyle(FeederNode n) {
7373
return Optional.empty();
7474
}
7575

76-
protected List<String> getVoltageLevelEdgeStyle(Graph graph, Edge edge) {
76+
protected List<String> getVoltageLevelEdgeStyles(Graph graph, Edge edge) {
7777
VoltageLevelInfos vLevelInfos;
7878
Node nodeForStyle = isNodeSeparatingStyles(edge.getNode1()) ? edge.getNode2() : edge.getNode1();
7979
if (nodeForStyle instanceof FeederNode && ((FeederNode) nodeForStyle).getFeeder() instanceof FeederTwLeg) {
8080
vLevelInfos = ((FeederTwLeg) ((FeederNode) nodeForStyle).getFeeder()).getVoltageLevelInfos();
8181
} else {
8282
vLevelInfos = graph.getVoltageLevelInfos(nodeForStyle);
8383
}
84-
return getVoltageLevelNodeStyle(vLevelInfos, nodeForStyle);
84+
return getNodeStyles(vLevelInfos, nodeForStyle);
8585
}
8686

8787
@Override
@@ -92,7 +92,7 @@ public List<String> getNodeStyles(VoltageLevelGraph graph, Node node, ComponentL
9292
// Some nodes have two styles as they separate voltage levels for instance
9393
// Then they have a style depending on their subcomponents (-> see getSvgNodeSubcomponentStyles)
9494
// Note that nodes outside a voltageLevel graph (graph==null) are nodes with two styles
95-
styles.addAll(getVoltageLevelNodeStyle(graph.getVoltageLevelInfos(), node));
95+
styles.addAll(getNodeStyles(graph.getVoltageLevelInfos(), node));
9696
}
9797

9898
return styles;
@@ -113,14 +113,14 @@ public List<String> getNodeSubcomponentStyles(Graph graph, Node node, String sub
113113
Feeder feeder = ((FeederNode) node).getFeeder();
114114
if (feeder instanceof FeederWithSides) {
115115
VoltageLevelInfos vlInfo = getSubComponentVoltageLevelInfos((FeederWithSides) feeder, subComponentName);
116-
styles.addAll(getVoltageLevelNodeStyle(vlInfo, node));
116+
styles.addAll(getNodeStyles(vlInfo, node));
117117
}
118118
} else if (node instanceof Middle3WTNode) {
119119
VoltageLevelInfos vlInfo = getSubComponentVoltageLevelInfos((Middle3WTNode) node, subComponentName);
120-
styles.addAll(getVoltageLevelNodeStyle(vlInfo, node));
120+
styles.addAll(getNodeStyles(vlInfo, node));
121121
} else {
122122
VoltageLevelInfos vlInfo = graph.getVoltageLevelInfos(node);
123-
styles.addAll(getVoltageLevelNodeStyle(vlInfo, node, getSide(subComponentName)));
123+
styles.addAll(getNodeStyles(vlInfo, node, getSide(subComponentName)));
124124
}
125125
}
126126
} else {
@@ -132,23 +132,23 @@ public List<String> getNodeSubcomponentStyles(Graph graph, Node node, String sub
132132
feederNode = getFeederNode((Middle3WTNode) node, subComponentName);
133133
}
134134
if (feederNode != null) {
135-
styles.addAll(getVoltageLevelNodeStyle(graph.getVoltageLevelInfos(feederNode), feederNode));
135+
styles.addAll(getNodeStyles(graph.getVoltageLevelInfos(feederNode), feederNode));
136136
}
137137
}
138138

139139
return styles;
140140
}
141141

142142
/**
143-
* Returns the voltage level style if any to apply to the given node
143+
* Returns the list of styles to apply to the given node
144144
*
145145
* @param vlInfo the VoltageLevelInfos related to the given node
146146
* @param node the node on which the style if any is applied to
147-
* @return the voltage level style if any
147+
* @return the list of node styles
148148
*/
149-
public abstract List<String> getVoltageLevelNodeStyle(VoltageLevelInfos vlInfo, Node node);
149+
public abstract List<String> getNodeStyles(VoltageLevelInfos vlInfo, Node node);
150150

151-
public abstract List<String> getVoltageLevelNodeStyle(VoltageLevelInfos vlInfo, Node node, NodeSide side);
151+
public abstract List<String> getNodeStyles(VoltageLevelInfos vlInfo, Node node, NodeSide side);
152152

153153
private Node getFeederNode(Middle3WTNode node, String subComponentName) {
154154
switch (subComponentName) {

‎single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/styles/NominalVoltageStyleProvider.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ protected boolean isNodeSeparatingStyles(Node node) {
4848
}
4949

5050
@Override
51-
public List<String> getVoltageLevelNodeStyle(VoltageLevelInfos vlInfo, Node node) {
51+
public List<String> getNodeStyles(VoltageLevelInfos vlInfo, Node node) {
5252
return baseVoltagesConfig.getBaseVoltageName(vlInfo.getNominalVoltage(), BASE_VOLTAGE_PROFILE)
5353
.map(bvName -> List.of(StyleClassConstants.STYLE_PREFIX + bvName))
5454
.orElse(Collections.emptyList());
5555
}
5656

5757
@Override
58-
public List<String> getVoltageLevelNodeStyle(VoltageLevelInfos vlInfo, Node node, NodeSide side) {
59-
return getVoltageLevelNodeStyle(vlInfo, node);
58+
public List<String> getNodeStyles(VoltageLevelInfos vlInfo, Node node, NodeSide side) {
59+
return getNodeStyles(vlInfo, node);
6060
}
6161

6262
@Override
6363
public List<String> getBusStyles(String busId, VoltageLevelGraph graph) {
64-
return Optional.ofNullable(getVoltageLevelNodeStyle(graph.getVoltageLevelInfos(), null))
64+
return Optional.ofNullable(getNodeStyles(graph.getVoltageLevelInfos(), null))
6565
.map(busStyles -> {
6666
List<String> styles = new ArrayList<>(busStyles);
6767
styles.add(NODE_INFOS);

‎single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/styles/iidm/TopologicalStyleProvider.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ public TopologicalStyleProvider(BaseVoltagesConfig baseVoltagesConfig, Network n
5252
}
5353

5454
@Override
55-
protected List<String> getVoltageLevelEdgeStyle(Graph graph, Edge edge) {
55+
protected List<String> getVoltageLevelEdgeStyles(Graph graph, Edge edge) {
5656
Node node1 = edge.getNode1();
5757
Node node2 = edge.getNode2();
5858
if (node1.getType() == NodeType.SWITCH && ((SwitchNode) node1).isOpen()) {
59-
return getSwitchEdgeStyle(graph, node2);
59+
return getSwitchEdgeStyles(graph, node2);
6060
}
6161
if (node2.getType() == NodeType.SWITCH && ((SwitchNode) node2).isOpen()) {
62-
return getSwitchEdgeStyle(graph, node1);
62+
return getSwitchEdgeStyles(graph, node1);
6363
}
64-
return super.getVoltageLevelEdgeStyle(graph, edge);
64+
return super.getVoltageLevelEdgeStyles(graph, edge);
6565
}
6666

67-
private List<String> getSwitchEdgeStyle(Graph graph, Node node) {
68-
return graph.getVoltageLevelInfos(node) != null ? getVoltageLevelNodeStyle(graph.getVoltageLevelInfos(node), node) : List.of();
67+
private List<String> getSwitchEdgeStyles(Graph graph, Node node) {
68+
return graph.getVoltageLevelInfos(node) != null ? getNodeStyles(graph.getVoltageLevelInfos(node), node) : List.of();
6969
}
7070

7171
@Override
@@ -114,12 +114,12 @@ private Map<String, String> createBusIdStyleMap(String baseVoltageName, String v
114114
return busIdStyleMap;
115115
}
116116

117-
private List<String> getNodeTopologicalStyle(String baseVoltageLevelStyle, String vlId, Node node) {
118-
Map<String, String> busIdStyleMap = vlBusIdStyleMap.computeIfAbsent(vlId, k -> createBusIdStyleMap(baseVoltageLevelStyle, vlId));
117+
private List<String> getNodeTopologicalStyles(String baseVoltageName, String vlId, Node node) {
118+
Map<String, String> busIdStyleMap = vlBusIdStyleMap.computeIfAbsent(vlId, k -> createBusIdStyleMap(baseVoltageName, vlId));
119119
Map<String, String> nodeIdStyleMap = vlNodeIdStyleMap.computeIfAbsent(vlId, k -> new HashMap<>());
120120
String nodeTopologicalStyle = nodeIdStyleMap.get(node.getId());
121121
List<String> styles = new ArrayList<>();
122-
styles.add(baseVoltageLevelStyle);
122+
styles.add(StyleClassConstants.STYLE_PREFIX + baseVoltageName);
123123
if (nodeTopologicalStyle == null) {
124124
nodeTopologicalStyle = findConnectedStyle(vlId, busIdStyleMap, nodeIdStyleMap, node);
125125
}
@@ -183,19 +183,19 @@ private boolean isMultiTerminalInternalNode(Node node) {
183183
}
184184

185185
@Override
186-
public List<String> getVoltageLevelNodeStyle(VoltageLevelInfos voltageLevelInfos, Node node) {
186+
public List<String> getNodeStyles(VoltageLevelInfos voltageLevelInfos, Node node) {
187187
if (node.getType() == NodeType.SWITCH && ((SwitchNode) node).isOpen()) {
188188
return List.of(StyleClassConstants.DISCONNECTED_STYLE_CLASS);
189189
}
190190
return Optional.ofNullable(voltageLevelInfos)
191191
.flatMap(vli -> baseVoltagesConfig.getBaseVoltageName(vli.getNominalVoltage(), BASE_VOLTAGE_PROFILE))
192-
.map(baseVoltageName -> getNodeTopologicalStyle(StyleClassConstants.STYLE_PREFIX + baseVoltageName, voltageLevelInfos.getId(), node))
192+
.map(baseVoltageName -> getNodeTopologicalStyles(baseVoltageName, voltageLevelInfos.getId(), node))
193193
.orElse(List.of(StyleClassConstants.DISCONNECTED_STYLE_CLASS));
194194
}
195195

196196
@Override
197-
public List<String> getVoltageLevelNodeStyle(VoltageLevelInfos vlInfo, Node node, NodeSide side) {
198-
return getVoltageLevelNodeStyle(vlInfo, node.getAdjacentNodes().get(side.getIntValue() - 1));
197+
public List<String> getNodeStyles(VoltageLevelInfos vlInfo, Node node, NodeSide side) {
198+
return getNodeStyles(vlInfo, node.getAdjacentNodes().get(side.getIntValue() - 1));
199199
}
200200

201201
@Override

0 commit comments

Comments
 (0)