Skip to content

Commit 34f55d4

Browse files
authored
Merge branch 'develop' into dependabot/github_actions/whelk-io/maven-settings-xml-action-22
2 parents 1305b2e + 9f955d8 commit 34f55d4

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ SPDX-License-Identifier: Apache-2.0
2626
<compas.core.version>0.16.0</compas.core.version>
2727

2828
<quarkus.platform.version>3.7.1</quarkus.platform.version>
29-
<log4j2.version>2.22.1</log4j2.version>
30-
<powsybl.sld.version>3.3.2</powsybl.sld.version>
29+
<log4j2.version>2.23.0</log4j2.version>
30+
<powsybl.sld.version>4.0.0</powsybl.sld.version>
3131
<gson.version>2.10.1</gson.version>
3232
<openpojo.version>0.9.1</openpojo.version>
3333
</properties>

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import java.util.*;
1818

19-
public class SclAutoAlignmentDiagramLabelProvider implements DiagramLabelProvider {
19+
public class SclAutoAlignmentDiagramLabelProvider implements LabelProvider {
2020
private final Map<Node, List<NodeLabel>> busLabels = new HashMap<>();
2121

2222
public SclAutoAlignmentDiagramLabelProvider(SubstationGraph graph) {

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory;
99
import com.powsybl.sld.library.ConvergenceComponentLibrary;
1010
import com.powsybl.sld.model.graphs.SubstationGraph;
11+
import com.powsybl.sld.svg.SvgParameters;
1112
import com.powsybl.sld.svg.styles.BasicStyleProvider;
1213
import com.powsybl.sld.svg.DefaultSVGWriter;
1314
import org.lfenergy.compas.core.commons.ElementConverter;
@@ -102,17 +103,14 @@ String createSVG(SubstationGraphBuilder substationGraphBuilder) {
102103
configureLayout(graph, layoutParameters);
103104

104105
var writer = new StringWriter();
105-
var svgWriter = new DefaultSVGWriter(new ConvergenceComponentLibrary(), layoutParameters);
106-
svgWriter.write("", graph, new SclAutoAlignmentDiagramLabelProvider(graph), new BasicStyleProvider(), writer);
106+
var svgWriter = new DefaultSVGWriter(new ConvergenceComponentLibrary(), layoutParameters, new SvgParameters());
107+
svgWriter.write(graph, new SclAutoAlignmentDiagramLabelProvider(graph), new BasicStyleProvider(), writer);
107108
return writer.toString();
108109
}
109110

110111
private LayoutParameters getLayoutParameters() {
111112
return new LayoutParameters()
112-
.setAdaptCellHeightToContent(true)
113-
.setShowInternalNodes(true)
114-
.setCssLocation(LayoutParameters.CssLocation.INSERTED_IN_SVG)
115-
.setShowInternalNodes(true);
113+
.setAdaptCellHeightToContent(true);
116114
}
117115

118116
private void configureLayout(SubstationGraph graph, LayoutParameters layoutParameters) {

0 commit comments

Comments
 (0)