Taking into accound PR comments

Signed-off-by: Thomas ADAM <tadam@silicom.fr>
powsybl · Mar 6, 2024 · 28831ea · 28831ea
1 parent bfdc273
commit 28831ea
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/...agram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java b/...agram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java
@@ -48,7 +48,7 @@ public class LayoutParameters {
     private double cgmesScaleFactor = 1;
     private String cgmesDiagramName = null;
     private boolean cgmesUseNames = true;
-    private double zoneLayoutSnakeLinePadding = 90;
+    private int zoneLayoutSnakeLinePadding = 90;
     private PathFinderType zoneLayoutPathFinder = PathFinderType.DIJKSTRA;
 
     @JsonIgnore
@@ -338,11 +338,11 @@ public LayoutParameters setCgmesUseNames(boolean cgmesUseNames) {
         return this;
     }
 
-    public double getZoneLayoutSnakeLinePadding() {
+    public int getZoneLayoutSnakeLinePadding() {
         return zoneLayoutSnakeLinePadding;
     }
 
-    public LayoutParameters setZoneLayoutSnakeLinePadding(double zoneLayoutSnakeLinePadding) {
+    public LayoutParameters setZoneLayoutSnakeLinePadding(int zoneLayoutSnakeLinePadding) {
         this.zoneLayoutSnakeLinePadding = zoneLayoutSnakeLinePadding;
         return this;
     }

diff --git a/...agram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/MatrixZoneLayout.java b/...agram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/MatrixZoneLayout.java
@@ -58,7 +58,7 @@ protected void calculateCoordSubstations(LayoutParameters layoutParameters) {
         // Width by col
         int maxWidthCol = 0;
         // Snakeline hallway (horizontal & vertical)
-        int snakelineMargin = (int) layoutParameters.getZoneLayoutSnakeLinePadding();
+        int snakelineMargin = layoutParameters.getZoneLayoutSnakeLinePadding();
         // Zone size
         int nbRows = matrix.rowCount();
         int nbCols = matrix.columnCount();

diff --git a/...gram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/zonebygrid/Matrix.java b/...gram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/zonebygrid/Matrix.java
@@ -26,7 +26,7 @@ public class Matrix {
 
     public Matrix(int rows, int cols, LayoutParameters layoutParameters) {
         this.cells = new MatrixCell[rows][cols];
-        this.snakelinePadding = (int) layoutParameters.getZoneLayoutSnakeLinePadding();
+        this.snakelinePadding = layoutParameters.getZoneLayoutSnakeLinePadding();
         this.diagramPadding = layoutParameters.getDiagramPadding();
     }
 

diff --git a/...e-diagram-core/src/main/java/com/powsybl/sld/layout/zonebygrid/MatrixZoneLayoutModel.java b/...e-diagram-core/src/main/java/com/powsybl/sld/layout/zonebygrid/MatrixZoneLayoutModel.java
@@ -29,7 +29,7 @@ public class MatrixZoneLayoutModel {
 
     public MatrixZoneLayoutModel(String[][] ids, LayoutParameters layoutParameters) {
         this.matrix = new Matrix(ids.length, ids[0].length, layoutParameters);
-        this.snakelinePadding = (int) layoutParameters.getZoneLayoutSnakeLinePadding();
+        this.snakelinePadding = layoutParameters.getZoneLayoutSnakeLinePadding();
     }
 
     public void addSubstationGraph(SubstationGraph graph, int row, int col) {

diff --git a/...e-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json b/...e-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json
@@ -567,7 +567,7 @@
     "cgmesScaleFactor" : 1.0,
     "cgmesDiagramName" : null,
     "cgmesUseNames" : true,
-    "zoneLayoutSnakeLinePadding" : 90.0,
+    "zoneLayoutSnakeLinePadding" : 90,
     "zoneLayoutPathFinder" : "DIJKSTRA"
   },
   "svgParams" : {

diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVlMetadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVlMetadata.json
@@ -326,7 +326,7 @@
     "cgmesScaleFactor" : 1.0,
     "cgmesDiagramName" : null,
     "cgmesUseNames" : true,
-    "zoneLayoutSnakeLinePadding" : 90.0,
+    "zoneLayoutSnakeLinePadding" : 90,
     "zoneLayoutPathFinder" : "DIJKSTRA"
   },
   "svgParams" : {

diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/substDiag_metadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/substDiag_metadata.json
@@ -2949,7 +2949,7 @@
     "cgmesScaleFactor" : 1.0,
     "cgmesDiagramName" : null,
     "cgmesUseNames" : true,
-    "zoneLayoutSnakeLinePadding" : 90.0,
+    "zoneLayoutSnakeLinePadding" : 90,
     "zoneLayoutPathFinder" : "DIJKSTRA"
   },
   "svgParams" : {

diff --git a/...iagram/single-line-diagram-core/src/test/resources/substDiag_with_hvdc_line_metadata.json b/...iagram/single-line-diagram-core/src/test/resources/substDiag_with_hvdc_line_metadata.json
@@ -297,7 +297,7 @@
     "cgmesScaleFactor" : 1.0,
     "cgmesDiagramName" : null,
     "cgmesUseNames" : true,
-    "zoneLayoutSnakeLinePadding" : 90.0,
+    "zoneLayoutSnakeLinePadding" : 90,
     "zoneLayoutPathFinder" : "DIJKSTRA"
   },
   "svgParams" : {

diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vlDiag_metadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/vlDiag_metadata.json
@@ -1482,7 +1482,7 @@
     "cgmesScaleFactor" : 1.0,
     "cgmesDiagramName" : null,
     "cgmesUseNames" : true,
-    "zoneLayoutSnakeLinePadding" : 90.0,
+    "zoneLayoutSnakeLinePadding" : 90,
     "zoneLayoutPathFinder" : "DIJKSTRA"
   },
   "svgParams" : {