review

Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>

Author: samirromdhani

single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGLegendWriter.java

@@ -64,20 +64,12 @@ protected List<BusLegendInfo> getBusLegendInfos(VoltageLevelGraph graph) {
                     List<BusLegendInfo.Caption> captions = new ArrayList<>(4);
                     captions.add(new BusLegendInfo.Caption(valueFormatter.formatVoltage(bus.getV(), "kV"), "v"));
                     captions.add(new BusLegendInfo.Caption(valueFormatter.formatAngleInDegrees(bus.getAngle()), "angle"));
-                    if (hasFictitiousInjection(bus.getFictitiousP0())) {
-                        captions.add(new BusLegendInfo.Caption(valueFormatter.formatPower(bus.getFictitiousP0(), withDefaultUnit(svgParameters.getActivePowerUnit(), "MW")), "fictitiousP0"));
-                    }
-                    if (hasFictitiousInjection(bus.getFictitiousQ0())) {
-                        captions.add(new BusLegendInfo.Caption(valueFormatter.formatPower(bus.getFictitiousQ0(), withDefaultUnit(svgParameters.getReactivePowerUnit(), "MVar")), "fictitiousQ0"));
-                    }
+                    captions.add(new BusLegendInfo.Caption(valueFormatter.formatPower(bus.getFictitiousP0(), withDefaultUnit(svgParameters.getActivePowerUnit(), "MW")), "fictitiousP0"));
+                    captions.add(new BusLegendInfo.Caption(valueFormatter.formatPower(bus.getFictitiousQ0(), withDefaultUnit(svgParameters.getReactivePowerUnit(), "MVar")), "fictitiousQ0"));
                     return new BusLegendInfo(bus.getId(), captions);
                 }).toList();
     }
 
-    private static boolean hasFictitiousInjection(double value) {
-        return !Double.isNaN(value) && value != 0d;
-    }
-
     private static String withDefaultUnit(String configuredUnit, String defaultUnit) {
         return configuredUnit == null || configuredUnit.isEmpty() ? defaultUnit : configuredUnit;
     }
@@ -97,9 +89,7 @@ private void drawBusLegendInfo(BusLegendInfo busLegendInfo, double xShift, doubl
         g.appendChild(circle);
 
         // legend nodes
-        boolean isExtendedLegend = busLegendInfo.captions().size() > 2;
-        double padding = isExtendedLegend ? 2.0 : 2.5;
-        double paddingStep = isExtendedLegend ? 1.0 : 1.5;
+        double padding = 2.5;
         for (BusLegendInfo.Caption caption : busLegendInfo.captions()) {
             Element label = g.getOwnerDocument().createElement("text");
             writeStyleClasses(label, styleProvider.getBusLegendCaptionStyles(caption), StyleClassConstants.BUS_LEGEND_INFO);
@@ -109,7 +99,8 @@ private void drawBusLegendInfo(BusLegendInfo busLegendInfo, double xShift, doubl
             Text textNode = g.getOwnerDocument().createTextNode(caption.label());
             label.appendChild(textNode);
             g.appendChild(label);
-            padding += paddingStep;
+
+            padding += 1.5;
         }
     }
 }

single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java

@@ -132,7 +132,7 @@ private double getDiagramWidth(Graph graph, LayoutParameters layoutParameters) {
     private double getDiagramHeight(Graph graph, LayoutParameters layoutParameters) {
         double height = graph.getHeight() + layoutParameters.getDiagramPadding().top() + layoutParameters.getDiagramPadding().bottom();
         if (graph instanceof VoltageLevelGraph && svgParameters.isBusesLegendAdded()) {
-            height += 6 * CIRCLE_RADIUS_NODE_INFOS_SIZE;
+            height += 8 * CIRCLE_RADIUS_NODE_INFOS_SIZE;
         }
         return height;
     }