From 19280c6303df64171a4261bd755af11ea171b568 Mon Sep 17 00:00:00 2001
From: Thomas ADAM <tadam@silicom.fr>
Date: Thu, 14 Mar 2024 10:34:08 +0100
Subject: [PATCH 1/3] Display Network as ZoneGraph

Signed-off-by: Thomas ADAM <tadam@silicom.fr>
---
 .../powsybl/diagram/viewer/DiagramViewer.java |  8 ++++
 .../sld/SingleLineDiagramController.java      | 38 ++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/DiagramViewer.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/DiagramViewer.java
index 6f5aa92..1b3a38a 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/DiagramViewer.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/DiagramViewer.java
@@ -22,7 +22,11 @@
  */
 public class DiagramViewer extends Application {
 
+    private static Stage primaryStage;
+
     public void start(Stage primaryStage) throws IOException {
+        DiagramViewer.primaryStage = primaryStage;
+
         FXMLLoader loader = new FXMLLoader();
         loader.setLocation(Objects.requireNonNull(getClass().getResource("/mainView.fxml")));
         BorderPane root = loader.load();
@@ -35,4 +39,8 @@ public void start(Stage primaryStage) throws IOException {
     public static void main(String[] args) {
         Application.launch(DiagramViewer.class);
     }
+
+    public static Stage getPrimaryStage() {
+        return DiagramViewer.primaryStage;
+    }
 }
diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
index 1faf5ee..33ba3a9 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
@@ -7,19 +7,20 @@
  */
 package com.powsybl.diagram.viewer.sld;
 
+import com.powsybl.diagram.viewer.*;
 import com.powsybl.diagram.viewer.common.AbstractDiagramController;
 import com.powsybl.diagram.viewer.common.ContainerResult;
-import com.powsybl.iidm.network.Container;
-import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.Switch;
+import com.powsybl.iidm.network.*;
 import com.powsybl.sld.SingleLineDiagram;
 import com.powsybl.sld.SldParameters;
 import com.powsybl.sld.layout.VoltageLevelLayoutFactoryCreator;
 import com.powsybl.sld.svg.styles.StyleProvider;
-import javafx.beans.property.StringProperty;
+import javafx.beans.binding.*;
+import javafx.beans.property.*;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
+import javafx.scene.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,10 +79,6 @@ public static void updateDiagram(Network network,
                                      Container<?> container,
                                      // PositionVoltageLevelLayoutFactory
                                      VoltageLevelLayoutFactoryCreator voltageLevelLayoutFactoryCreator) {
-
-        if (container instanceof Network) {
-            return;
-        }
         Service<ContainerResult> sldService = new Service<>() {
             @Override
             protected Task<ContainerResult> createTask() {
@@ -100,12 +97,17 @@ protected ContainerResult call() throws IOException {
                                     .setSubstationLayoutFactory(model.getSubstationLayoutFactory())
                                     .setStyleProviderFactory(model::getStyleProvider)
                                     .setVoltageLevelLayoutFactoryCreator(voltageLevelLayoutFactoryCreator);
-
-                            SingleLineDiagram.draw(network, container.getId(),
-                                    svgWriter,
-                                    metadataWriter,
-                                    sldParameters);
-
+                            if (container instanceof Network network) {
+                                SingleLineDiagram.drawMultiSubstations(network, ((Network) container).getSubstationStream().map(Identifiable::getId).toList(),
+                                        svgWriter,
+                                        metadataWriter,
+                                        sldParameters);
+                            } else {
+                                SingleLineDiagram.draw(network, container.getId(),
+                                        svgWriter,
+                                        metadataWriter,
+                                        sldParameters);
+                            }
                             svgWriter.flush();
                             metadataWriter.flush();
                             result.svgContentProperty().set(svgWriter.toString());
@@ -117,6 +119,14 @@ protected ContainerResult call() throws IOException {
                 };
             }
         };
+        // Show waiting cursor during task execution
+        DiagramViewer.getPrimaryStage().getScene()
+                .getRoot()
+                .cursorProperty()
+                .bind(Bindings.when(sldService.runningProperty())
+                        .then(Cursor.WAIT)
+                        .otherwise(Cursor.DEFAULT)
+        );
 
         sldService.setOnSucceeded(event -> containerResult.setValue((ContainerResult) event.getSource().getValue()));
         sldService.setOnFailed(event -> {

From d69b1265e88f51c8b98d89e5651cfc37b0df0867 Mon Sep 17 00:00:00 2001
From: Thomas ADAM <tadam@silicom.fr>
Date: Fri, 5 Apr 2024 15:40:20 +0200
Subject: [PATCH 2/3] Add Horizontal & Vertical Zone layout choice

Signed-off-by: Thomas ADAM <tadam@silicom.fr>
---
 .../sld/SingleLineDiagramController.java      | 26 ++++++++++---
 .../viewer/sld/SingleLineDiagramModel.java    | 37 +++++++++++++++++++
 .../sld/SingleLineDiagramViewController.java  |  9 +++++
 .../src/main/resources/sld/view.fxml          |  2 +
 4 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
index 33ba3a9..d0b5615 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
@@ -17,12 +17,12 @@
 import com.powsybl.sld.svg.styles.StyleProvider;
 import javafx.beans.binding.*;
 import javafx.beans.property.*;
-import javafx.concurrent.Service;
-import javafx.concurrent.Task;
+import javafx.concurrent.*;
 import javafx.fxml.FXML;
 import javafx.scene.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.*;
 
 import java.io.IOException;
 import java.io.StringWriter;
@@ -34,6 +34,7 @@ public class SingleLineDiagramController extends AbstractDiagramController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SingleLineDiagramController.class);
 
+    private static Service<ContainerResult> sldService;
     private StringProperty metadataContent;
     private StringProperty graphContent;
 
@@ -64,6 +65,17 @@ public void createDiagram(SingleLineDiagramJsHandler jsHandler,
             }
         });
         setUpListenerOnWebViewChanges(jsHandler);
+        // Manage cursor look above WebView
+        DiagramViewer.getPrimaryStage().getScene().getRoot().cursorProperty().addListener((observable, oldValue, newValue) -> {
+            if (Worker.State.SUCCEEDED == diagramWebView.getEngine().getLoadWorker().stateProperty().get()) {
+                Document doc = diagramWebView.getEngine().getDocument();
+                Element body = (Element)
+                        doc.getElementsByTagName("body").item(0);
+                String style = body.getAttribute("style");
+                body.setAttribute("style", "cursor: " + ((newValue == Cursor.WAIT) ? "wait" : "default") + ";" + style);
+            }
+        });
+
         containerResult.metadataContentProperty().addListener((obs, oldV, newV) -> jsHandler.setMetadata(containerResult.metadataContentProperty().get()));
 
         // Metadata & Graph binding
@@ -79,7 +91,10 @@ public static void updateDiagram(Network network,
                                      Container<?> container,
                                      // PositionVoltageLevelLayoutFactory
                                      VoltageLevelLayoutFactoryCreator voltageLevelLayoutFactoryCreator) {
-        Service<ContainerResult> sldService = new Service<>() {
+        if (sldService != null && sldService.isRunning()) {
+            sldService.cancel();
+        }
+        sldService = new Service<>() {
             @Override
             protected Task<ContainerResult> createTask() {
                 return new Task<>() {
@@ -96,7 +111,8 @@ protected ContainerResult call() throws IOException {
                                     .setComponentLibrary(model.getComponentLibrary())
                                     .setSubstationLayoutFactory(model.getSubstationLayoutFactory())
                                     .setStyleProviderFactory(model::getStyleProvider)
-                                    .setVoltageLevelLayoutFactoryCreator(voltageLevelLayoutFactoryCreator);
+                                    .setVoltageLevelLayoutFactoryCreator(voltageLevelLayoutFactoryCreator)
+                                    .setZoneLayoutFactory(model.getZoneLayoutFactory());
                             if (container instanceof Network network) {
                                 SingleLineDiagram.drawMultiSubstations(network, ((Network) container).getSubstationStream().map(Identifiable::getId).toList(),
                                         svgWriter,
@@ -127,7 +143,7 @@ protected ContainerResult call() throws IOException {
                         .then(Cursor.WAIT)
                         .otherwise(Cursor.DEFAULT)
         );
-
+        sldService.setOnCancelled(event -> DiagramViewer.getPrimaryStage().getScene().getRoot().setCursor(Cursor.DEFAULT));
         sldService.setOnSucceeded(event -> containerResult.setValue((ContainerResult) event.getSource().getValue()));
         sldService.setOnFailed(event -> {
             Throwable exception = event.getSource().getException();
diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java
index 35def98..7993ec2 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java
@@ -73,6 +73,13 @@ public String toString() {
     private final Map<String, SubstationLayoutFactory> nameToSubstationLayoutFactoryMap = new TreeMap<>(); // ordered
     private final ObservableList<SubstationLayoutFactory> substationLayouts = FXCollections.observableArrayList();
     private final ObjectProperty<SubstationLayoutFactory> currentSubstationLayoutFactory = new SimpleObjectProperty<>();
+    // Zone layout provider
+    private static final String HORIZONTAL_ZONE_LAYOUT = "Horizontal";
+    private static final String VERTICAL_ZONE_LAYOUT = "Vertical";
+    private static final String MATRIX_ZONE_LAYOUT = "Matrix";
+    private final Map<String, ZoneLayoutFactory> nameToZoneLayoutFactoryMap = new TreeMap<>(); // ordered
+    private final ObservableList<ZoneLayoutFactory> zoneLayouts = FXCollections.observableArrayList();
+    private final ObjectProperty<ZoneLayoutFactory> currentZoneLayoutFactory = new SimpleObjectProperty<>();
 
     // CGMES-DL names
     private final ObservableList<String> cgmesDLDiagramNames = FXCollections.observableArrayList();
@@ -81,6 +88,7 @@ public String toString() {
     public SingleLineDiagramModel(// Providers
                                   ReadOnlyObjectProperty<ComponentLibrary> componentLibrary,
                                   ReadOnlyObjectProperty<SubstationLayoutFactory> substationLayoutFactory,
+                                  ReadOnlyObjectProperty<ZoneLayoutFactory> zoneLayoutFactory,
                                   ReadOnlyObjectProperty<String> cgmesDLDiagramName,
                                   // Styles
                                   BooleanProperty basicStyleProvider,
@@ -129,6 +137,7 @@ public SingleLineDiagramModel(// Providers
         // Providers
         this.currentComponentLibrary.bind(componentLibrary);
         this.currentSubstationLayoutFactory.bind(substationLayoutFactory);
+        this.currentZoneLayoutFactory.bind(zoneLayoutFactory);
         this.currentCgmesDLDiagramName.bind(cgmesDLDiagramName);
 
         // Styles
@@ -175,6 +184,10 @@ public SingleLineDiagramModel(// Providers
     }
 
     public void initProviders() {
+        // zoneLayouts
+        nameToZoneLayoutFactoryMap.put(HORIZONTAL_ZONE_LAYOUT, new HorizontalZoneLayoutFactory());
+        nameToZoneLayoutFactoryMap.put(VERTICAL_ZONE_LAYOUT, new VerticalZoneLayoutFactory());
+
         // SubstationLayouts
         nameToSubstationLayoutFactoryMap.put(HORIZONTAL_SUBSTATION_LAYOUT, new HorizontalSubstationLayoutFactory());
         nameToSubstationLayoutFactoryMap.put(VERTICAL_SUBSTATION_LAYOUT, new VerticalSubstationLayoutFactory());
@@ -182,6 +195,7 @@ public void initProviders() {
         // Set all providers list
         componentLibraries.setAll(ComponentLibrary.findAll());
         substationLayouts.setAll(nameToSubstationLayoutFactoryMap.values());
+        zoneLayouts.setAll(nameToZoneLayoutFactoryMap.values());
     }
 
     public void updateFrom(Network network) {
@@ -248,6 +262,10 @@ public SubstationLayoutFactory getSubstationLayoutFactory() {
         return currentSubstationLayoutFactory.get();
     }
 
+    public ZoneLayoutFactory getZoneLayoutFactory() {
+        return currentZoneLayoutFactory.get();
+    }
+
     public ObservableList<ComponentLibrary> getComponentLibraries() {
         return componentLibraries;
     }
@@ -256,6 +274,10 @@ public ObservableList<SubstationLayoutFactory> getSubstationLayouts() {
         return substationLayouts;
     }
 
+    public ObservableList<ZoneLayoutFactory> getZoneLayouts() {
+        return zoneLayouts;
+    }
+
     public ObservableList<String> getCgmesDLDiagramNames() {
         return cgmesDLDiagramNames;
     }
@@ -288,4 +310,19 @@ public SubstationLayoutFactory fromString(String item) {
             }
         };
     }
+
+    public StringConverter<ZoneLayoutFactory> getZoneLayoutStringConverter() {
+        return new StringConverter<>() {
+            @Override
+            public String toString(ZoneLayoutFactory object) {
+                Optional<String> label = nameToZoneLayoutFactoryMap.keySet().stream().filter(name -> nameToZoneLayoutFactoryMap.get(name) == object).findFirst();
+                return label.orElse(UNKNOWN_ITEM);
+            }
+
+            @Override
+            public ZoneLayoutFactory fromString(String item) {
+                return nameToZoneLayoutFactoryMap.get(item);
+            }
+        };
+    }
 }
diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java
index e3cc917..1556088 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java
@@ -69,6 +69,9 @@ public class SingleLineDiagramViewController extends AbstractDiagramViewControll
     @FXML
     public ComboBox<SubstationLayoutFactory> substationLayoutComboBox;
 
+    @FXML
+    public ComboBox<ZoneLayoutFactory> zoneLayoutComboBox;
+
     @FXML
     public ChoiceBox<SingleLineDiagramModel.VoltageLevelLayoutFactoryType> voltageLevelLayoutComboBox;
 
@@ -197,6 +200,7 @@ private void initialize() {
                 // Providers
                 componentLibraryComboBox.valueProperty(),
                 substationLayoutComboBox.valueProperty(),
+                zoneLayoutComboBox.valueProperty(),
                 cgmesDLDiagramsComboBox.valueProperty(),
                 // - Styles
                 basicStyleProviderCheckBox.selectedProperty(),
@@ -253,6 +257,10 @@ private void initialize() {
         substationLayoutComboBox.itemsProperty().bind(Bindings.createObjectBinding(() -> model.getSubstationLayouts()));
         substationLayoutComboBox.setConverter(model.getSubstationLayoutStringConverter());
         substationLayoutComboBox.getSelectionModel().selectFirst(); // Default selection without Network
+        // Zone layout
+        zoneLayoutComboBox.itemsProperty().bind(Bindings.createObjectBinding(() -> model.getZoneLayouts()));
+        zoneLayoutComboBox.setConverter(model.getZoneLayoutStringConverter());
+        zoneLayoutComboBox.getSelectionModel().selectFirst(); // Default selection without Network
 
         // CGMES-DL Diagrams
         cgmesDLDiagramsComboBox.itemsProperty().bind(Bindings.createObjectBinding(() -> model.getCgmesDLDiagramNames()));
@@ -273,6 +281,7 @@ private boolean voltageLevelLayoutFactoryParametersEnabled(SingleLineDiagramMode
     public void addListener(ChangeListener<Object> changeListener) {
         componentLibraryComboBox.valueProperty().addListener(changeListener);
         substationLayoutComboBox.valueProperty().addListener(changeListener);
+        zoneLayoutComboBox.valueProperty().addListener(changeListener);
         cgmesDLDiagramsComboBox.valueProperty().addListener(changeListener);
 
         basicStyleProviderCheckBox.selectedProperty().addListener(changeListener);
diff --git a/diagram-viewer/src/main/resources/sld/view.fxml b/diagram-viewer/src/main/resources/sld/view.fxml
index de5ec4a..055731c 100644
--- a/diagram-viewer/src/main/resources/sld/view.fxml
+++ b/diagram-viewer/src/main/resources/sld/view.fxml
@@ -61,6 +61,8 @@
                                 </valueFactory>
                             </Spinner>
                         </HBox>
+                        <Label text="Zone Layout:"/>
+                        <ComboBox fx:id="zoneLayoutComboBox"/>
                         <Label text="Substation Layout:"/>
                         <ComboBox fx:id="substationLayoutComboBox"/>
                         <Label text="VoltageLevel Layout:"/>

From 275ccd96115cf2014d1c9cc98a5d92f435d81068 Mon Sep 17 00:00:00 2001
From: Yohann Bachelier <ybachelier@neverhack.com>
Date: Mon, 3 Jun 2024 11:07:01 +0200
Subject: [PATCH 3/3] Add matrix in ZoneLayout choices with shape configuration

Signed-off-by: Yohann Bachelier <ybachelier@neverhack.com>
---
 .../diagram/viewer/MainViewController.java    |  10 ++
 .../viewer/sld/MatrixShapeViewController.java |  52 ++++++++
 .../sld/SingleLineDiagramController.java      |  43 +++++--
 .../viewer/sld/SingleLineDiagramModel.java    |  21 +++-
 .../sld/SingleLineDiagramViewController.java  | 111 +++++++++++++++---
 .../main/resources/sld/matrixShapeView.fxml   |  20 ++++
 .../src/main/resources/sld/view.fxml          |  52 +++++---
 7 files changed, 260 insertions(+), 49 deletions(-)
 create mode 100644 diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/MatrixShapeViewController.java
 create mode 100644 diagram-viewer/src/main/resources/sld/matrixShapeView.fxml

diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/MainViewController.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/MainViewController.java
index 0ba5120..c58778c 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/MainViewController.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/MainViewController.java
@@ -171,6 +171,11 @@ private void initialize() {
         model.networkProperty().addListener((observableValue, oldNetwork, newNetwork) -> {
             sldViewController.updateFrom(model.networkProperty());
             initSubstationsTree(newNetwork);
+            try {
+                sldViewController.initMatrixSubstationList(newNetwork);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
         });
 
         showNames.selectedProperty().addListener((observable, oldValue, newValue) -> vlTree.refresh());
@@ -216,6 +221,11 @@ public TreeItem<Container<?>> fromString(String string) {
 
         nadViewController.addListener((observable, oldValue, newValue) -> updateNadDiagrams());
         sldViewController.addListener((observable, oldValue, newValue) -> updateSldDiagrams());
+        sldViewController.updateSldButton.setOnAction(actionEvent -> {
+            actionEvent.consume();
+            updateSldDiagrams();
+        });
+
     }
 
     private void clearSelection() {
diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/MatrixShapeViewController.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/MatrixShapeViewController.java
new file mode 100644
index 0000000..cdd90fb
--- /dev/null
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/MatrixShapeViewController.java
@@ -0,0 +1,52 @@
+package com.powsybl.diagram.viewer.sld;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.Spinner;
+
+public class MatrixShapeViewController {
+
+    @FXML
+    public Label substationName;
+
+    @FXML
+    public Label substationId;
+
+    @FXML
+    public Spinner<Integer> row;
+
+    @FXML
+    public Spinner<Integer> column;
+
+    public void setSubstationNameValue(String text) {
+        this.substationName.setText(text);
+    }
+
+    public String getSubstationNameValue() {
+        return substationName.getText();
+    }
+
+    public void setRowValue(Integer row) {
+        this.row.getValueFactory().setValue(row);
+    }
+
+    public Integer getRowValue() {
+        return row.getValue();
+    }
+
+    public void setColumnValue(Integer column) {
+        this.column.getValueFactory().setValue(column);
+    }
+
+    public Integer getColumnValue() {
+        return column.getValue();
+    }
+
+    public void setSubstationIdValue(String substationId) {
+        this.substationId.setText(substationId);
+    }
+
+    public Label getSubstationIdValue() {
+        return substationId;
+    }
+}
diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
index d0b5615..48ba52b 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramController.java
@@ -7,25 +7,37 @@
  */
 package com.powsybl.diagram.viewer.sld;
 
-import com.powsybl.diagram.viewer.*;
+import com.powsybl.diagram.viewer.DiagramViewer;
 import com.powsybl.diagram.viewer.common.AbstractDiagramController;
 import com.powsybl.diagram.viewer.common.ContainerResult;
-import com.powsybl.iidm.network.*;
+import com.powsybl.iidm.network.Container;
+import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.Switch;
 import com.powsybl.sld.SingleLineDiagram;
 import com.powsybl.sld.SldParameters;
+import com.powsybl.sld.layout.HorizontalZoneLayoutFactory;
+import com.powsybl.sld.layout.MatrixZoneLayoutFactory;
 import com.powsybl.sld.layout.VoltageLevelLayoutFactoryCreator;
+import com.powsybl.sld.layout.ZoneLayoutFactory;
 import com.powsybl.sld.svg.styles.StyleProvider;
-import javafx.beans.binding.*;
-import javafx.beans.property.*;
-import javafx.concurrent.*;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
 import javafx.fxml.FXML;
-import javafx.scene.*;
+import javafx.scene.Cursor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * @author Thomas Adam <tadam at slicom.fr>
@@ -101,10 +113,19 @@ protected Task<ContainerResult> createTask() {
                     @Override
                     protected ContainerResult call() throws IOException {
                         ContainerResult result = new ContainerResult();
+                        List<String> substationList = new ArrayList<>();
                         try (StringWriter svgWriter = new StringWriter();
                              StringWriter metadataWriter = new StringWriter();
                              StringWriter jsonWriter = new StringWriter()) {
-
+                            ZoneLayoutFactory zoneLayoutFactory = model.getZoneLayoutFactory();
+                            if (model.getZoneLayoutFactory() instanceof MatrixZoneLayoutFactory) {
+                                substationList = Arrays.stream(model.getMatrix())
+                                        .flatMap(Arrays::stream)
+                                        .filter(Predicate.not(String::isEmpty))
+                                        .toList();
+                                zoneLayoutFactory = substationList.isEmpty() ?
+                                        new HorizontalZoneLayoutFactory() : new MatrixZoneLayoutFactory(model.getMatrix());
+                            }
                             SldParameters sldParameters = new SldParameters()
                                     .setLayoutParameters(model.getLayoutParameters())
                                     .setSvgParameters(model.getSvgParameters())
@@ -112,9 +133,9 @@ protected ContainerResult call() throws IOException {
                                     .setSubstationLayoutFactory(model.getSubstationLayoutFactory())
                                     .setStyleProviderFactory(model::getStyleProvider)
                                     .setVoltageLevelLayoutFactoryCreator(voltageLevelLayoutFactoryCreator)
-                                    .setZoneLayoutFactory(model.getZoneLayoutFactory());
-                            if (container instanceof Network network) {
-                                SingleLineDiagram.drawMultiSubstations(network, ((Network) container).getSubstationStream().map(Identifiable::getId).toList(),
+                                    .setZoneLayoutFactory(zoneLayoutFactory);
+                            if (container instanceof Network network && !substationList.isEmpty()) {
+                                SingleLineDiagram.drawMultiSubstations(network, substationList,
                                         svgWriter,
                                         metadataWriter,
                                         sldParameters);
diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java
index 7993ec2..5a979a0 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramModel.java
@@ -9,14 +9,14 @@
 
 import com.powsybl.diagram.viewer.common.DiagramModel;
 import com.powsybl.iidm.network.Network;
-import com.powsybl.sld.cgmes.dl.iidm.extensions.*;
-import com.powsybl.sld.cgmes.layout.*;
+import com.powsybl.sld.cgmes.dl.iidm.extensions.NetworkDiagramData;
+import com.powsybl.sld.cgmes.layout.CgmesSubstationLayoutFactory;
 import com.powsybl.sld.layout.*;
-
 import com.powsybl.sld.library.ComponentLibrary;
 import com.powsybl.sld.svg.SvgParameters;
 import com.powsybl.sld.svg.styles.*;
-import com.powsybl.sld.svg.styles.iidm.*;
+import com.powsybl.sld.svg.styles.iidm.HighlightLineStateStyleProvider;
+import com.powsybl.sld.svg.styles.iidm.TopologicalStyleProvider;
 import javafx.beans.property.*;
 import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
@@ -44,7 +44,6 @@ public String toString() {
             };
         }
     }
-
     private static final String UNKNOWN_ITEM = "???";
 
     // LayoutParameters
@@ -77,6 +76,9 @@ public String toString() {
     private static final String HORIZONTAL_ZONE_LAYOUT = "Horizontal";
     private static final String VERTICAL_ZONE_LAYOUT = "Vertical";
     private static final String MATRIX_ZONE_LAYOUT = "Matrix";
+    private String[][] matrix = {{}};
+
+    private MatrixZoneLayoutFactory matrixZoneLayoutFactory = new MatrixZoneLayoutFactory(this.matrix);
     private final Map<String, ZoneLayoutFactory> nameToZoneLayoutFactoryMap = new TreeMap<>(); // ordered
     private final ObservableList<ZoneLayoutFactory> zoneLayouts = FXCollections.observableArrayList();
     private final ObjectProperty<ZoneLayoutFactory> currentZoneLayoutFactory = new SimpleObjectProperty<>();
@@ -187,6 +189,7 @@ public void initProviders() {
         // zoneLayouts
         nameToZoneLayoutFactoryMap.put(HORIZONTAL_ZONE_LAYOUT, new HorizontalZoneLayoutFactory());
         nameToZoneLayoutFactoryMap.put(VERTICAL_ZONE_LAYOUT, new VerticalZoneLayoutFactory());
+        nameToZoneLayoutFactoryMap.put(MATRIX_ZONE_LAYOUT, this.matrixZoneLayoutFactory);
 
         // SubstationLayouts
         nameToSubstationLayoutFactoryMap.put(HORIZONTAL_SUBSTATION_LAYOUT, new HorizontalSubstationLayoutFactory());
@@ -325,4 +328,12 @@ public ZoneLayoutFactory fromString(String item) {
             }
         };
     }
+
+    public void setMatrix(String[][] matrix) {
+        this.matrix = matrix;
+    }
+
+    public String[][] getMatrix() {
+        return matrix;
+    }
 }
diff --git a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java
index 1556088..14123a5 100644
--- a/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java
+++ b/diagram-viewer/src/main/java/com/powsybl/diagram/viewer/sld/SingleLineDiagramViewController.java
@@ -11,6 +11,7 @@
 import com.powsybl.diagram.viewer.common.AbstractDiagramViewController;
 import com.powsybl.iidm.network.Container;
 import com.powsybl.iidm.network.Network;
+import com.powsybl.iidm.network.Substation;
 import com.powsybl.sld.cgmes.dl.iidm.extensions.NetworkDiagramData;
 import com.powsybl.sld.cgmes.layout.CgmesVoltageLevelLayoutFactory;
 import com.powsybl.sld.layout.*;
@@ -18,8 +19,10 @@
 import com.powsybl.sld.layout.position.predefined.PositionPredefined;
 import com.powsybl.sld.library.ComponentLibrary;
 import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.value.ChangeListener;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -30,6 +33,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 
 /**
@@ -54,6 +59,18 @@ public class SingleLineDiagramViewController extends AbstractDiagramViewControll
     @FXML
     public HBox animationHBox;
 
+    @FXML
+    public VBox matrixShapeVBox;
+
+    @FXML
+    public HBox matrixShapeHBoxTitle;
+
+    @FXML
+    public VBox matrixShapeSubstationCoordinates;
+
+    @FXML
+    public Button updateSldButton;
+
     @FXML
     public Spinner<Double> animationThreshold1Spinner;
 
@@ -121,9 +138,6 @@ public class SingleLineDiagramViewController extends AbstractDiagramViewControll
     @FXML
     public CheckBox disconnectorsOnBusCheckBox;
 
-    @FXML
-    public VBox positionVoltageLevelLayoutFactoryParameters;
-
     @FXML
     public CheckBox stackFeedersCheckBox;
 
@@ -138,8 +152,6 @@ public class SingleLineDiagramViewController extends AbstractDiagramViewControll
 
     @FXML
     public CheckBox substituteSingularFictitiousNodesCheckBox;
-    @FXML
-    public CheckBox substituteInternalMiddle2wtByEquipmentNodesCheckBox;
 
     @FXML
     public Spinner<Double> scaleFactorSpinner;
@@ -261,21 +273,27 @@ private void initialize() {
         zoneLayoutComboBox.itemsProperty().bind(Bindings.createObjectBinding(() -> model.getZoneLayouts()));
         zoneLayoutComboBox.setConverter(model.getZoneLayoutStringConverter());
         zoneLayoutComboBox.getSelectionModel().selectFirst(); // Default selection without Network
-
+        zoneLayoutComboBox.valueProperty().addListener((observable, oldValue, newValue) -> showMatrixNodes()); // BooleanBinding doesn't work easily
+        // Matrix Shape
+        matrixShapeVBox.visibleProperty().setValue(false);
+        matrixShapeVBox.managedProperty().bind(matrixShapeVBox.visibleProperty());
         // CGMES-DL Diagrams
         cgmesDLDiagramsComboBox.itemsProperty().bind(Bindings.createObjectBinding(() -> model.getCgmesDLDiagramNames()));
         cgmesDLDiagramsComboBox.getSelectionModel().selectFirst(); // Default selection without Network
 
         // PositionVoltageLevelLayoutFactory
-        positionVoltageLevelLayoutFactoryParameters.visibleProperty().bind(Bindings.createBooleanBinding(
-                () -> voltageLevelLayoutFactoryParametersEnabled(voltageLevelLayoutComboBox.getSelectionModel().getSelectedItem()),
-                voltageLevelLayoutComboBox.getSelectionModel().selectedItemProperty()));
-        positionVoltageLevelLayoutFactoryParameters.managedProperty().bind(positionVoltageLevelLayoutFactoryParameters.visibleProperty()); // Force view layout calculations when nodes are shown or hidden
-    }
-
-    private boolean voltageLevelLayoutFactoryParametersEnabled(SingleLineDiagramModel.VoltageLevelLayoutFactoryType selectedItem) {
-        return selectedItem == SingleLineDiagramModel.VoltageLevelLayoutFactoryType.POSITION_WITH_EXTENSIONS
-                || selectedItem == SingleLineDiagramModel.VoltageLevelLayoutFactoryType.POSITION_BY_CLUSTERING;
+        BooleanBinding disableBinding = Bindings.createBooleanBinding(() -> voltageLevelLayoutComboBox.getSelectionModel().getSelectedItem() == SingleLineDiagramModel.VoltageLevelLayoutFactoryType.POSITION_WITH_EXTENSIONS || voltageLevelLayoutComboBox.getSelectionModel().getSelectedItem() == SingleLineDiagramModel.VoltageLevelLayoutFactoryType.POSITION_BY_CLUSTERING, voltageLevelLayoutComboBox.getSelectionModel().selectedItemProperty());
+        stackFeedersCheckBox.visibleProperty().bind(disableBinding);
+        exceptionWhenPatternUnhandledCheckBox.visibleProperty().bind(disableBinding);
+        handleShuntsCheckBox.visibleProperty().bind(disableBinding);
+        removeFictitiousNodesCheckBox.visibleProperty().bind(disableBinding);
+        substituteSingularFictitiousNodesCheckBox.visibleProperty().bind(disableBinding);
+        // Force layout calculations when nodes are shown or hidden
+        stackFeedersCheckBox.managedProperty().bind(stackFeedersCheckBox.visibleProperty());
+        exceptionWhenPatternUnhandledCheckBox.managedProperty().bind(exceptionWhenPatternUnhandledCheckBox.visibleProperty());
+        handleShuntsCheckBox.managedProperty().bind(handleShuntsCheckBox.visibleProperty());
+        removeFictitiousNodesCheckBox.managedProperty().bind(removeFictitiousNodesCheckBox.visibleProperty());
+        substituteSingularFictitiousNodesCheckBox.managedProperty().bind(substituteSingularFictitiousNodesCheckBox.visibleProperty());
     }
 
     public void addListener(ChangeListener<Object> changeListener) {
@@ -296,13 +314,15 @@ public void addListener(ChangeListener<Object> changeListener) {
         handleShuntsCheckBox.selectedProperty().addListener(changeListener);
         removeFictitiousNodesCheckBox.selectedProperty().addListener(changeListener);
         substituteSingularFictitiousNodesCheckBox.selectedProperty().addListener(changeListener);
-        substituteInternalMiddle2wtByEquipmentNodesCheckBox.selectedProperty().addListener(changeListener);
 
         // LayoutParameters
         model.addListener(changeListener);
     }
 
     public void updateAllDiagrams(Network network, Container<?> selectedContainer) {
+        if (this.model.getZoneLayoutFactory() instanceof MatrixZoneLayoutFactory) {
+            this.updateMatrixShape();
+        }
         if (selectedContainer != null) {
             SingleLineDiagramController.updateDiagram(network, model, model.getSelectedContainerResult(), selectedContainer,
                     getVoltageLevelLayoutFactoryCreator());
@@ -387,8 +407,7 @@ public VoltageLevelLayoutFactoryCreator getVoltageLevelLayoutFactoryCreator() {
                 .setExceptionIfPatternNotHandled(exceptionWhenPatternUnhandledCheckBox.isSelected())
                 .setHandleShunts(handleShuntsCheckBox.isSelected())
                 .setRemoveUnnecessaryFictitiousNodes(removeFictitiousNodesCheckBox.isSelected())
-                .setSubstituteSingularFictitiousByFeederNode(substituteSingularFictitiousNodesCheckBox.isSelected())
-                .setSubstituteInternalMiddle2wtByEquipmentNodes(substituteInternalMiddle2wtByEquipmentNodesCheckBox.isSelected());
+                .setSubstituteSingularFictitiousByFeederNode(substituteSingularFictitiousNodesCheckBox.isSelected());
         SingleLineDiagramModel.VoltageLevelLayoutFactoryType type = voltageLevelLayoutComboBox.getValue();
         return switch (type) {
             case SMART -> SmartVoltageLevelLayoutFactory::new;
@@ -398,4 +417,60 @@ public VoltageLevelLayoutFactoryCreator getVoltageLevelLayoutFactoryCreator() {
             case CGMES -> CgmesVoltageLevelLayoutFactory::new;
         };
     }
+
+    public void initMatrixSubstationList(Network network) throws IOException {
+        this.matrixShapeSubstationCoordinates.getChildren().clear();
+        for (Substation s : network.getSubstations()) {
+            FXMLLoader loader = new FXMLLoader();
+            HBox nodeCoordinate = loader.load(Objects.requireNonNull(getClass().getResource("/sld/matrixShapeView.fxml")).openStream());
+            this.matrixShapeSubstationCoordinates.getChildren().add(nodeCoordinate);
+            MatrixShapeViewController controller = loader.getController();
+            controller.setSubstationNameValue(s.getNameOrId());
+            controller.setSubstationIdValue(s.getId());
+            controller.setRowValue(0);
+            controller.setColumnValue(0);
+        }
+    }
+
+    public void updateMatrixShape() {
+        int maxRow = this.matrixShapeSubstationCoordinates.getChildren().stream().mapToInt(n ->
+                (int) ((Spinner<?>) ((HBox) n).getChildren().get(1)).getValue())
+                .max().orElseThrow(NoSuchElementException::new);
+
+        int maxColumn = this.matrixShapeSubstationCoordinates.getChildren().stream().mapToInt(n ->
+            (int) ((Spinner<?>) ((HBox) n).getChildren().get(2)).getValue())
+                .max().orElseThrow(NoSuchElementException::new);
+
+        String[][] matrix = new String[maxRow][maxColumn];
+        Arrays.stream(matrix).forEach(row -> Arrays.fill(row, ""));
+
+        this.matrixShapeSubstationCoordinates.getChildren().forEach(node -> {
+            if (node instanceof HBox) {
+                int nodeRow = (int) ((Spinner<?>) ((HBox) node).getChildren().get(1)).getValue();
+                int nodeColumn = (int) ((Spinner<?>) ((HBox) node).getChildren().get(2)).getValue();
+                String nodeId = ((Label) ((HBox) node).getChildren().get(3)).getText();
+                if (nodeRow > 0 && nodeColumn > 0) {
+                    matrix[nodeRow - 1][nodeColumn - 1] = nodeId;
+                }
+            }
+        });
+        this.model.setMatrix(matrix);
+    }
+
+    public void resetMatrixShape(ActionEvent event) {
+        event.consume();
+        this.matrixShapeSubstationCoordinates.getChildren().forEach(node -> {
+            if (node instanceof HBox) {
+                if (((HBox) node).getChildren().get(1) instanceof Spinner<?> &&
+                        ((Spinner<?>) ((HBox) node).getChildren().get(1)).getValue() instanceof Integer) {
+                    ((Spinner<Integer>) ((HBox) node).getChildren().get(1)).getValueFactory().setValue(0);
+                    ((Spinner<Integer>) ((HBox) node).getChildren().get(2)).getValueFactory().setValue(0);
+                }
+            }
+        });
+    }
+
+    private void showMatrixNodes() {
+        matrixShapeVBox.visibleProperty().setValue(zoneLayoutComboBox.valueProperty().getValue() instanceof MatrixZoneLayoutFactory);
+    }
 }
diff --git a/diagram-viewer/src/main/resources/sld/matrixShapeView.fxml b/diagram-viewer/src/main/resources/sld/matrixShapeView.fxml
new file mode 100644
index 0000000..066ba4a
--- /dev/null
+++ b/diagram-viewer/src/main/resources/sld/matrixShapeView.fxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<HBox style="fx-border-width: 3" xmlns="http://javafx.com/javafx/21.0.2"
+      xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.powsybl.diagram.viewer.sld.MatrixShapeViewController">
+    <Label fx:id="substationName" textAlignment="CENTER" minWidth="80" maxWidth="80"/>
+    <Spinner fx:id="row" editable="true" maxWidth="80" minWidth="80">
+        <valueFactory>
+            <SpinnerValueFactory.IntegerSpinnerValueFactory min="0" max="50" />
+        </valueFactory>
+    </Spinner>
+    <Spinner fx:id="column" editable="true" maxWidth="80" minWidth="80">
+        <valueFactory>
+            <SpinnerValueFactory.IntegerSpinnerValueFactory min="0" max="50"/>
+        </valueFactory>
+    </Spinner>
+    <Label fx:id="substationId" visible="false"/>
+</HBox>
diff --git a/diagram-viewer/src/main/resources/sld/view.fxml b/diagram-viewer/src/main/resources/sld/view.fxml
index 055731c..75f64d5 100644
--- a/diagram-viewer/src/main/resources/sld/view.fxml
+++ b/diagram-viewer/src/main/resources/sld/view.fxml
@@ -4,6 +4,7 @@
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Text?>
 <BorderPane xmlns="http://javafx.com/javafx/21.0.2" xmlns:fx="http://javafx.com/fxml/1"
             prefHeight="900.0" prefWidth="1000.0"
             fx:controller="com.powsybl.diagram.viewer.sld.SingleLineDiagramViewController">
@@ -52,29 +53,46 @@
                             </VBox.margin>
                             <Spinner fx:id="animationThreshold1Spinner" maxWidth="80" editable="true">
                                 <valueFactory>
-                                    <SpinnerValueFactory.DoubleSpinnerValueFactory min="0" max="300" amountToStepBy="5"/>
+                                    <SpinnerValueFactory.DoubleSpinnerValueFactory min="0" max="300"
+                                                                                   amountToStepBy="5"/>
                                 </valueFactory>
                             </Spinner>
                             <Spinner fx:id="animationThreshold2Spinner" maxWidth="80" editable="true">
                                 <valueFactory>
-                                    <SpinnerValueFactory.DoubleSpinnerValueFactory min="0" max="300" amountToStepBy="5"/>
+                                    <SpinnerValueFactory.DoubleSpinnerValueFactory min="0" max="300"
+                                                                                   amountToStepBy="5"/>
                                 </valueFactory>
                             </Spinner>
                         </HBox>
-                        <Label text="Zone Layout:"/>
+                        <Label text="Zone Layout :"/>
                         <ComboBox fx:id="zoneLayoutComboBox"/>
+                        <VBox fx:id="matrixShapeVBox">
+                            <HBox>
+                                <Button fx:id="updateSldButton" text="Update matrix"/>
+                                <Button text="Reset matrix" onAction="#resetMatrixShape"/>
+                            </HBox>
+                            <HBox fx:id="matrixShapeHBoxTitle">
+                                <Label text="Substation  " minWidth="80" maxWidth="80"/>
+                                <Label text="Row  " minWidth="80" maxWidth="80"/>
+                                <Label text="Column  " minWidth="80" maxWidth="80"/>
+                            </HBox>
+                            <ScrollPane fitToHeight="true" fitToWidth="true" minViewportHeight="220">
+                                <VBox fx:id="matrixShapeSubstationCoordinates"/>
+                            </ScrollPane>
+                        </VBox>
                         <Label text="Substation Layout:"/>
                         <ComboBox fx:id="substationLayoutComboBox"/>
                         <Label text="VoltageLevel Layout:"/>
-                        <EnumChoiceBox enumType="com.powsybl.diagram.viewer.sld.SingleLineDiagramModel$VoltageLevelLayoutFactoryType" fx:id="voltageLevelLayoutComboBox" initialValue="SMART"/>
-                        <VBox fx:id="positionVoltageLevelLayoutFactoryParameters">
-                            <CheckBox fx:id="stackFeedersCheckBox" text="Stack feeders" selected="true"/>
-                            <CheckBox fx:id="exceptionWhenPatternUnhandledCheckBox" text="Exception when pattern unhandled"/>
-                            <CheckBox fx:id="handleShuntsCheckBox" text="Handle shunts"/>
-                            <CheckBox fx:id="removeFictitiousNodesCheckBox" text="Remove fictitious nodes" selected="true"/>
-                            <CheckBox fx:id="substituteSingularFictitiousNodesCheckBox" text="Substitute singular fictitious nodes" selected="true"/>
-                            <CheckBox fx:id="substituteInternalMiddle2wtByEquipmentNodesCheckBox" text="Intern cells for internal 2wt" selected="true"/>
-                        </VBox>
+                        <EnumChoiceBox
+                                enumType="com.powsybl.diagram.viewer.sld.SingleLineDiagramModel$VoltageLevelLayoutFactoryType"
+                                fx:id="voltageLevelLayoutComboBox" initialValue="SMART"/>
+                        <CheckBox fx:id="stackFeedersCheckBox" text="Stack feeders" selected="true"/>
+                        <CheckBox fx:id="exceptionWhenPatternUnhandledCheckBox"
+                                  text="Exception when pattern unhandled"/>
+                        <CheckBox fx:id="handleShuntsCheckBox" text="Handle shunts"/>
+                        <CheckBox fx:id="removeFictitiousNodesCheckBox" text="Remove fictitious nodes" selected="true"/>
+                        <CheckBox fx:id="substituteSingularFictitiousNodesCheckBox"
+                                  text="Substitute singular fictitious nodes" selected="true"/>
                         <Label text="CGMES-DL Diagrams:"/>
                         <ComboBox fx:id="cgmesDLDiagramsComboBox"/>
                         <Separator>
@@ -150,7 +168,8 @@
                                 <SpinnerValueFactory.DoubleSpinnerValueFactory min="1" max="20" amountToStepBy="1"/>
                             </valueFactory>
                         </Spinner>
-                        <CheckBox fx:id="adaptCellHeightToContentCheckBox" text="Adapt cell height to content" selected="true"/>
+                        <CheckBox fx:id="adaptCellHeightToContentCheckBox" text="Adapt cell height to content"
+                                  selected="true"/>
                         <Label text="Min space between components:"/>
                         <Spinner fx:id="minSpaceBetweenComponentsSpinner" editable="true">
                             <valueFactory>
@@ -164,7 +183,8 @@
                             </valueFactory>
                         </Spinner>
                         <Label text="BusBar alignment:"/>
-                        <EnumChoiceBox enumType="com.powsybl.sld.layout.LayoutParameters$Alignment" fx:id="busBarAlignmentChoice" initialValue="FIRST"/>
+                        <EnumChoiceBox enumType="com.powsybl.sld.layout.LayoutParameters$Alignment"
+                                       fx:id="busBarAlignmentChoice" initialValue="FIRST"/>
                         <Label text="Space for feeder infos:"/>
                         <Spinner fx:id="spaceForFeederInfosSpinner" editable="true">
                             <valueFactory>
@@ -192,7 +212,8 @@
                         </Spinner>
                         <CheckBox fx:id="addNodesInfosCheckBox" text="Add nodes infos"/>
                         <CheckBox fx:id="feederInfoSymmetryCheckBox" text="Feeder info symmetry"/>
-                        <CheckBox fx:id="avoidSVGComponentsDuplicationCheckBox" text="Avoid SVG components duplication"/>
+                        <CheckBox fx:id="avoidSVGComponentsDuplicationCheckBox"
+                                  text="Avoid SVG components duplication"/>
                         <Label text="Feeder infos outer margin:"/>
                         <Spinner fx:id="feederInfosOuterMarginSpinner" editable="true">
                             <valueFactory>
@@ -205,6 +226,7 @@
                                 <SpinnerValueFactory.DoubleSpinnerValueFactory min="0" max="200" amountToStepBy="1"/>
                             </valueFactory>
                         </Spinner>
+                        <Label text="Matrix shape :"/>
                     </VBox>
                 </ScrollPane>
             </VBox>