Skip to content

Commit bd4fff3

Browse files
authored
Merge branch 'develop' into dependabot/docker/app/src/main/docker/ubi8/ubi-minimal-8.9-1137
2 parents 639b05d + ac3d93b commit bd4fff3

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

.github/workflows/build-project.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
java-version: '17'
4646

4747
- name: Create custom Maven Settings.xml
48-
uses: whelk-io/maven-settings-xml-action@v21
48+
uses: whelk-io/maven-settings-xml-action@v22
4949
with:
5050
output_file: custom_maven_settings.xml
5151
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Create custom Maven Settings.xml
6767
if: ${{ steps.release.outputs.release_created }}
68-
uses: whelk-io/maven-settings-xml-action@v21
68+
uses: whelk-io/maven-settings-xml-action@v22
6969
with:
7070
output_file: custom_maven_settings.xml
7171
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
-Dsonar.projectKey=com-pas_compas-scl-auto-alignment \
8080
-Dsonar.organization=com-pas )"
8181
- name: Create custom Maven Settings.xml
82-
uses: whelk-io/maven-settings-xml-action@v21
82+
uses: whelk-io/maven-settings-xml-action@v22
8383
with:
8484
output_file: custom_maven_settings.xml
8585
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

.github/workflows/sonarcloud-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
java-version: '17'
5151

5252
- name: Create custom Maven Settings.xml
53-
uses: whelk-io/maven-settings-xml-action@v21
53+
uses: whelk-io/maven-settings-xml-action@v22
5454
with:
5555
output_file: custom_maven_settings.xml
5656
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'

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)