diff --git a/diagram-util/src/main/java/com/powsybl/diagram/util/ValueFormatter.java b/diagram-util/src/main/java/com/powsybl/diagram/util/ValueFormatter.java index bbc757743..018648c09 100644 --- a/diagram-util/src/main/java/com/powsybl/diagram/util/ValueFormatter.java +++ b/diagram-util/src/main/java/com/powsybl/diagram/util/ValueFormatter.java @@ -20,13 +20,15 @@ public class ValueFormatter { private final int powerValuePrecision; private final int voltageValuePrecision; + private final int currentValuePrecision; private final int angleValuePrecision; private final DecimalFormat format; private final String undefinedValueSymbol; - public ValueFormatter(int powerValuePrecision, int voltageValuePrecision, int angleValuePrecision, Locale locale, String undefinedValueSymbol) { + public ValueFormatter(int powerValuePrecision, int voltageValuePrecision, int currentValuePrecision, int angleValuePrecision, Locale locale, String undefinedValueSymbol) { this.powerValuePrecision = powerValuePrecision; this.voltageValuePrecision = voltageValuePrecision; + this.currentValuePrecision = currentValuePrecision; this.angleValuePrecision = angleValuePrecision; this.format = new DecimalFormat(); format.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(locale)); @@ -63,4 +65,14 @@ private void setFractionDigits(int precision) { format.setMaximumFractionDigits(precision); format.setMinimumFractionDigits(precision); } + + public String formatCurrent(double current, String unit) { + setFractionDigits(currentValuePrecision); + String valueFormatted = Double.isNaN(current) ? undefinedValueSymbol : format.format(current); + return unit.isEmpty() ? valueFormatted : (valueFormatted + " " + unit); + } + + public String formatCurrent(double current) { + return formatCurrent(current, ""); + } } diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/AbstractStyleProvider.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/AbstractStyleProvider.java index 1ece00f5d..4306a9324 100644 --- a/network-area-diagram/src/main/java/com/powsybl/nad/svg/AbstractStyleProvider.java +++ b/network-area-diagram/src/main/java/com/powsybl/nad/svg/AbstractStyleProvider.java @@ -9,6 +9,8 @@ import com.powsybl.commons.config.BaseVoltagesConfig; import com.powsybl.nad.model.*; import org.apache.commons.io.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.UncheckedIOException; @@ -22,6 +24,8 @@ */ public abstract class AbstractStyleProvider implements StyleProvider { + protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractStyleProvider.class); + private final BaseVoltagesConfig baseVoltagesConfig; protected AbstractStyleProvider() { @@ -87,11 +91,22 @@ public List getSideEdgeStyleClasses(BranchEdge edge, BranchEdge.Side sid @Override public List getEdgeInfoStyles(EdgeInfo info) { List styles = new LinkedList<>(); - if (info.getInfoType().equals(EdgeInfo.ACTIVE_POWER)) { - styles.add(CLASSES_PREFIX + "active"); - } else if (info.getInfoType().equals(EdgeInfo.REACTIVE_POWER)) { - styles.add(CLASSES_PREFIX + "reactive"); + String infoType = info.getInfoType(); + switch (infoType) { + case EdgeInfo.ACTIVE_POWER: + styles.add(CLASSES_PREFIX + "active"); + break; + case EdgeInfo.REACTIVE_POWER: + styles.add(CLASSES_PREFIX + "reactive"); + break; + case EdgeInfo.CURRENT: + styles.add(CLASSES_PREFIX + "current"); + break; + default: + LOGGER.warn("The \"{}\" type of information is not handled", infoType); + break; } + info.getDirection().ifPresent(direction -> styles.add( CLASSES_PREFIX + (direction == EdgeInfo.Direction.IN ? "state-in" : "state-out"))); return styles; diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/EdgeInfo.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/EdgeInfo.java index 91af3820c..cee0e1971 100644 --- a/network-area-diagram/src/main/java/com/powsybl/nad/svg/EdgeInfo.java +++ b/network-area-diagram/src/main/java/com/powsybl/nad/svg/EdgeInfo.java @@ -15,6 +15,7 @@ public class EdgeInfo { public static final String ACTIVE_POWER = "ActivePower"; public static final String REACTIVE_POWER = "ReactivePower"; + public static final String CURRENT = "Current"; private final String infoType; private final Direction arrowDirection; diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/LabelProvider.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/LabelProvider.java index 030ab60c4..1dc52ee5c 100644 --- a/network-area-diagram/src/main/java/com/powsybl/nad/svg/LabelProvider.java +++ b/network-area-diagram/src/main/java/com/powsybl/nad/svg/LabelProvider.java @@ -9,14 +9,15 @@ import com.powsybl.nad.model.*; import java.util.List; +import java.util.Optional; /** * @author Florian Dupuy */ public interface LabelProvider { - List getEdgeInfos(Graph graph, BranchEdge edge, BranchEdge.Side side); + Optional getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side); - List getEdgeInfos(Graph graph, ThreeWtEdge edge); + Optional getEdgeInfo(Graph graph, ThreeWtEdge edge); String getLabel(Edge edge); diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgParameters.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgParameters.java index 8e99aafac..85612f6aa 100644 --- a/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgParameters.java +++ b/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgParameters.java @@ -52,9 +52,12 @@ public class SvgParameters { private int voltageValuePrecision = 1; private int powerValuePrecision = 0; private int angleValuePrecision = 1; + private int currentValuePrecision = 0; + private EdgeInfoEnum edgeInfoDisplayed = EdgeInfoEnum.ACTIVE_POWER; private double pstArrowHeadSize = 8; private String undefinedValueSymbol = ""; + public enum CssLocation { INSERTED_IN_SVG, EXTERNAL_IMPORTED, EXTERNAL_NO_IMPORT } @@ -103,6 +106,8 @@ public SvgParameters(SvgParameters other) { this.voltageValuePrecision = other.voltageValuePrecision; this.powerValuePrecision = other.powerValuePrecision; this.angleValuePrecision = other.angleValuePrecision; + this.currentValuePrecision = other.currentValuePrecision; + this.edgeInfoDisplayed = other.edgeInfoDisplayed; this.pstArrowHeadSize = other.pstArrowHeadSize; this.undefinedValueSymbol = other.undefinedValueSymbol; } @@ -429,6 +434,15 @@ public SvgParameters setPowerValuePrecision(int powerValuePrecision) { return this; } + public int getCurrentValuePrecision() { + return currentValuePrecision; + } + + public SvgParameters setCurrentValuePrecision(int currentValuePrecision) { + this.currentValuePrecision = currentValuePrecision; + return this; + } + public int getAngleValuePrecision() { return angleValuePrecision; } @@ -439,7 +453,22 @@ public SvgParameters setAngleValuePrecision(int angleValuePrecision) { } public ValueFormatter createValueFormatter() { - return new ValueFormatter(powerValuePrecision, voltageValuePrecision, angleValuePrecision, Locale.forLanguageTag(languageTag), undefinedValueSymbol); + return new ValueFormatter(powerValuePrecision, voltageValuePrecision, currentValuePrecision, angleValuePrecision, Locale.forLanguageTag(languageTag), undefinedValueSymbol); + } + + public enum EdgeInfoEnum { + ACTIVE_POWER, + REACTIVE_POWER, + CURRENT; + } + + public EdgeInfoEnum getEdgeInfoDisplayed() { + return this.edgeInfoDisplayed; + } + + public SvgParameters setEdgeInfoDisplayed(EdgeInfoEnum edgeInfoDisplayed) { + this.edgeInfoDisplayed = edgeInfoDisplayed; + return this; } public double getPstArrowHeadSize() { diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java index 4e097dc19..edc6014de 100644 --- a/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java +++ b/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java @@ -255,16 +255,21 @@ private void drawHalfEdge(Graph graph, XMLStreamWriter writer, BranchEdge edge, writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(edge.getDiagramId() + "." + side.getNum())); writeStyleClasses(writer, styleProvider.getSideEdgeStyleClasses(edge, side)); if (edge.isVisible(side)) { + Optional edgeInfo = labelProvider.getEdgeInfo(graph, edge, side); if (!graph.isLoop(edge)) { writer.writeEmptyElement(POLYLINE_ELEMENT_NAME); writeStyleClasses(writer, StyleProvider.EDGE_PATH_CLASS, StyleProvider.STRETCHABLE_CLASS, StyleProvider.GLUED_CLASS + "-" + side.getNum()); writer.writeAttribute(POINTS_ATTRIBUTE, getPolylinePointsString(edge, side)); - drawBranchEdgeInfo(graph, writer, edge, side, labelProvider.getEdgeInfos(graph, edge, side)); + if (edgeInfo.isPresent()) { + drawBranchEdgeInfo(graph, writer, edge, side, edgeInfo.get()); + } } else { writer.writeEmptyElement(PATH_ELEMENT_NAME); writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.EDGE_PATH_CLASS); writer.writeAttribute(PATH_D_ATTRIBUTE, getLoopPathString(edge, side)); - drawLoopEdgeInfo(writer, edge, side, labelProvider.getEdgeInfos(graph, edge, side)); + if (edgeInfo.isPresent()) { + drawLoopEdgeInfo(writer, edge, side, edgeInfo.get()); + } } } writer.writeEndElement(); @@ -302,7 +307,10 @@ private void drawThreeWtEdge(Graph graph, XMLStreamWriter writer, ThreeWtEdge ed writeStyleClasses(writer, StyleProvider.EDGE_PATH_CLASS, StyleProvider.STRETCHABLE_CLASS); writer.writeAttribute(POINTS_ATTRIBUTE, getPolylinePointsString(edge)); - drawThreeWtEdgeInfo(graph, writer, edge, labelProvider.getEdgeInfos(graph, edge)); + Optional edgeInfo = labelProvider.getEdgeInfo(graph, edge); + if (edgeInfo.isPresent()) { + drawThreeWtEdgeInfo(graph, writer, edge, edgeInfo.get()); + } writer.writeEndElement(); } @@ -339,46 +347,47 @@ private void draw3WtWinding(ThreeWtEdge edge, ThreeWtNode threeWtNode, XMLStream writer.writeAttribute(CIRCLE_RADIUS_ATTRIBUTE, getFormattedValue(svgParameters.getTransformerCircleRadius())); } - private void drawLoopEdgeInfo(XMLStreamWriter writer, BranchEdge edge, BranchEdge.Side side, List edgeInfos) throws XMLStreamException { - drawEdgeInfo(writer, edgeInfos, edge.getPoints(side).get(1), edge.getEdgeStartAngle(side)); + private void drawLoopEdgeInfo(XMLStreamWriter writer, BranchEdge edge, BranchEdge.Side side, EdgeInfo edgeInfo) throws XMLStreamException { + drawEdgeInfo(writer, edgeInfo, edge.getPoints(side).get(1), edge.getEdgeStartAngle(side)); } - private void drawBranchEdgeInfo(Graph graph, XMLStreamWriter writer, BranchEdge edge, BranchEdge.Side side, List edgeInfos) throws XMLStreamException { + private void drawBranchEdgeInfo(Graph graph, XMLStreamWriter writer, BranchEdge edge, BranchEdge.Side side, EdgeInfo edgeInfo) throws XMLStreamException { VoltageLevelNode vlNode = graph.getVoltageLevelNode(edge, side); BusNode busNode = graph.getBusGraphNode(edge, side); List additionalStyles = List.of(StyleProvider.GLUED_CLASS + "-" + side.getNum()); - drawEdgeInfo(writer, additionalStyles, edgeInfos, getArrowCenter(vlNode, busNode, edge.getPoints(side)), edge.getEdgeEndAngle(side)); + drawEdgeInfo(writer, additionalStyles, edgeInfo, getArrowCenter(vlNode, busNode, edge.getPoints(side)), edge.getEdgeEndAngle(side)); } - private void drawThreeWtEdgeInfo(Graph graph, XMLStreamWriter writer, ThreeWtEdge edge, List edgeInfos) throws XMLStreamException { + private void drawThreeWtEdgeInfo(Graph graph, XMLStreamWriter writer, ThreeWtEdge edge, EdgeInfo edgeInfo) throws XMLStreamException { VoltageLevelNode vlNode = graph.getVoltageLevelNode(edge); BusNode busNode = graph.getBusGraphNode(edge); List additionalStyles = List.of(StyleProvider.GLUED_CLASS + "-1"); - drawEdgeInfo(writer, additionalStyles, edgeInfos, getArrowCenter(vlNode, busNode, edge.getPoints()), edge.getEdgeAngle()); + drawEdgeInfo(writer, additionalStyles, edgeInfo, getArrowCenter(vlNode, busNode, edge.getPoints()), edge.getEdgeAngle()); } - private void drawEdgeInfo(XMLStreamWriter writer, List edgeInfos, Point infoCenter, double edgeAngle) throws XMLStreamException { - drawEdgeInfo(writer, Collections.emptyList(), edgeInfos, infoCenter, edgeAngle); + private void drawEdgeInfo(XMLStreamWriter writer, EdgeInfo edgeInfo, Point infoCenter, double edgeAngle) throws XMLStreamException { + drawEdgeInfo(writer, Collections.emptyList(), edgeInfo, infoCenter, edgeAngle); } - private void drawEdgeInfo(XMLStreamWriter writer, List additionalStyles, List edgeInfos, Point infoCenter, double edgeAngle) throws XMLStreamException { + private void drawEdgeInfo(XMLStreamWriter writer, List additionalStyles, EdgeInfo edgeInfo, Point infoCenter, double edgeAngle) throws XMLStreamException { + writer.writeStartElement(GROUP_ELEMENT_NAME); writeStyleClasses(writer, additionalStyles, StyleProvider.EDGE_INFOS_CLASS); writer.writeAttribute(TRANSFORM_ATTRIBUTE, getTranslateString(infoCenter)); - for (EdgeInfo info : edgeInfos) { - writer.writeStartElement(GROUP_ELEMENT_NAME); - writeStyleClasses(writer, styleProvider.getEdgeInfoStyles(info)); - drawInAndOutArrows(writer, edgeAngle); - Optional externalLabel = info.getExternalLabel(); - if (externalLabel.isPresent()) { - drawLabel(writer, externalLabel.get(), edgeAngle, true); - } - Optional internalLabel = info.getInternalLabel(); - if (internalLabel.isPresent()) { - drawLabel(writer, internalLabel.get(), edgeAngle, false); - } - writer.writeEndElement(); + + writer.writeStartElement(GROUP_ELEMENT_NAME); + writeStyleClasses(writer, styleProvider.getEdgeInfoStyles(edgeInfo)); + drawInAndOutArrows(writer, edgeAngle); + Optional externalLabel = edgeInfo.getExternalLabel(); + if (externalLabel.isPresent()) { + drawLabel(writer, externalLabel.get(), edgeAngle, true); } + Optional internalLabel = edgeInfo.getInternalLabel(); + if (internalLabel.isPresent()) { + drawLabel(writer, internalLabel.get(), edgeAngle, false); + } + writer.writeEndElement(); + writer.writeEndElement(); } diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/DefaultLabelProvider.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/DefaultLabelProvider.java index ba6280619..fa81156e2 100644 --- a/network-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/DefaultLabelProvider.java +++ b/network-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/DefaultLabelProvider.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Optional; /** * @author Florian Dupuy @@ -34,19 +35,19 @@ public DefaultLabelProvider(Network network, SvgParameters svgParameters) { } @Override - public List getEdgeInfos(Graph graph, BranchEdge edge, BranchEdge.Side side) { + public Optional getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) { Terminal terminal = IidmUtils.getTerminalFromEdge(network, edge, side); - return getEdgeInfos(terminal); + return getEdgeInfo(terminal); } @Override - public List getEdgeInfos(Graph graph, ThreeWtEdge edge) { + public Optional getEdgeInfo(Graph graph, ThreeWtEdge edge) { ThreeWindingsTransformer transformer = network.getThreeWindingsTransformer(edge.getEquipmentId()); if (transformer == null) { throw new PowsyblException("Unknown three windings transformer '" + edge.getEquipmentId() + "'"); } Terminal terminal = transformer.getTerminal(IidmUtils.getIidmSideFromThreeWtEdgeSide(edge.getSide())); - return getEdgeInfos(terminal); + return getEdgeInfo(terminal); } @Override @@ -54,13 +55,20 @@ public String getLabel(Edge edge) { return edge.getEquipmentId(); } - private List getEdgeInfos(Terminal terminal) { + private Optional getEdgeInfo(Terminal terminal) { if (terminal == null) { - return Collections.emptyList(); + return Optional.empty(); + } + switch (svgParameters.getEdgeInfoDisplayed()) { + case ACTIVE_POWER: + return Optional.of(new EdgeInfo(EdgeInfo.ACTIVE_POWER, terminal.getP(), valueFormatter::formatPower)); + case REACTIVE_POWER: + return Optional.of(new EdgeInfo(EdgeInfo.REACTIVE_POWER, terminal.getQ(), valueFormatter::formatPower)); + case CURRENT: + return Optional.of(new EdgeInfo(EdgeInfo.CURRENT, terminal.getI(), valueFormatter::formatCurrent)); + default: + return Optional.empty(); } - return List.of( - new EdgeInfo(EdgeInfo.ACTIVE_POWER, terminal.getP(), valueFormatter::formatPower), - new EdgeInfo(EdgeInfo.REACTIVE_POWER, terminal.getQ(), valueFormatter::formatPower)); } @Override diff --git a/network-area-diagram/src/main/resources/nominalStyle.css b/network-area-diagram/src/main/resources/nominalStyle.css index b161fbad5..96132b326 100644 --- a/network-area-diagram/src/main/resources/nominalStyle.css +++ b/network-area-diagram/src/main/resources/nominalStyle.css @@ -10,9 +10,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} diff --git a/network-area-diagram/src/main/resources/topologicalStyle.css b/network-area-diagram/src/main/resources/topologicalStyle.css index dddaa224b..5f16c695b 100644 --- a/network-area-diagram/src/main/resources/topologicalStyle.css +++ b/network-area-diagram/src/main/resources/topologicalStyle.css @@ -10,9 +10,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/EdgeInfoLabelTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/EdgeInfoLabelTest.java index eabf864fb..488b446da 100644 --- a/network-area-diagram/src/test/java/com/powsybl/nad/svg/EdgeInfoLabelTest.java +++ b/network-area-diagram/src/test/java/com/powsybl/nad/svg/EdgeInfoLabelTest.java @@ -19,8 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; -import java.util.Collections; -import java.util.List; +import java.util.Optional; /** * @author Florian Dupuy @@ -47,13 +46,13 @@ protected StyleProvider getStyleProvider(Network network) { protected LabelProvider getLabelProvider(Network network) { return new DefaultLabelProvider(network, getSvgParameters()) { @Override - public List getEdgeInfos(Graph graph, BranchEdge edge, BranchEdge.Side side) { - return Collections.singletonList(new EdgeInfo("test", EdgeInfo.Direction.OUT, internalLabel, externalLabel)); + public Optional getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) { + return Optional.of(new EdgeInfo("test", EdgeInfo.Direction.OUT, internalLabel, externalLabel)); } @Override - public List getEdgeInfos(Graph graph, ThreeWtEdge edge) { - return Collections.singletonList(new EdgeInfo("test", EdgeInfo.Direction.IN, internalLabel, externalLabel)); + public Optional getEdgeInfo(Graph graph, ThreeWtEdge edge) { + return Optional.of(new EdgeInfo("test", EdgeInfo.Direction.IN, internalLabel, externalLabel)); } @Override diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/NominalVoltageStyleTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/NominalVoltageStyleTest.java index aeae6a1bb..b59ebf657 100644 --- a/network-area-diagram/src/test/java/com/powsybl/nad/svg/NominalVoltageStyleTest.java +++ b/network-area-diagram/src/test/java/com/powsybl/nad/svg/NominalVoltageStyleTest.java @@ -53,6 +53,7 @@ void testIEEE30() { } @Test + void testIEEE14() { Network network = IeeeCdfNetworkFactory.create14Solved(); assertEquals(toString("/IEEE_14_bus.svg"), generateSvgString(network, "/IEEE_14_bus.svg")); diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/SvgParametersTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/SvgParametersTest.java index 02fc4ac22..76a65b277 100644 --- a/network-area-diagram/src/test/java/com/powsybl/nad/svg/SvgParametersTest.java +++ b/network-area-diagram/src/test/java/com/powsybl/nad/svg/SvgParametersTest.java @@ -53,6 +53,8 @@ void test() { .setVoltageValuePrecision(0) .setAngleValuePrecision(2) .setPowerValuePrecision(3) + .setCurrentValuePrecision(1) + .setEdgeInfoDisplayed(SvgParameters.EdgeInfoEnum.REACTIVE_POWER) .setPstArrowHeadSize(20) .setUndefinedValueSymbol("\u002A"); @@ -97,6 +99,8 @@ void test() { assertEquals(svgParameters0.getVoltageValuePrecision(), svgParameters1.getVoltageValuePrecision()); assertEquals(svgParameters0.getAngleValuePrecision(), svgParameters1.getAngleValuePrecision()); assertEquals(svgParameters0.getPowerValuePrecision(), svgParameters1.getPowerValuePrecision()); + assertEquals(svgParameters0.getCurrentValuePrecision(), svgParameters1.getCurrentValuePrecision()); + assertEquals(svgParameters0.getEdgeInfoDisplayed(), svgParameters1.getEdgeInfoDisplayed()); assertEquals(svgParameters0.getPstArrowHeadSize(), svgParameters1.getPstArrowHeadSize(), 0); assertEquals(svgParameters0.getUndefinedValueSymbol(), svgParameters1.getUndefinedValueSymbol()); } diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/TypeOfEdgeInfoTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/TypeOfEdgeInfoTest.java new file mode 100644 index 000000000..282fff446 --- /dev/null +++ b/network-area-diagram/src/test/java/com/powsybl/nad/svg/TypeOfEdgeInfoTest.java @@ -0,0 +1,66 @@ +/** + * Copyright (c) 2023, RTE (http://www.rte-france.com) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +package com.powsybl.nad.svg; + +import com.powsybl.iidm.network.Line; +import com.powsybl.iidm.network.Network; +import com.powsybl.nad.AbstractTest; +import com.powsybl.nad.layout.LayoutParameters; +import com.powsybl.nad.svg.iidm.DefaultLabelProvider; +import com.powsybl.nad.svg.iidm.NominalVoltageStyleProvider; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +/** + * @author Sophie Frasnedo + */ +class TypeOfEdgeInfoTest extends AbstractTest { + + Network network; + + @BeforeEach + public void setup() { + setLayoutParameters(new LayoutParameters()); + setSvgParameters(new SvgParameters() + .setInsertNameDesc(true) + .setSvgWidthAndHeightAdded(true) + .setVoltageLevelDetails(false) + .setFixedWidth(800) + .setEdgeStartShift(2)); + network = NetworkTestFactory.createTwoVoltageLevels(); + Line l1 = network.getLine("l1"); + l1.getTerminal1().setP(100).setQ(10); + l1.getTerminal2().setP(99).setQ(11); + l1.getTerminal1().getBusView().getBus().setV(380); + l1.getTerminal2().getBusView().getBus().setV(379); + } + + @Override + protected StyleProvider getStyleProvider(Network network) { + return new NominalVoltageStyleProvider(network); + } + + @Override + protected LabelProvider getLabelProvider(Network network) { + return new DefaultLabelProvider(network, getSvgParameters()); + } + + @Test + void testReactivePowerInfoLabel() { + getSvgParameters().setEdgeInfoDisplayed(SvgParameters.EdgeInfoEnum.REACTIVE_POWER); + assertEquals(toString("/edge_info_reactive_power.svg"), generateSvgString(network, "/edge_info_reactive_power.svg")); + } + + @Test + void testCurrentInfoLabel() { + getSvgParameters().setEdgeInfoDisplayed(SvgParameters.EdgeInfoEnum.CURRENT); + assertEquals(toString("/edge_info_current.svg"), generateSvgString(network, "/edge_info_current.svg")); + } + +} diff --git a/network-area-diagram/src/test/resources/3wt.svg b/network-area-diagram/src/test/resources/3wt.svg index 0a11ccb2e..07d134530 100644 --- a/network-area-diagram/src/test/resources/3wt.svg +++ b/network-area-diagram/src/test/resources/3wt.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -94,13 +93,6 @@ - - - - - - - @@ -114,13 +106,6 @@ - - - - - - - @@ -134,13 +119,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/3wt_disconnected.svg b/network-area-diagram/src/test/resources/3wt_disconnected.svg index 6373b2f08..f8c928428 100644 --- a/network-area-diagram/src/test/resources/3wt_disconnected.svg +++ b/network-area-diagram/src/test/resources/3wt_disconnected.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -93,13 +92,6 @@ - - - - - - - @@ -113,13 +105,6 @@ - - - - - - - @@ -133,13 +118,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg b/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg index 67b228ace..a72e1b3a0 100644 --- a/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg +++ b/network-area-diagram/src/test/resources/3wt_disconnected_topological.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -158,13 +157,6 @@ - - - - - - - @@ -178,13 +170,6 @@ - - - - - - - @@ -198,13 +183,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/3wt_partial.svg b/network-area-diagram/src/test/resources/3wt_partial.svg index ea2651e04..6b08a116d 100644 --- a/network-area-diagram/src/test/resources/3wt_partial.svg +++ b/network-area-diagram/src/test/resources/3wt_partial.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -86,13 +85,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_118_bus.svg b/network-area-diagram/src/test/resources/IEEE_118_bus.svg index e0b929ea1..e2d7b0960 100644 --- a/network-area-diagram/src/test/resources/IEEE_118_bus.svg +++ b/network-area-diagram/src/test/resources/IEEE_118_bus.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -1031,13 +1030,6 @@ - - - - - - - @@ -1050,13 +1042,6 @@ - - - - - - - @@ -1072,13 +1057,6 @@ - - - - - - - @@ -1091,13 +1069,6 @@ - - - - - - - @@ -1113,13 +1084,6 @@ - - - - - - - @@ -1132,13 +1096,6 @@ - - - - - - - @@ -1154,13 +1111,6 @@ - - - - - - - @@ -1173,13 +1123,6 @@ - - - - - - - @@ -1195,13 +1138,6 @@ - - - - - - - @@ -1214,13 +1150,6 @@ - - - - - - - @@ -1236,13 +1165,6 @@ - - - - - - - @@ -1255,13 +1177,6 @@ - - - - - - - @@ -1277,13 +1192,6 @@ - - - - - - - @@ -1296,13 +1204,6 @@ - - - - - - - @@ -1318,13 +1219,6 @@ - - - - - - - @@ -1337,13 +1231,6 @@ - - - - - - - @@ -1359,13 +1246,6 @@ - - - - - - - @@ -1378,13 +1258,6 @@ - - - - - - - @@ -1400,13 +1273,6 @@ - - - - - - - @@ -1419,13 +1285,6 @@ - - - - - - - @@ -1441,13 +1300,6 @@ - - - - - - - @@ -1460,13 +1312,6 @@ - - - - - - - @@ -1482,13 +1327,6 @@ - - - - - - - @@ -1501,13 +1339,6 @@ - - - - - - - @@ -1523,13 +1354,6 @@ - - - - - - - @@ -1542,13 +1366,6 @@ - - - - - - - @@ -1564,13 +1381,6 @@ - - - - - - - @@ -1583,13 +1393,6 @@ - - - - - - - @@ -1605,13 +1408,6 @@ - - - - - - - @@ -1624,13 +1420,6 @@ - - - - - - - @@ -1646,13 +1435,6 @@ - - - - - - - @@ -1665,13 +1447,6 @@ - - - - - - - @@ -1687,13 +1462,6 @@ - - - - - - - @@ -1706,13 +1474,6 @@ - - - - - - - @@ -1728,13 +1489,6 @@ - - - - - - - @@ -1747,13 +1501,6 @@ - - - - - - - @@ -1769,13 +1516,6 @@ - - - - - - - @@ -1788,13 +1528,6 @@ - - - - - - - @@ -1810,13 +1543,6 @@ - - - - - - - @@ -1829,13 +1555,6 @@ - - - - - - - @@ -1851,13 +1570,6 @@ - - - - - - - @@ -1870,13 +1582,6 @@ - - - - - - - @@ -1892,13 +1597,6 @@ - - - - - - - @@ -1911,13 +1609,6 @@ - - - - - - - @@ -1933,13 +1624,6 @@ - - - - - - - @@ -1952,13 +1636,6 @@ - - - - - - - @@ -1974,13 +1651,6 @@ - - - - - - - @@ -1993,13 +1663,6 @@ - - - - - - - @@ -2015,13 +1678,6 @@ - - - - - - - @@ -2034,13 +1690,6 @@ - - - - - - - @@ -2056,13 +1705,6 @@ - - - - - - - @@ -2075,13 +1717,6 @@ - - - - - - - @@ -2097,13 +1732,6 @@ - - - - - - - @@ -2116,13 +1744,6 @@ - - - - - - - @@ -2138,13 +1759,6 @@ - - - - - - - @@ -2157,13 +1771,6 @@ - - - - - - - @@ -2179,13 +1786,6 @@ - - - - - - - @@ -2198,13 +1798,6 @@ - - - - - - - @@ -2220,13 +1813,6 @@ - - - - - - - @@ -2239,13 +1825,6 @@ - - - - - - - @@ -2261,13 +1840,6 @@ - - - - - - - @@ -2280,13 +1852,6 @@ - - - - - - - @@ -2302,13 +1867,6 @@ - - - - - - - @@ -2321,13 +1879,6 @@ - - - - - - - @@ -2343,13 +1894,6 @@ - - - - - - - @@ -2362,13 +1906,6 @@ - - - - - - - @@ -2384,13 +1921,6 @@ - - - - - - - @@ -2403,13 +1933,6 @@ - - - - - - - @@ -2425,13 +1948,6 @@ - - - - - - - @@ -2444,13 +1960,6 @@ - - - - - - - @@ -2466,13 +1975,6 @@ - - - - - - - @@ -2485,13 +1987,6 @@ - - - - - - - @@ -2507,13 +2002,6 @@ - - - - - - - @@ -2526,13 +2014,6 @@ - - - - - - - @@ -2548,13 +2029,6 @@ - - - - - - - @@ -2567,13 +2041,6 @@ - - - - - - - @@ -2589,26 +2056,12 @@ - - - - - - - - - - - - - - - - - - + + + + @@ -2630,13 +2083,6 @@ - - - - - - - @@ -2649,13 +2095,6 @@ - - - - - - - @@ -2671,13 +2110,6 @@ - - - - - - - @@ -2690,13 +2122,6 @@ - - - - - - - @@ -2712,13 +2137,6 @@ - - - - - - - @@ -2731,13 +2149,6 @@ - - - - - - - @@ -2753,13 +2164,6 @@ - - - - - - - @@ -2772,13 +2176,6 @@ - - - - - - - @@ -2794,13 +2191,6 @@ - - - - - - - @@ -2813,13 +2203,6 @@ - - - - - - - @@ -2835,13 +2218,6 @@ - - - - - - - @@ -2854,13 +2230,6 @@ - - - - - - - @@ -2876,13 +2245,6 @@ - - - - - - - @@ -2895,13 +2257,6 @@ - - - - - - - @@ -2917,13 +2272,6 @@ - - - - - - - @@ -2936,13 +2284,6 @@ - - - - - - - @@ -2958,13 +2299,6 @@ - - - - - - - @@ -2977,13 +2311,6 @@ - - - - - - - @@ -2999,13 +2326,6 @@ - - - - - - - @@ -3018,13 +2338,6 @@ - - - - - - - @@ -3040,13 +2353,6 @@ - - - - - - - @@ -3059,13 +2365,6 @@ - - - - - - - @@ -3081,13 +2380,6 @@ - - - - - - - @@ -3100,13 +2392,6 @@ - - - - - - - @@ -3122,13 +2407,6 @@ - - - - - - - @@ -3141,13 +2419,6 @@ - - - - - - - @@ -3167,13 +2438,6 @@ - - - - - - - @@ -3186,13 +2450,6 @@ - - - - - - - @@ -3208,13 +2465,6 @@ - - - - - - - @@ -3227,13 +2477,6 @@ - - - - - - - @@ -3249,13 +2492,6 @@ - - - - - - - @@ -3268,13 +2504,6 @@ - - - - - - - @@ -3290,13 +2519,6 @@ - - - - - - - @@ -3309,13 +2531,6 @@ - - - - - - - @@ -3331,13 +2546,6 @@ - - - - - - - @@ -3350,13 +2558,6 @@ - - - - - - - @@ -3372,13 +2573,6 @@ - - - - - - - @@ -3391,13 +2585,6 @@ - - - - - - - @@ -3413,13 +2600,6 @@ - - - - - - - @@ -3432,13 +2612,6 @@ - - - - - - - @@ -3454,13 +2627,6 @@ - - - - - - - @@ -3473,13 +2639,6 @@ - - - - - - - @@ -3495,13 +2654,6 @@ - - - - - - - @@ -3514,13 +2666,6 @@ - - - - - - - @@ -3536,13 +2681,6 @@ - - - - - - - @@ -3555,13 +2693,6 @@ - - - - - - - @@ -3577,13 +2708,6 @@ - - - - - - - @@ -3596,13 +2720,6 @@ - - - - - - - @@ -3618,13 +2735,6 @@ - - - - - - - @@ -3637,13 +2747,6 @@ - - - - - - - @@ -3659,13 +2762,6 @@ - - - - - - - @@ -3678,13 +2774,6 @@ - - - - - - - @@ -3704,13 +2793,6 @@ - - - - - - - @@ -3723,13 +2805,6 @@ - - - - - - - @@ -3745,13 +2820,6 @@ - - - - - - - @@ -3764,13 +2832,6 @@ - - - - - - - @@ -3786,13 +2847,6 @@ - - - - - - - @@ -3805,13 +2859,6 @@ - - - - - - - @@ -3827,13 +2874,6 @@ - - - - - - - @@ -3846,13 +2886,6 @@ - - - - - - - @@ -3868,13 +2901,6 @@ - - - - - - - @@ -3887,13 +2913,6 @@ - - - - - - - @@ -3909,13 +2928,6 @@ - - - - - - - @@ -3928,13 +2940,6 @@ - - - - - - - @@ -3950,13 +2955,6 @@ - - - - - - - @@ -3969,13 +2967,6 @@ - - - - - - - @@ -3991,13 +2982,6 @@ - - - - - - - @@ -4010,13 +2994,6 @@ - - - - - - - @@ -4032,13 +3009,6 @@ - - - - - - - @@ -4051,13 +3021,6 @@ - - - - - - - @@ -4073,13 +3036,6 @@ - - - - - - - @@ -4092,13 +3048,6 @@ - - - - - - - @@ -4114,13 +3063,6 @@ - - - - - - - @@ -4133,13 +3075,6 @@ - - - - - - - @@ -4155,13 +3090,6 @@ - - - - - - - @@ -4174,13 +3102,6 @@ - - - - - - - @@ -4196,13 +3117,6 @@ - - - - - - - @@ -4215,13 +3129,6 @@ - - - - - - - @@ -4237,13 +3144,6 @@ - - - - - - - @@ -4256,13 +3156,6 @@ - - - - - - - @@ -4278,13 +3171,6 @@ - - - - - - - @@ -4297,13 +3183,6 @@ - - - - - - - @@ -4319,26 +3198,12 @@ - - - - - - - - - - - - - - - - - - + + + + @@ -4360,13 +3225,6 @@ - - - - - - - @@ -4379,13 +3237,6 @@ - - - - - - - @@ -4401,13 +3252,6 @@ - - - - - - - @@ -4420,13 +3264,6 @@ - - - - - - - @@ -4446,13 +3283,6 @@ - - - - - - - @@ -4465,13 +3295,6 @@ - - - - - - - @@ -4487,13 +3310,6 @@ - - - - - - - @@ -4506,13 +3322,6 @@ - - - - - - - @@ -4528,13 +3337,6 @@ - - - - - - - @@ -4547,13 +3349,6 @@ - - - - - - - @@ -4569,13 +3364,6 @@ - - - - - - - @@ -4588,13 +3376,6 @@ - - - - - - - @@ -4610,13 +3391,6 @@ - - - - - - - @@ -4629,13 +3403,6 @@ - - - - - - - @@ -4651,13 +3418,6 @@ - - - - - - - @@ -4670,13 +3430,6 @@ - - - - - - - @@ -4692,13 +3445,6 @@ - - - - - - - @@ -4711,13 +3457,6 @@ - - - - - - - @@ -4733,13 +3472,6 @@ - - - - - - - @@ -4752,13 +3484,6 @@ - - - - - - - @@ -4774,13 +3499,6 @@ - - - - - - - @@ -4793,13 +3511,6 @@ - - - - - - - @@ -4815,13 +3526,6 @@ - - - - - - - @@ -4834,13 +3538,6 @@ - - - - - - - @@ -4856,13 +3553,6 @@ - - - - - - - @@ -4875,13 +3565,6 @@ - - - - - - - @@ -4897,13 +3580,6 @@ - - - - - - - @@ -4916,13 +3592,6 @@ - - - - - - - @@ -4938,13 +3607,6 @@ - - - - - - - @@ -4957,13 +3619,6 @@ - - - - - - - @@ -4979,13 +3634,6 @@ - - - - - - - @@ -4998,13 +3646,6 @@ - - - - - - - @@ -5020,13 +3661,6 @@ - - - - - - - @@ -5039,13 +3673,6 @@ - - - - - - - @@ -5061,13 +3688,6 @@ - - - - - - - @@ -5080,13 +3700,6 @@ - - - - - - - @@ -5102,13 +3715,6 @@ - - - - - - - @@ -5121,13 +3727,6 @@ - - - - - - - @@ -5143,13 +3742,6 @@ - - - - - - - @@ -5162,13 +3754,6 @@ - - - - - - - @@ -5184,13 +3769,6 @@ - - - - - - - @@ -5203,13 +3781,6 @@ - - - - - - - @@ -5225,13 +3796,6 @@ - - - - - - - @@ -5244,13 +3808,6 @@ - - - - - - - @@ -5266,13 +3823,6 @@ - - - - - - - @@ -5285,13 +3835,6 @@ - - - - - - - @@ -5307,13 +3850,6 @@ - - - - - - - @@ -5326,13 +3862,6 @@ - - - - - - - @@ -5348,13 +3877,6 @@ - - - - - - - @@ -5367,13 +3889,6 @@ - - - - - - - @@ -5389,13 +3904,6 @@ - - - - - - - @@ -5408,13 +3916,6 @@ - - - - - - - @@ -5430,13 +3931,6 @@ - - - - - - - @@ -5449,13 +3943,6 @@ - - - - - - - @@ -5471,13 +3958,6 @@ - - - - - - - @@ -5490,13 +3970,6 @@ - - - - - - - @@ -5516,13 +3989,6 @@ - - - - - - - @@ -5535,13 +4001,6 @@ - - - - - - - @@ -5557,13 +4016,6 @@ - - - - - - - @@ -5576,13 +4028,6 @@ - - - - - - - @@ -5598,13 +4043,6 @@ - - - - - - - @@ -5617,13 +4055,6 @@ - - - - - - - @@ -5639,13 +4070,6 @@ - - - - - - - @@ -5658,13 +4082,6 @@ - - - - - - - @@ -5680,13 +4097,6 @@ - - - - - - - @@ -5699,13 +4109,6 @@ - - - - - - - @@ -5721,13 +4124,6 @@ - - - - - - - @@ -5740,13 +4136,6 @@ - - - - - - - @@ -5762,13 +4151,6 @@ - - - - - - - @@ -5781,13 +4163,6 @@ - - - - - - - @@ -5803,13 +4178,6 @@ - - - - - - - @@ -5822,13 +4190,6 @@ - - - - - - - @@ -5844,13 +4205,6 @@ - - - - - - - @@ -5863,13 +4217,6 @@ - - - - - - - @@ -5885,13 +4232,6 @@ - - - - - - - @@ -5904,13 +4244,6 @@ - - - - - - - @@ -5926,13 +4259,6 @@ - - - - - - - @@ -5945,13 +4271,6 @@ - - - - - - - @@ -5967,13 +4286,6 @@ - - - - - - - @@ -5986,13 +4298,6 @@ - - - - - - - @@ -6008,13 +4313,6 @@ - - - - - - - @@ -6027,13 +4325,6 @@ - - - - - - - @@ -6049,26 +4340,12 @@ - - - - - - - - - - - - - - - - - - + + + + @@ -6090,13 +4367,6 @@ - - - - - - - @@ -6109,13 +4379,6 @@ - - - - - - - @@ -6131,13 +4394,6 @@ - - - - - - - @@ -6150,13 +4406,6 @@ - - - - - - - @@ -6172,13 +4421,6 @@ - - - - - - - @@ -6191,13 +4433,6 @@ - - - - - - - @@ -6217,13 +4452,6 @@ - - - - - - - @@ -6236,13 +4464,6 @@ - - - - - - - @@ -6258,13 +4479,6 @@ - - - - - - - @@ -6277,13 +4491,6 @@ - - - - - - - @@ -6299,13 +4506,6 @@ - - - - - - - @@ -6318,13 +4518,6 @@ - - - - - - - @@ -6340,13 +4533,6 @@ - - - - - - - @@ -6359,13 +4545,6 @@ - - - - - - - @@ -6381,13 +4560,6 @@ - - - - - - - @@ -6400,13 +4572,6 @@ - - - - - - - @@ -6426,13 +4591,6 @@ - - - - - - - @@ -6445,13 +4603,6 @@ - - - - - - - @@ -6467,13 +4618,6 @@ - - - - - - - @@ -6486,13 +4630,6 @@ - - - - - - - @@ -6508,13 +4645,6 @@ - - - - - - - @@ -6527,13 +4657,6 @@ - - - - - - - @@ -6549,13 +4672,6 @@ - - - - - - - @@ -6568,13 +4684,6 @@ - - - - - - - @@ -6590,13 +4699,6 @@ - - - - - - - @@ -6609,13 +4711,6 @@ - - - - - - - @@ -6631,13 +4726,6 @@ - - - - - - - @@ -6650,13 +4738,6 @@ - - - - - - - @@ -6676,13 +4757,6 @@ - - - - - - - @@ -6695,13 +4769,6 @@ - - - - - - - @@ -6717,13 +4784,6 @@ - - - - - - - @@ -6736,13 +4796,6 @@ - - - - - - - @@ -6758,13 +4811,6 @@ - - - - - - - @@ -6777,13 +4823,6 @@ - - - - - - - @@ -6803,13 +4842,6 @@ - - - - - - - @@ -6822,13 +4854,6 @@ - - - - - - - @@ -6844,13 +4869,6 @@ - - - - - - - @@ -6863,13 +4881,6 @@ - - - - - - - @@ -6885,13 +4896,6 @@ - - - - - - - @@ -6904,13 +4908,6 @@ - - - - - - - @@ -6926,13 +4923,6 @@ - - - - - - - @@ -6945,13 +4935,6 @@ - - - - - - - @@ -6967,13 +4950,6 @@ - - - - - - - @@ -6986,13 +4962,6 @@ - - - - - - - @@ -7008,13 +4977,6 @@ - - - - - - - @@ -7027,13 +4989,6 @@ - - - - - - - @@ -7049,13 +5004,6 @@ - - - - - - - @@ -7068,13 +5016,6 @@ - - - - - - - @@ -7090,13 +5031,6 @@ - - - - - - - @@ -7109,13 +5043,6 @@ - - - - - - - @@ -7131,13 +5058,6 @@ - - - - - - - @@ -7150,13 +5070,6 @@ - - - - - - - @@ -7172,13 +5085,6 @@ - - - - - - - @@ -7191,13 +5097,6 @@ - - - - - - - @@ -7213,13 +5112,6 @@ - - - - - - - @@ -7232,13 +5124,6 @@ - - - - - - - @@ -7254,13 +5139,6 @@ - - - - - - - @@ -7273,13 +5151,6 @@ - - - - - - - @@ -7295,13 +5166,6 @@ - - - - - - - @@ -7314,13 +5178,6 @@ - - - - - - - @@ -7336,13 +5193,6 @@ - - - - - - - @@ -7355,13 +5205,6 @@ - - - - - - - @@ -7377,13 +5220,6 @@ - - - - - - - @@ -7396,13 +5232,6 @@ - - - - - - - @@ -7418,13 +5247,6 @@ - - - - - - - @@ -7437,13 +5259,6 @@ - - - - - - - @@ -7459,13 +5274,6 @@ - - - - - - - @@ -7478,13 +5286,6 @@ - - - - - - - @@ -7500,13 +5301,6 @@ - - - - - - - @@ -7519,13 +5313,6 @@ - - - - - - - @@ -7541,13 +5328,6 @@ - - - - - - - @@ -7560,13 +5340,6 @@ - - - - - - - @@ -7582,13 +5355,6 @@ - - - - - - - @@ -7601,13 +5367,6 @@ - - - - - - - @@ -7623,13 +5382,6 @@ - - - - - - - @@ -7642,13 +5394,6 @@ - - - - - - - @@ -7664,13 +5409,6 @@ - - - - - - - @@ -7683,13 +5421,6 @@ - - - - - - - @@ -7705,13 +5436,6 @@ - - - - - - - @@ -7724,13 +5448,6 @@ - - - - - - - @@ -7750,13 +5467,6 @@ - - - - - - - @@ -7769,13 +5479,6 @@ - - - - - - - @@ -7791,26 +5494,12 @@ - - - - - - - - - - - - - - - - - - + + + + @@ -7832,13 +5521,6 @@ - - - - - - - @@ -7851,13 +5533,6 @@ - - - - - - - @@ -7873,13 +5548,6 @@ - - - - - - - @@ -7892,13 +5560,6 @@ - - - - - - - @@ -7914,13 +5575,6 @@ - - - - - - - @@ -7933,13 +5587,6 @@ - - - - - - - @@ -7955,13 +5602,6 @@ - - - - - - - @@ -7974,13 +5614,6 @@ - - - - - - - @@ -7996,13 +5629,6 @@ - - - - - - - @@ -8015,13 +5641,6 @@ - - - - - - - @@ -8037,13 +5656,6 @@ - - - - - - - @@ -8056,13 +5668,6 @@ - - - - - - - @@ -8078,13 +5683,6 @@ - - - - - - - @@ -8097,13 +5695,6 @@ - - - - - - - @@ -8119,13 +5710,6 @@ - - - - - - - @@ -8138,13 +5722,6 @@ - - - - - - - @@ -8160,13 +5737,6 @@ - - - - - - - @@ -8179,13 +5749,6 @@ - - - - - - - @@ -8201,13 +5764,6 @@ - - - - - - - @@ -8220,13 +5776,6 @@ - - - - - - - @@ -8242,13 +5791,6 @@ - - - - - - - @@ -8261,13 +5803,6 @@ - - - - - - - @@ -8283,13 +5818,6 @@ - - - - - - - @@ -8302,13 +5830,6 @@ - - - - - - - @@ -8324,13 +5845,6 @@ - - - - - - - @@ -8343,13 +5857,6 @@ - - - - - - - @@ -8365,13 +5872,6 @@ - - - - - - - @@ -8384,13 +5884,6 @@ - - - - - - - @@ -8406,13 +5899,6 @@ - - - - - - - @@ -8425,13 +5911,6 @@ - - - - - - - @@ -8447,13 +5926,6 @@ - - - - - - - @@ -8466,13 +5938,6 @@ - - - - - - - @@ -8488,13 +5953,6 @@ - - - - - - - @@ -8507,13 +5965,6 @@ - - - - - - - @@ -8529,13 +5980,6 @@ - - - - - - - @@ -8548,13 +5992,6 @@ - - - - - - - @@ -8570,13 +6007,6 @@ - - - - - - - @@ -8589,13 +6019,6 @@ - - - - - - - @@ -8611,13 +6034,6 @@ - - - - - - - @@ -8630,13 +6046,6 @@ - - - - - - - @@ -8652,13 +6061,6 @@ - - - - - - - @@ -8671,13 +6073,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_118_bus_partial.svg b/network-area-diagram/src/test/resources/IEEE_118_bus_partial.svg index c5a639639..cc77faa24 100644 --- a/network-area-diagram/src/test/resources/IEEE_118_bus_partial.svg +++ b/network-area-diagram/src/test/resources/IEEE_118_bus_partial.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -329,13 +328,6 @@ - - - - - - - @@ -351,13 +343,6 @@ - - - - - - - @@ -373,13 +358,6 @@ - - - - - - - @@ -392,13 +370,6 @@ - - - - - - - @@ -414,13 +385,6 @@ - - - - - - - @@ -433,13 +397,6 @@ - - - - - - - @@ -455,13 +412,6 @@ - - - - - - - @@ -477,13 +427,6 @@ - - - - - - - @@ -499,13 +442,6 @@ - - - - - - - @@ -518,13 +454,6 @@ - - - - - - - @@ -540,13 +469,6 @@ - - - - - - - @@ -562,13 +484,6 @@ - - - - - - - @@ -581,13 +496,6 @@ - - - - - - - @@ -603,13 +511,6 @@ - - - - - - - @@ -622,13 +523,6 @@ - - - - - - - @@ -644,13 +538,6 @@ - - - - - - - @@ -666,13 +553,6 @@ - - - - - - - @@ -685,13 +565,6 @@ - - - - - - - @@ -707,13 +580,6 @@ - - - - - - - @@ -726,13 +592,6 @@ - - - - - - - @@ -748,13 +607,6 @@ - - - - - - - @@ -767,13 +619,6 @@ - - - - - - - @@ -789,13 +634,6 @@ - - - - - - - @@ -808,13 +646,6 @@ - - - - - - - @@ -830,13 +661,6 @@ - - - - - - - @@ -849,13 +673,6 @@ - - - - - - - @@ -871,13 +688,6 @@ - - - - - - - @@ -890,13 +700,6 @@ - - - - - - - @@ -912,13 +715,6 @@ - - - - - - - @@ -931,13 +727,6 @@ - - - - - - - @@ -953,13 +742,6 @@ - - - - - - - @@ -972,13 +754,6 @@ - - - - - - - @@ -994,13 +769,6 @@ - - - - - - - @@ -1013,13 +781,6 @@ - - - - - - - @@ -1035,13 +796,6 @@ - - - - - - - @@ -1054,13 +808,6 @@ - - - - - - - @@ -1076,13 +823,6 @@ - - - - - - - @@ -1095,13 +835,6 @@ - - - - - - - @@ -1117,13 +850,6 @@ - - - - - - - @@ -1136,13 +862,6 @@ - - - - - - - @@ -1158,13 +877,6 @@ - - - - - - - @@ -1177,13 +889,6 @@ - - - - - - - @@ -1199,13 +904,6 @@ - - - - - - - @@ -1218,13 +916,6 @@ - - - - - - - @@ -1240,13 +931,6 @@ - - - - - - - @@ -1259,13 +943,6 @@ - - - - - - - @@ -1281,13 +958,6 @@ - - - - - - - @@ -1300,13 +970,6 @@ - - - - - - - @@ -1322,13 +985,6 @@ - - - - - - - @@ -1341,13 +997,6 @@ - - - - - - - @@ -1363,13 +1012,6 @@ - - - - - - - @@ -1382,13 +1024,6 @@ - - - - - - - @@ -1404,13 +1039,6 @@ - - - - - - - @@ -1423,13 +1051,6 @@ - - - - - - - @@ -1445,13 +1066,6 @@ - - - - - - - @@ -1464,13 +1078,6 @@ - - - - - - - @@ -1486,13 +1093,6 @@ - - - - - - - @@ -1505,13 +1105,6 @@ - - - - - - - @@ -1527,13 +1120,6 @@ - - - - - - - @@ -1546,13 +1132,6 @@ - - - - - - - @@ -1568,13 +1147,6 @@ - - - - - - - @@ -1587,13 +1159,6 @@ - - - - - - - @@ -1609,13 +1174,6 @@ - - - - - - - @@ -1628,13 +1186,6 @@ - - - - - - - @@ -1650,13 +1201,6 @@ - - - - - - - @@ -1669,13 +1213,6 @@ - - - - - - - @@ -1695,13 +1232,6 @@ - - - - - - - @@ -1714,13 +1244,6 @@ - - - - - - - @@ -1736,13 +1259,6 @@ - - - - - - - @@ -1758,13 +1274,6 @@ - - - - - - - @@ -1781,13 +1290,6 @@ - - - - - - - @@ -1807,13 +1309,6 @@ - - - - - - - @@ -1829,13 +1324,6 @@ - - - - - - - @@ -1851,13 +1339,6 @@ - - - - - - - @@ -1874,13 +1355,6 @@ - - - - - - - @@ -1900,13 +1374,6 @@ - - - - - - - @@ -1922,13 +1389,6 @@ - - - - - - - @@ -1944,13 +1404,6 @@ - - - - - - - @@ -1967,13 +1420,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_118_bus_partial_non_connected.svg b/network-area-diagram/src/test/resources/IEEE_118_bus_partial_non_connected.svg index 721eacefc..eec1fb3c8 100644 --- a/network-area-diagram/src/test/resources/IEEE_118_bus_partial_non_connected.svg +++ b/network-area-diagram/src/test/resources/IEEE_118_bus_partial_non_connected.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -260,13 +259,6 @@ - - - - - - - @@ -282,13 +274,6 @@ - - - - - - - @@ -301,13 +286,6 @@ - - - - - - - @@ -323,13 +301,6 @@ - - - - - - - @@ -342,13 +313,6 @@ - - - - - - - @@ -364,13 +328,6 @@ - - - - - - - @@ -386,13 +343,6 @@ - - - - - - - @@ -408,13 +358,6 @@ - - - - - - - @@ -430,13 +373,6 @@ - - - - - - - @@ -452,13 +388,6 @@ - - - - - - - @@ -471,13 +400,6 @@ - - - - - - - @@ -493,13 +415,6 @@ - - - - - - - @@ -515,13 +430,6 @@ - - - - - - - @@ -537,13 +445,6 @@ - - - - - - - @@ -556,13 +457,6 @@ - - - - - - - @@ -578,13 +472,6 @@ - - - - - - - @@ -600,13 +487,6 @@ - - - - - - - @@ -622,13 +502,6 @@ - - - - - - - @@ -644,13 +517,6 @@ - - - - - - - @@ -663,13 +529,6 @@ - - - - - - - @@ -685,13 +544,6 @@ - - - - - - - @@ -712,13 +564,6 @@ - - - - - - - @@ -734,13 +579,6 @@ - - - - - - - @@ -756,13 +594,6 @@ - - - - - - - @@ -775,13 +606,6 @@ - - - - - - - @@ -797,13 +621,6 @@ - - - - - - - @@ -819,13 +636,6 @@ - - - - - - - @@ -841,13 +651,6 @@ - - - - - - - @@ -863,13 +666,6 @@ - - - - - - - @@ -885,13 +681,6 @@ - - - - - - - @@ -907,13 +696,6 @@ - - - - - - - @@ -926,13 +708,6 @@ - - - - - - - @@ -952,13 +727,6 @@ - - - - - - - @@ -971,13 +739,6 @@ - - - - - - - @@ -993,13 +754,6 @@ - - - - - - - @@ -1015,13 +769,6 @@ - - - - - - - @@ -1037,13 +784,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus.svg b/network-area-diagram/src/test/resources/IEEE_14_bus.svg index f8b10b278..b45fe965a 100644 --- a/network-area-diagram/src/test/resources/IEEE_14_bus.svg +++ b/network-area-diagram/src/test/resources/IEEE_14_bus.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -164,13 +163,6 @@ - - - - - - - @@ -183,13 +175,6 @@ - - - - - - - @@ -205,13 +190,6 @@ - - - - - - - @@ -224,13 +202,6 @@ - - - - - - - @@ -246,13 +217,6 @@ - - - - - - - @@ -265,13 +229,6 @@ - - - - - - - @@ -287,13 +244,6 @@ - - - - - - - @@ -306,13 +256,6 @@ - - - - - - - @@ -328,13 +271,6 @@ - - - - - - - @@ -347,13 +283,6 @@ - - - - - - - @@ -369,13 +298,6 @@ - - - - - - - @@ -388,13 +310,6 @@ - - - - - - - @@ -410,13 +325,6 @@ - - - - - - - @@ -429,13 +337,6 @@ - - - - - - - @@ -451,13 +352,6 @@ - - - - - - - @@ -470,13 +364,6 @@ - - - - - - - @@ -492,13 +379,6 @@ - - - - - - - @@ -511,13 +391,6 @@ - - - - - - - @@ -533,13 +406,6 @@ - - - - - - - @@ -552,13 +418,6 @@ - - - - - - - @@ -574,13 +433,6 @@ - - - - - - - @@ -593,13 +445,6 @@ - - - - - - - @@ -615,13 +460,6 @@ - - - - - - - @@ -634,13 +472,6 @@ - - - - - - - @@ -656,13 +487,6 @@ - - - - - - - @@ -675,13 +499,6 @@ - - - - - - - @@ -697,13 +514,6 @@ - - - - - - - @@ -716,13 +526,6 @@ - - - - - - - @@ -738,13 +541,6 @@ - - - - - - - @@ -757,13 +553,6 @@ - - - - - - - @@ -779,13 +568,6 @@ - - - - - - - @@ -798,13 +580,6 @@ - - - - - - - @@ -820,13 +595,6 @@ - - - - - - - @@ -839,13 +607,6 @@ - - - - - - - @@ -861,13 +622,6 @@ - - - - - - - @@ -880,13 +634,6 @@ - - - - - - - @@ -906,13 +653,6 @@ - - - - - - - @@ -925,13 +665,6 @@ - - - - - - - @@ -951,13 +684,6 @@ - - - - - - - @@ -970,13 +696,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg index 76b9de4b6..511b73421 100644 --- a/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg +++ b/network-area-diagram/src/test/resources/IEEE_14_bus_disconnection.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -163,13 +162,6 @@ - - - - - - - @@ -182,13 +174,6 @@ - - - - - - - @@ -204,13 +189,6 @@ - - - - - - - @@ -223,13 +201,6 @@ - - - - - - - @@ -245,13 +216,6 @@ - - - - - - - @@ -264,13 +228,6 @@ - - - - - - - @@ -286,13 +243,6 @@ - - - - - - - @@ -305,13 +255,6 @@ - - - - - - - @@ -327,13 +270,6 @@ - - - - - - - @@ -346,13 +282,6 @@ - - - - - - - @@ -368,13 +297,6 @@ - - - - - - - @@ -387,13 +309,6 @@ - - - - - - - @@ -409,13 +324,6 @@ - - - - - - - @@ -428,13 +336,6 @@ - - - - - - - @@ -450,13 +351,6 @@ - - - - - - - @@ -469,13 +363,6 @@ - - - - - - - @@ -491,13 +378,6 @@ - - - - - - - @@ -510,13 +390,6 @@ - - - - - - - @@ -532,13 +405,6 @@ - - - - - - - @@ -551,13 +417,6 @@ - - - - - - - @@ -573,13 +432,6 @@ - - - - - - - @@ -592,13 +444,6 @@ - - - - - - - @@ -614,13 +459,6 @@ - - - - - - - @@ -633,13 +471,6 @@ - - - - - - - @@ -655,13 +486,6 @@ - - - - - - - @@ -674,13 +498,6 @@ - - - - - - - @@ -696,13 +513,6 @@ - - - - - - - @@ -715,13 +525,6 @@ - - - - - - - @@ -737,13 +540,6 @@ - - - - - - - @@ -756,13 +552,6 @@ - - - - - - - @@ -778,13 +567,6 @@ - - - - - - - @@ -797,13 +579,6 @@ - - - - - - - @@ -819,13 +594,6 @@ - - - - - - - @@ -838,13 +606,6 @@ - - - - - - - @@ -860,13 +621,6 @@ - - - - - - - @@ -879,13 +633,6 @@ - - - - - - - @@ -905,13 +652,6 @@ - - - - - - - @@ -924,13 +664,6 @@ - - - - - - - @@ -950,13 +683,6 @@ - - - - - - - @@ -969,13 +695,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_fictitious.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_fictitious.svg index 37abbfbf2..d14949a2c 100644 --- a/network-area-diagram/src/test/resources/IEEE_14_bus_fictitious.svg +++ b/network-area-diagram/src/test/resources/IEEE_14_bus_fictitious.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -176,13 +175,6 @@ - - - - - - - @@ -195,13 +187,6 @@ - - - - - - - @@ -217,13 +202,6 @@ - - - - - - - @@ -236,13 +214,6 @@ - - - - - - - @@ -258,13 +229,6 @@ - - - - - - - @@ -277,13 +241,6 @@ - - - - - - - @@ -299,13 +256,6 @@ - - - - - - - @@ -318,13 +268,6 @@ - - - - - - - @@ -340,13 +283,6 @@ - - - - - - - @@ -359,13 +295,6 @@ - - - - - - - @@ -381,13 +310,6 @@ - - - - - - - @@ -400,13 +322,6 @@ - - - - - - - @@ -422,13 +337,6 @@ - - - - - - - @@ -441,13 +349,6 @@ - - - - - - - @@ -463,13 +364,6 @@ - - - - - - - @@ -482,13 +376,6 @@ - - - - - - - @@ -504,13 +391,6 @@ - - - - - - - @@ -523,13 +403,6 @@ - - - - - - - @@ -545,13 +418,6 @@ - - - - - - - @@ -564,13 +430,6 @@ - - - - - - - @@ -586,13 +445,6 @@ - - - - - - - @@ -605,13 +457,6 @@ - - - - - - - @@ -627,13 +472,6 @@ - - - - - - - @@ -646,13 +484,6 @@ - - - - - - - @@ -668,13 +499,6 @@ - - - - - - - @@ -687,13 +511,6 @@ - - - - - - - @@ -709,13 +526,6 @@ - - - - - - - @@ -728,13 +538,6 @@ - - - - - - - @@ -750,13 +553,6 @@ - - - - - - - @@ -769,13 +565,6 @@ - - - - - - - @@ -791,13 +580,6 @@ - - - - - - - @@ -810,13 +592,6 @@ - - - - - - - @@ -836,13 +611,6 @@ - - - - - - - @@ -855,13 +623,6 @@ - - - - - - - @@ -881,13 +642,6 @@ - - - - - - - @@ -900,13 +654,6 @@ - - - - - - - @@ -926,13 +673,6 @@ - - - - - - - @@ -945,13 +685,6 @@ - - - - - - - @@ -967,13 +700,6 @@ - - - - - - - @@ -986,13 +712,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_text_nodes.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_text_nodes.svg index 6f19f6660..551b2da9b 100644 --- a/network-area-diagram/src/test/resources/IEEE_14_bus_text_nodes.svg +++ b/network-area-diagram/src/test/resources/IEEE_14_bus_text_nodes.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -176,13 +175,6 @@ - - - - - - - @@ -195,13 +187,6 @@ - - - - - - - @@ -217,13 +202,6 @@ - - - - - - - @@ -236,13 +214,6 @@ - - - - - - - @@ -258,13 +229,6 @@ - - - - - - - @@ -277,13 +241,6 @@ - - - - - - - @@ -299,13 +256,6 @@ - - - - - - - @@ -318,13 +268,6 @@ - - - - - - - @@ -340,13 +283,6 @@ - - - - - - - @@ -359,13 +295,6 @@ - - - - - - - @@ -381,13 +310,6 @@ - - - - - - - @@ -400,13 +322,6 @@ - - - - - - - @@ -422,13 +337,6 @@ - - - - - - - @@ -441,13 +349,6 @@ - - - - - - - @@ -463,13 +364,6 @@ - - - - - - - @@ -482,13 +376,6 @@ - - - - - - - @@ -504,13 +391,6 @@ - - - - - - - @@ -523,13 +403,6 @@ - - - - - - - @@ -545,13 +418,6 @@ - - - - - - - @@ -564,13 +430,6 @@ - - - - - - - @@ -586,13 +445,6 @@ - - - - - - - @@ -605,13 +457,6 @@ - - - - - - - @@ -627,13 +472,6 @@ - - - - - - - @@ -646,13 +484,6 @@ - - - - - - - @@ -668,13 +499,6 @@ - - - - - - - @@ -687,13 +511,6 @@ - - - - - - - @@ -709,13 +526,6 @@ - - - - - - - @@ -728,13 +538,6 @@ - - - - - - - @@ -750,13 +553,6 @@ - - - - - - - @@ -769,13 +565,6 @@ - - - - - - - @@ -791,13 +580,6 @@ - - - - - - - @@ -810,13 +592,6 @@ - - - - - - - @@ -836,13 +611,6 @@ - - - - - - - @@ -855,13 +623,6 @@ - - - - - - - @@ -881,13 +642,6 @@ - - - - - - - @@ -900,13 +654,6 @@ - - - - - - - @@ -926,13 +673,6 @@ - - - - - - - @@ -945,13 +685,6 @@ - - - - - - - @@ -967,13 +700,6 @@ - - - - - - - @@ -986,13 +712,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_14_id_prefixed.svg b/network-area-diagram/src/test/resources/IEEE_14_id_prefixed.svg index b8c6b3a7d..f10b9c7da 100644 --- a/network-area-diagram/src/test/resources/IEEE_14_id_prefixed.svg +++ b/network-area-diagram/src/test/resources/IEEE_14_id_prefixed.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -176,13 +175,6 @@ - - - - - - - @@ -195,13 +187,6 @@ - - - - - - - @@ -217,13 +202,6 @@ - - - - - - - @@ -236,13 +214,6 @@ - - - - - - - @@ -258,13 +229,6 @@ - - - - - - - @@ -277,13 +241,6 @@ - - - - - - - @@ -299,13 +256,6 @@ - - - - - - - @@ -318,13 +268,6 @@ - - - - - - - @@ -340,13 +283,6 @@ - - - - - - - @@ -359,13 +295,6 @@ - - - - - - - @@ -381,13 +310,6 @@ - - - - - - - @@ -400,13 +322,6 @@ - - - - - - - @@ -422,13 +337,6 @@ - - - - - - - @@ -441,13 +349,6 @@ - - - - - - - @@ -463,13 +364,6 @@ - - - - - - - @@ -482,13 +376,6 @@ - - - - - - - @@ -504,13 +391,6 @@ - - - - - - - @@ -523,13 +403,6 @@ - - - - - - - @@ -545,13 +418,6 @@ - - - - - - - @@ -564,13 +430,6 @@ - - - - - - - @@ -586,13 +445,6 @@ - - - - - - - @@ -605,13 +457,6 @@ - - - - - - - @@ -627,13 +472,6 @@ - - - - - - - @@ -646,13 +484,6 @@ - - - - - - - @@ -668,13 +499,6 @@ - - - - - - - @@ -687,13 +511,6 @@ - - - - - - - @@ -709,13 +526,6 @@ - - - - - - - @@ -728,13 +538,6 @@ - - - - - - - @@ -750,13 +553,6 @@ - - - - - - - @@ -769,13 +565,6 @@ - - - - - - - @@ -791,13 +580,6 @@ - - - - - - - @@ -810,13 +592,6 @@ - - - - - - - @@ -836,13 +611,6 @@ - - - - - - - @@ -855,13 +623,6 @@ - - - - - - - @@ -881,13 +642,6 @@ - - - - - - - @@ -900,13 +654,6 @@ - - - - - - - @@ -926,13 +673,6 @@ - - - - - - - @@ -945,13 +685,6 @@ - - - - - - - @@ -967,13 +700,6 @@ - - - - - - - @@ -986,13 +712,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_24_bus.svg b/network-area-diagram/src/test/resources/IEEE_24_bus.svg index c2f977a47..1d71e79e1 100644 --- a/network-area-diagram/src/test/resources/IEEE_24_bus.svg +++ b/network-area-diagram/src/test/resources/IEEE_24_bus.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -254,13 +253,6 @@ - - - - - - - @@ -273,13 +265,6 @@ - - - - - - - @@ -295,13 +280,6 @@ - - - - - - - @@ -314,13 +292,6 @@ - - - - - - - @@ -336,13 +307,6 @@ - - - - - - - @@ -355,13 +319,6 @@ - - - - - - - @@ -377,13 +334,6 @@ - - - - - - - @@ -396,13 +346,6 @@ - - - - - - - @@ -418,13 +361,6 @@ - - - - - - - @@ -437,13 +373,6 @@ - - - - - - - @@ -459,13 +388,6 @@ - - - - - - - @@ -478,13 +400,6 @@ - - - - - - - @@ -504,13 +419,6 @@ - - - - - - - @@ -523,13 +431,6 @@ - - - - - - - @@ -549,13 +450,6 @@ - - - - - - - @@ -568,13 +462,6 @@ - - - - - - - @@ -594,13 +481,6 @@ - - - - - - - @@ -613,13 +493,6 @@ - - - - - - - @@ -635,13 +508,6 @@ - - - - - - - @@ -654,13 +520,6 @@ - - - - - - - @@ -676,13 +535,6 @@ - - - - - - - @@ -695,13 +547,6 @@ - - - - - - - @@ -721,13 +566,6 @@ - - - - - - - @@ -740,13 +578,6 @@ - - - - - - - @@ -762,13 +593,6 @@ - - - - - - - @@ -781,13 +605,6 @@ - - - - - - - @@ -803,13 +620,6 @@ - - - - - - - @@ -822,13 +632,6 @@ - - - - - - - @@ -848,13 +651,6 @@ - - - - - - - @@ -867,13 +663,6 @@ - - - - - - - @@ -889,13 +678,6 @@ - - - - - - - @@ -908,13 +690,6 @@ - - - - - - - @@ -930,13 +705,6 @@ - - - - - - - @@ -949,13 +717,6 @@ - - - - - - - @@ -971,13 +732,6 @@ - - - - - - - @@ -990,13 +744,6 @@ - - - - - - - @@ -1012,13 +759,6 @@ - - - - - - - @@ -1031,13 +771,6 @@ - - - - - - - @@ -1053,13 +786,6 @@ - - - - - - - @@ -1072,13 +798,6 @@ - - - - - - - @@ -1094,13 +813,6 @@ - - - - - - - @@ -1113,13 +825,6 @@ - - - - - - - @@ -1135,13 +840,6 @@ - - - - - - - @@ -1154,13 +852,6 @@ - - - - - - - @@ -1176,13 +867,6 @@ - - - - - - - @@ -1195,13 +879,6 @@ - - - - - - - @@ -1217,13 +894,6 @@ - - - - - - - @@ -1236,13 +906,6 @@ - - - - - - - @@ -1258,13 +921,6 @@ - - - - - - - @@ -1277,13 +933,6 @@ - - - - - - - @@ -1299,13 +948,6 @@ - - - - - - - @@ -1318,13 +960,6 @@ - - - - - - - @@ -1340,13 +975,6 @@ - - - - - - - @@ -1359,13 +987,6 @@ - - - - - - - @@ -1381,13 +1002,6 @@ - - - - - - - @@ -1400,13 +1014,6 @@ - - - - - - - @@ -1422,13 +1029,6 @@ - - - - - - - @@ -1441,13 +1041,6 @@ - - - - - - - @@ -1463,13 +1056,6 @@ - - - - - - - @@ -1482,13 +1068,6 @@ - - - - - - - @@ -1504,13 +1083,6 @@ - - - - - - - @@ -1523,13 +1095,6 @@ - - - - - - - @@ -1545,13 +1110,6 @@ - - - - - - - @@ -1564,13 +1122,6 @@ - - - - - - - @@ -1586,13 +1137,6 @@ - - - - - - - @@ -1605,13 +1149,6 @@ - - - - - - - @@ -1627,13 +1164,6 @@ - - - - - - - @@ -1646,13 +1176,6 @@ - - - - - - - @@ -1672,13 +1195,6 @@ - - - - - - - @@ -1691,13 +1207,6 @@ - - - - - - - @@ -1713,13 +1222,6 @@ - - - - - - - @@ -1732,13 +1234,6 @@ - - - - - - - @@ -1754,13 +1249,6 @@ - - - - - - - @@ -1773,13 +1261,6 @@ - - - - - - - @@ -1795,13 +1276,6 @@ - - - - - - - @@ -1814,13 +1288,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_30_bus.svg b/network-area-diagram/src/test/resources/IEEE_30_bus.svg index bf497f7de..ab390b3fc 100644 --- a/network-area-diagram/src/test/resources/IEEE_30_bus.svg +++ b/network-area-diagram/src/test/resources/IEEE_30_bus.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -293,13 +292,6 @@ - - - - - - - @@ -312,13 +304,6 @@ - - - - - - - @@ -334,13 +319,6 @@ - - - - - - - @@ -353,13 +331,6 @@ - - - - - - - @@ -375,13 +346,6 @@ - - - - - - - @@ -394,13 +358,6 @@ - - - - - - - @@ -416,13 +373,6 @@ - - - - - - - @@ -435,13 +385,6 @@ - - - - - - - @@ -457,13 +400,6 @@ - - - - - - - @@ -476,13 +412,6 @@ - - - - - - - @@ -498,13 +427,6 @@ - - - - - - - @@ -517,13 +439,6 @@ - - - - - - - @@ -539,13 +454,6 @@ - - - - - - - @@ -558,13 +466,6 @@ - - - - - - - @@ -580,13 +481,6 @@ - - - - - - - @@ -599,13 +493,6 @@ - - - - - - - @@ -625,13 +512,6 @@ - - - - - - - @@ -644,13 +524,6 @@ - - - - - - - @@ -666,13 +539,6 @@ - - - - - - - @@ -685,13 +551,6 @@ - - - - - - - @@ -707,13 +566,6 @@ - - - - - - - @@ -726,13 +578,6 @@ - - - - - - - @@ -748,13 +593,6 @@ - - - - - - - @@ -767,13 +605,6 @@ - - - - - - - @@ -789,13 +620,6 @@ - - - - - - - @@ -808,13 +632,6 @@ - - - - - - - @@ -830,13 +647,6 @@ - - - - - - - @@ -849,13 +659,6 @@ - - - - - - - @@ -875,13 +678,6 @@ - - - - - - - @@ -894,13 +690,6 @@ - - - - - - - @@ -916,13 +705,6 @@ - - - - - - - @@ -935,13 +717,6 @@ - - - - - - - @@ -957,13 +732,6 @@ - - - - - - - @@ -976,13 +744,6 @@ - - - - - - - @@ -998,13 +759,6 @@ - - - - - - - @@ -1017,13 +771,6 @@ - - - - - - - @@ -1039,13 +786,6 @@ - - - - - - - @@ -1058,13 +798,6 @@ - - - - - - - @@ -1080,13 +813,6 @@ - - - - - - - @@ -1099,13 +825,6 @@ - - - - - - - @@ -1121,13 +840,6 @@ - - - - - - - @@ -1140,13 +852,6 @@ - - - - - - - @@ -1162,13 +867,6 @@ - - - - - - - @@ -1181,13 +879,6 @@ - - - - - - - @@ -1203,13 +894,6 @@ - - - - - - - @@ -1222,13 +906,6 @@ - - - - - - - @@ -1244,13 +921,6 @@ - - - - - - - @@ -1263,13 +933,6 @@ - - - - - - - @@ -1285,13 +948,6 @@ - - - - - - - @@ -1304,13 +960,6 @@ - - - - - - - @@ -1326,13 +975,6 @@ - - - - - - - @@ -1345,13 +987,6 @@ - - - - - - - @@ -1367,13 +1002,6 @@ - - - - - - - @@ -1386,13 +1014,6 @@ - - - - - - - @@ -1408,13 +1029,6 @@ - - - - - - - @@ -1427,13 +1041,6 @@ - - - - - - - @@ -1449,13 +1056,6 @@ - - - - - - - @@ -1468,13 +1068,6 @@ - - - - - - - @@ -1490,13 +1083,6 @@ - - - - - - - @@ -1509,13 +1095,6 @@ - - - - - - - @@ -1531,13 +1110,6 @@ - - - - - - - @@ -1550,13 +1122,6 @@ - - - - - - - @@ -1572,13 +1137,6 @@ - - - - - - - @@ -1591,13 +1149,6 @@ - - - - - - - @@ -1617,13 +1168,6 @@ - - - - - - - @@ -1636,13 +1180,6 @@ - - - - - - - @@ -1658,13 +1195,6 @@ - - - - - - - @@ -1677,13 +1207,6 @@ - - - - - - - @@ -1699,13 +1222,6 @@ - - - - - - - @@ -1718,13 +1234,6 @@ - - - - - - - @@ -1740,13 +1249,6 @@ - - - - - - - @@ -1759,13 +1261,6 @@ - - - - - - - @@ -1781,13 +1276,6 @@ - - - - - - - @@ -1800,13 +1288,6 @@ - - - - - - - @@ -1822,13 +1303,6 @@ - - - - - - - @@ -1841,13 +1315,6 @@ - - - - - - - @@ -1863,13 +1330,6 @@ - - - - - - - @@ -1882,13 +1342,6 @@ - - - - - - - @@ -1904,13 +1357,6 @@ - - - - - - - @@ -1923,13 +1369,6 @@ - - - - - - - @@ -1945,13 +1384,6 @@ - - - - - - - @@ -1964,13 +1396,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/IEEE_57_bus.svg b/network-area-diagram/src/test/resources/IEEE_57_bus.svg index c829f0e26..09d0923bd 100644 --- a/network-area-diagram/src/test/resources/IEEE_57_bus.svg +++ b/network-area-diagram/src/test/resources/IEEE_57_bus.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -499,13 +498,6 @@ - - - - - - - @@ -518,13 +510,6 @@ - - - - - - - @@ -540,13 +525,6 @@ - - - - - - - @@ -559,13 +537,6 @@ - - - - - - - @@ -581,13 +552,6 @@ - - - - - - - @@ -600,13 +564,6 @@ - - - - - - - @@ -622,13 +579,6 @@ - - - - - - - @@ -641,13 +591,6 @@ - - - - - - - @@ -663,13 +606,6 @@ - - - - - - - @@ -682,13 +618,6 @@ - - - - - - - @@ -704,13 +633,6 @@ - - - - - - - @@ -723,13 +645,6 @@ - - - - - - - @@ -745,13 +660,6 @@ - - - - - - - @@ -764,13 +672,6 @@ - - - - - - - @@ -786,13 +687,6 @@ - - - - - - - @@ -805,13 +699,6 @@ - - - - - - - @@ -831,13 +718,6 @@ - - - - - - - @@ -850,13 +730,6 @@ - - - - - - - @@ -872,13 +745,6 @@ - - - - - - - @@ -891,13 +757,6 @@ - - - - - - - @@ -913,13 +772,6 @@ - - - - - - - @@ -932,13 +784,6 @@ - - - - - - - @@ -954,13 +799,6 @@ - - - - - - - @@ -973,13 +811,6 @@ - - - - - - - @@ -995,13 +826,6 @@ - - - - - - - @@ -1014,13 +838,6 @@ - - - - - - - @@ -1036,13 +853,6 @@ - - - - - - - @@ -1055,13 +865,6 @@ - - - - - - - @@ -1081,13 +884,6 @@ - - - - - - - @@ -1100,13 +896,6 @@ - - - - - - - @@ -1126,13 +915,6 @@ - - - - - - - @@ -1145,13 +927,6 @@ - - - - - - - @@ -1167,13 +942,6 @@ - - - - - - - @@ -1186,13 +954,6 @@ - - - - - - - @@ -1208,13 +969,6 @@ - - - - - - - @@ -1227,13 +981,6 @@ - - - - - - - @@ -1249,13 +996,6 @@ - - - - - - - @@ -1268,13 +1008,6 @@ - - - - - - - @@ -1290,13 +1023,6 @@ - - - - - - - @@ -1309,13 +1035,6 @@ - - - - - - - @@ -1331,13 +1050,6 @@ - - - - - - - @@ -1350,13 +1062,6 @@ - - - - - - - @@ -1372,13 +1077,6 @@ - - - - - - - @@ -1391,13 +1089,6 @@ - - - - - - - @@ -1413,13 +1104,6 @@ - - - - - - - @@ -1432,13 +1116,6 @@ - - - - - - - @@ -1454,13 +1131,6 @@ - - - - - - - @@ -1473,13 +1143,6 @@ - - - - - - - @@ -1495,13 +1158,6 @@ - - - - - - - @@ -1514,13 +1170,6 @@ - - - - - - - @@ -1536,13 +1185,6 @@ - - - - - - - @@ -1555,13 +1197,6 @@ - - - - - - - @@ -1581,13 +1216,6 @@ - - - - - - - @@ -1600,13 +1228,6 @@ - - - - - - - @@ -1622,13 +1243,6 @@ - - - - - - - @@ -1641,13 +1255,6 @@ - - - - - - - @@ -1663,13 +1270,6 @@ - - - - - - - @@ -1682,13 +1282,6 @@ - - - - - - - @@ -1708,13 +1301,6 @@ - - - - - - - @@ -1727,13 +1313,6 @@ - - - - - - - @@ -1749,13 +1328,6 @@ - - - - - - - @@ -1768,13 +1340,6 @@ - - - - - - - @@ -1790,13 +1355,6 @@ - - - - - - - @@ -1809,13 +1367,6 @@ - - - - - - - @@ -1835,13 +1386,6 @@ - - - - - - - @@ -1854,13 +1398,6 @@ - - - - - - - @@ -1876,13 +1413,6 @@ - - - - - - - @@ -1895,13 +1425,6 @@ - - - - - - - @@ -1917,13 +1440,6 @@ - - - - - - - @@ -1936,13 +1452,6 @@ - - - - - - - @@ -1958,13 +1467,6 @@ - - - - - - - @@ -1977,13 +1479,6 @@ - - - - - - - @@ -1999,13 +1494,6 @@ - - - - - - - @@ -2018,13 +1506,6 @@ - - - - - - - @@ -2044,13 +1525,6 @@ - - - - - - - @@ -2063,13 +1537,6 @@ - - - - - - - @@ -2085,13 +1552,6 @@ - - - - - - - @@ -2104,13 +1564,6 @@ - - - - - - - @@ -2126,13 +1579,6 @@ - - - - - - - @@ -2145,13 +1591,6 @@ - - - - - - - @@ -2167,13 +1606,6 @@ - - - - - - - @@ -2186,13 +1618,6 @@ - - - - - - - @@ -2208,13 +1633,6 @@ - - - - - - - @@ -2227,13 +1645,6 @@ - - - - - - - @@ -2249,13 +1660,6 @@ - - - - - - - @@ -2268,13 +1672,6 @@ - - - - - - - @@ -2294,13 +1691,6 @@ - - - - - - - @@ -2313,13 +1703,6 @@ - - - - - - - @@ -2339,13 +1722,6 @@ - - - - - - - @@ -2358,13 +1734,6 @@ - - - - - - - @@ -2384,13 +1753,6 @@ - - - - - - - @@ -2403,13 +1765,6 @@ - - - - - - - @@ -2425,13 +1780,6 @@ - - - - - - - @@ -2444,13 +1792,6 @@ - - - - - - - @@ -2466,13 +1807,6 @@ - - - - - - - @@ -2485,13 +1819,6 @@ - - - - - - - @@ -2507,13 +1834,6 @@ - - - - - - - @@ -2526,13 +1846,6 @@ - - - - - - - @@ -2548,13 +1861,6 @@ - - - - - - - @@ -2567,13 +1873,6 @@ - - - - - - - @@ -2589,13 +1888,6 @@ - - - - - - - @@ -2608,13 +1900,6 @@ - - - - - - - @@ -2630,13 +1915,6 @@ - - - - - - - @@ -2649,13 +1927,6 @@ - - - - - - - @@ -2671,13 +1942,6 @@ - - - - - - - @@ -2690,13 +1954,6 @@ - - - - - - - @@ -2716,13 +1973,6 @@ - - - - - - - @@ -2735,13 +1985,6 @@ - - - - - - - @@ -2757,13 +2000,6 @@ - - - - - - - @@ -2776,13 +2012,6 @@ - - - - - - - @@ -2798,13 +2027,6 @@ - - - - - - - @@ -2817,13 +2039,6 @@ - - - - - - - @@ -2839,13 +2054,6 @@ - - - - - - - @@ -2858,13 +2066,6 @@ - - - - - - - @@ -2880,13 +2081,6 @@ - - - - - - - @@ -2899,13 +2093,6 @@ - - - - - - - @@ -2921,26 +2108,12 @@ - - - - - - - - - - - - - - - - - - + + + + @@ -2962,13 +2135,6 @@ - - - - - - - @@ -2981,13 +2147,6 @@ - - - - - - - @@ -3003,13 +2162,6 @@ - - - - - - - @@ -3022,13 +2174,6 @@ - - - - - - - @@ -3044,13 +2189,6 @@ - - - - - - - @@ -3063,13 +2201,6 @@ - - - - - - - @@ -3089,13 +2220,6 @@ - - - - - - - @@ -3108,13 +2232,6 @@ - - - - - - - @@ -3130,13 +2247,6 @@ - - - - - - - @@ -3149,13 +2259,6 @@ - - - - - - - @@ -3171,13 +2274,6 @@ - - - - - - - @@ -3190,13 +2286,6 @@ - - - - - - - @@ -3216,13 +2305,6 @@ - - - - - - - @@ -3235,13 +2317,6 @@ - - - - - - - @@ -3261,13 +2336,6 @@ - - - - - - - @@ -3280,13 +2348,6 @@ - - - - - - - @@ -3302,13 +2363,6 @@ - - - - - - - @@ -3321,13 +2375,6 @@ - - - - - - - @@ -3347,13 +2394,6 @@ - - - - - - - @@ -3366,13 +2406,6 @@ - - - - - - - @@ -3388,13 +2421,6 @@ - - - - - - - @@ -3407,13 +2433,6 @@ - - - - - - - @@ -3429,13 +2448,6 @@ - - - - - - - @@ -3448,13 +2460,6 @@ - - - - - - - @@ -3470,13 +2475,6 @@ - - - - - - - @@ -3489,13 +2487,6 @@ - - - - - - - @@ -3511,13 +2502,6 @@ - - - - - - - @@ -3530,13 +2514,6 @@ - - - - - - - @@ -3552,13 +2529,6 @@ - - - - - - - @@ -3571,13 +2541,6 @@ - - - - - - - @@ -3593,13 +2556,6 @@ - - - - - - - @@ -3612,13 +2568,6 @@ - - - - - - - @@ -3634,13 +2583,6 @@ - - - - - - - @@ -3653,13 +2595,6 @@ - - - - - - - @@ -3675,13 +2610,6 @@ - - - - - - - @@ -3694,13 +2622,6 @@ - - - - - - - @@ -3716,13 +2637,6 @@ - - - - - - - @@ -3735,13 +2649,6 @@ - - - - - - - @@ -3761,13 +2668,6 @@ - - - - - - - @@ -3780,13 +2680,6 @@ - - - - - - - @@ -3802,13 +2695,6 @@ - - - - - - - @@ -3821,13 +2707,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/current_limits.svg b/network-area-diagram/src/test/resources/current_limits.svg index 7cebe6bb7..0241847f7 100644 --- a/network-area-diagram/src/test/resources/current_limits.svg +++ b/network-area-diagram/src/test/resources/current_limits.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -88,13 +87,6 @@ 101 - - - - - - 150 - @@ -107,13 +99,6 @@ - - - - - - - @@ -128,18 +113,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/dangling_line_connected.svg b/network-area-diagram/src/test/resources/dangling_line_connected.svg index 67982c089..de9ca7d2a 100644 --- a/network-area-diagram/src/test/resources/dangling_line_connected.svg +++ b/network-area-diagram/src/test/resources/dangling_line_connected.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -100,13 +99,6 @@ - - - - - - - @@ -119,13 +111,6 @@ - - - - - - - @@ -140,13 +125,6 @@ - - - - - - - @@ -159,13 +137,6 @@ - - - - - - - @@ -180,13 +151,6 @@ - - - - - - - @@ -199,13 +163,6 @@ - - - - - - - @@ -224,13 +181,6 @@ - - - - - - - @@ -243,13 +193,6 @@ - - - - - - - @@ -268,18 +211,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/dangling_line_disconnected.svg b/network-area-diagram/src/test/resources/dangling_line_disconnected.svg index 315217a48..7f7fb9931 100644 --- a/network-area-diagram/src/test/resources/dangling_line_disconnected.svg +++ b/network-area-diagram/src/test/resources/dangling_line_disconnected.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -100,13 +99,6 @@ - - - - - - - @@ -119,13 +111,6 @@ - - - - - - - @@ -140,13 +125,6 @@ - - - - - - - @@ -159,13 +137,6 @@ - - - - - - - @@ -180,13 +151,6 @@ - - - - - - - @@ -199,13 +163,6 @@ - - - - - - - @@ -224,13 +181,6 @@ - - - - - - - @@ -243,13 +193,6 @@ - - - - - - - @@ -268,18 +211,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/detailed_text_node.svg b/network-area-diagram/src/test/resources/detailed_text_node.svg index 59ffd451c..7d18b2123 100644 --- a/network-area-diagram/src/test/resources/detailed_text_node.svg +++ b/network-area-diagram/src/test/resources/detailed_text_node.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -153,13 +152,6 @@ - - - - - - - @@ -172,13 +164,6 @@ - - - - - - - @@ -193,18 +178,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/detailed_text_node_no_legend.svg b/network-area-diagram/src/test/resources/detailed_text_node_no_legend.svg index 478591396..6d39e0b18 100644 --- a/network-area-diagram/src/test/resources/detailed_text_node_no_legend.svg +++ b/network-area-diagram/src/test/resources/detailed_text_node_no_legend.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -153,13 +152,6 @@ - - - - - - - @@ -172,13 +164,6 @@ - - - - - - - @@ -193,18 +178,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.0.svg b/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.0.svg index 0d33f6bb1..6f7bda9fa 100644 --- a/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.0.svg +++ b/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.0.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -162,13 +161,6 @@ - - - - - - - @@ -181,13 +173,6 @@ - - - - - - - @@ -202,13 +187,6 @@ - - - - - - - @@ -221,13 +199,6 @@ - - - - - - - @@ -246,13 +217,6 @@ - - - - - - - @@ -265,13 +229,6 @@ - - - - - - - @@ -286,13 +243,6 @@ - - - - - - - @@ -305,13 +255,6 @@ - - - - - - - @@ -330,13 +273,6 @@ - - - - - - - @@ -349,13 +285,6 @@ - - - - - - - @@ -374,13 +303,6 @@ - - - - - - - @@ -393,13 +315,6 @@ - - - - - - - @@ -414,13 +329,6 @@ - - - - - - - @@ -433,13 +341,6 @@ - - - - - - - @@ -454,13 +355,6 @@ - - - - - - - @@ -473,13 +367,6 @@ - - - - - - - @@ -494,13 +381,6 @@ - - - - - - - @@ -513,13 +393,6 @@ - - - - - - - @@ -534,13 +407,6 @@ - - - - - - - @@ -553,13 +419,6 @@ - - - - - - - @@ -578,13 +437,6 @@ - - - - - - - @@ -597,13 +449,6 @@ - - - - - - - @@ -618,13 +463,6 @@ - - - - - - - @@ -637,13 +475,6 @@ - - - - - - - @@ -658,13 +489,6 @@ - - - - - - - @@ -677,13 +501,6 @@ - - - - - - - @@ -698,13 +515,6 @@ - - - - - - - @@ -717,13 +527,6 @@ - - - - - - - @@ -738,13 +541,6 @@ - - - - - - - @@ -757,13 +553,6 @@ - - - - - - - @@ -778,13 +567,6 @@ - - - - - - - @@ -797,13 +579,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.2.svg b/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.2.svg index b10763aa4..4000cd23e 100644 --- a/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.2.svg +++ b/network-area-diagram/src/test/resources/diamond-spring-repulsion-factor-0.2.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -162,13 +161,6 @@ - - - - - - - @@ -181,13 +173,6 @@ - - - - - - - @@ -202,13 +187,6 @@ - - - - - - - @@ -221,13 +199,6 @@ - - - - - - - @@ -246,13 +217,6 @@ - - - - - - - @@ -265,13 +229,6 @@ - - - - - - - @@ -286,13 +243,6 @@ - - - - - - - @@ -305,13 +255,6 @@ - - - - - - - @@ -330,13 +273,6 @@ - - - - - - - @@ -349,13 +285,6 @@ - - - - - - - @@ -374,13 +303,6 @@ - - - - - - - @@ -393,13 +315,6 @@ - - - - - - - @@ -414,13 +329,6 @@ - - - - - - - @@ -433,13 +341,6 @@ - - - - - - - @@ -454,13 +355,6 @@ - - - - - - - @@ -473,13 +367,6 @@ - - - - - - - @@ -494,13 +381,6 @@ - - - - - - - @@ -513,13 +393,6 @@ - - - - - - - @@ -534,13 +407,6 @@ - - - - - - - @@ -553,13 +419,6 @@ - - - - - - - @@ -578,13 +437,6 @@ - - - - - - - @@ -597,13 +449,6 @@ - - - - - - - @@ -618,13 +463,6 @@ - - - - - - - @@ -637,13 +475,6 @@ - - - - - - - @@ -658,13 +489,6 @@ - - - - - - - @@ -677,13 +501,6 @@ - - - - - - - @@ -698,13 +515,6 @@ - - - - - - - @@ -717,13 +527,6 @@ - - - - - - - @@ -738,13 +541,6 @@ - - - - - - - @@ -757,13 +553,6 @@ - - - - - - - @@ -778,13 +567,6 @@ - - - - - - - @@ -797,13 +579,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/edge_info_current.svg b/network-area-diagram/src/test/resources/edge_info_current.svg new file mode 100644 index 000000000..4f4e0b128 --- /dev/null +++ b/network-area-diagram/src/test/resources/edge_info_current.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + Voltage level 1 + + + + Voltage level 2 + + + + dl1 + + + + + + l1 + + + + + + + + + 153 + + + + + + + + + + + + 152 + + + + + + dl1 + + + + + + + + + + + + + + + + + + + + + + + +
+
Voltage level 1
+ + + + + +
+
+
380.0 kV / °
+
+ + +
+
Voltage level 2
+ + + + + +
+
+
379.0 kV / °
+
+ + + diff --git a/network-area-diagram/src/test/resources/edge_info_double_labels.svg b/network-area-diagram/src/test/resources/edge_info_double_labels.svg index c11b49485..32ba2cb88 100644 --- a/network-area-diagram/src/test/resources/edge_info_double_labels.svg +++ b/network-area-diagram/src/test/resources/edge_info_double_labels.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} diff --git a/network-area-diagram/src/test/resources/edge_info_missing_label.svg b/network-area-diagram/src/test/resources/edge_info_missing_label.svg index 509209f03..e12016138 100644 --- a/network-area-diagram/src/test/resources/edge_info_missing_label.svg +++ b/network-area-diagram/src/test/resources/edge_info_missing_label.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} diff --git a/network-area-diagram/src/test/resources/edge_info_perpendicular_label.svg b/network-area-diagram/src/test/resources/edge_info_perpendicular_label.svg index a94b54e63..76072dbac 100644 --- a/network-area-diagram/src/test/resources/edge_info_perpendicular_label.svg +++ b/network-area-diagram/src/test/resources/edge_info_perpendicular_label.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} diff --git a/network-area-diagram/src/test/resources/edge_info_reactive_power.svg b/network-area-diagram/src/test/resources/edge_info_reactive_power.svg new file mode 100644 index 000000000..01f979db9 --- /dev/null +++ b/network-area-diagram/src/test/resources/edge_info_reactive_power.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + Voltage level 1 + + + + Voltage level 2 + + + + dl1 + + + + + + l1 + + + + + + + + + 10 + + + + + + + + + + + + 11 + + + + + + dl1 + + + + + + + + + + + + + + + + + + + + + + + +
+
Voltage level 1
+ + + + + +
+
+
380.0 kV / °
+
+ + +
+
Voltage level 2
+ + + + + +
+
+
379.0 kV / °
+
+ + + diff --git a/network-area-diagram/src/test/resources/edge_info_shift.svg b/network-area-diagram/src/test/resources/edge_info_shift.svg index 1700c9d72..4f81e1047 100644 --- a/network-area-diagram/src/test/resources/edge_info_shift.svg +++ b/network-area-diagram/src/test/resources/edge_info_shift.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -100,13 +99,6 @@ - - - - - - - @@ -119,13 +111,6 @@ - - - - - - - @@ -140,13 +125,6 @@ - - - - - - - @@ -159,13 +137,6 @@ - - - - - - - @@ -180,13 +151,6 @@ - - - - - - - @@ -199,13 +163,6 @@ - - - - - - - @@ -224,13 +181,6 @@ - - - - - - - @@ -243,13 +193,6 @@ - - - - - - - @@ -268,18 +211,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/edge_with_id.svg b/network-area-diagram/src/test/resources/edge_with_id.svg index e66a8dce8..4640ca815 100644 --- a/network-area-diagram/src/test/resources/edge_with_id.svg +++ b/network-area-diagram/src/test/resources/edge_with_id.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -100,13 +99,6 @@ - - - - - - - @@ -119,13 +111,6 @@ - - - - - - - @@ -145,13 +130,6 @@ - - - - - - - @@ -164,13 +142,6 @@ - - - - - - - @@ -190,13 +161,6 @@ - - - - - - - @@ -209,13 +173,6 @@ - - - - - - - @@ -237,13 +194,6 @@ - - - - - - - @@ -256,13 +206,6 @@ - - - - - - - @@ -284,18 +227,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/edge_without_id.svg b/network-area-diagram/src/test/resources/edge_without_id.svg index 67982c089..de9ca7d2a 100644 --- a/network-area-diagram/src/test/resources/edge_without_id.svg +++ b/network-area-diagram/src/test/resources/edge_without_id.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -100,13 +99,6 @@ - - - - - - - @@ -119,13 +111,6 @@ - - - - - - - @@ -140,13 +125,6 @@ - - - - - - - @@ -159,13 +137,6 @@ - - - - - - - @@ -180,13 +151,6 @@ - - - - - - - @@ -199,13 +163,6 @@ - - - - - - - @@ -224,13 +181,6 @@ - - - - - - - @@ -243,13 +193,6 @@ - - - - - - - @@ -268,18 +211,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/hvdc-vl-depth-1.svg b/network-area-diagram/src/test/resources/hvdc-vl-depth-1.svg index be6dca455..b0025be1e 100644 --- a/network-area-diagram/src/test/resources/hvdc-vl-depth-1.svg +++ b/network-area-diagram/src/test/resources/hvdc-vl-depth-1.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -85,13 +84,6 @@ 100 - - - - - - 50 - @@ -104,13 +96,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/hvdc.svg b/network-area-diagram/src/test/resources/hvdc.svg index 99a7c6ee4..2734ca61b 100644 --- a/network-area-diagram/src/test/resources/hvdc.svg +++ b/network-area-diagram/src/test/resources/hvdc.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -107,13 +106,6 @@ -80 - - - - - - -10 - @@ -126,13 +118,6 @@ 80 - - - - - - 5 - @@ -153,13 +138,6 @@ 10 - - - - - - -512 - @@ -172,13 +150,6 @@ -10 - - - - - - -120 - @@ -197,13 +168,6 @@ 81 - - - - - - - @@ -216,13 +180,6 @@ -79 - - - - - - - @@ -241,13 +198,6 @@ 110 - - - - - - 190 - @@ -260,13 +210,6 @@ -110 - - - - - - -185 - @@ -282,13 +225,6 @@ 240 - - - - - - 2 - @@ -301,13 +237,6 @@ -240 - - - - - - 3 - diff --git a/network-area-diagram/src/test/resources/parallel_transformers.svg b/network-area-diagram/src/test/resources/parallel_transformers.svg index f286d512d..5676eb35d 100644 --- a/network-area-diagram/src/test/resources/parallel_transformers.svg +++ b/network-area-diagram/src/test/resources/parallel_transformers.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -91,13 +90,6 @@ - - - - - - - @@ -110,13 +102,6 @@ - - - - - - - @@ -135,13 +120,6 @@ - - - - - - - @@ -154,13 +132,6 @@ - - - - - - - @@ -179,18 +150,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/simple-eu-loop100.svg b/network-area-diagram/src/test/resources/simple-eu-loop100.svg index 0262e0dfe..0e42dd7ea 100644 --- a/network-area-diagram/src/test/resources/simple-eu-loop100.svg +++ b/network-area-diagram/src/test/resources/simple-eu-loop100.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -219,13 +218,6 @@ - - - - - - - @@ -238,13 +230,6 @@ - - - - - - - @@ -260,13 +245,6 @@ - - - - - - - @@ -279,13 +257,6 @@ - - - - - - - @@ -301,13 +272,6 @@ - - - - - - - @@ -320,13 +284,6 @@ - - - - - - - @@ -342,13 +299,6 @@ - - - - - - - @@ -361,13 +311,6 @@ - - - - - - - @@ -383,13 +326,6 @@ - - - - - - - @@ -402,13 +338,6 @@ - - - - - - - @@ -429,13 +358,6 @@ - - - - - - - @@ -448,13 +370,6 @@ - - - - - - - @@ -470,13 +385,6 @@ - - - - - - - @@ -489,13 +397,6 @@ - - - - - - - @@ -511,13 +412,6 @@ - - - - - - - @@ -530,13 +424,6 @@ - - - - - - - @@ -552,13 +439,6 @@ - - - - - - - @@ -571,13 +451,6 @@ - - - - - - - @@ -593,13 +466,6 @@ - - - - - - - @@ -612,13 +478,6 @@ - - - - - - - @@ -634,13 +493,6 @@ - - - - - - - @@ -653,13 +505,6 @@ - - - - - - - @@ -675,13 +520,6 @@ - - - - - - - @@ -694,13 +532,6 @@ - - - - - - - @@ -716,13 +547,6 @@ - - - - - - - @@ -735,13 +559,6 @@ - - - - - - - @@ -757,13 +574,6 @@ - - - - - - - @@ -776,13 +586,6 @@ - - - - - - - @@ -798,13 +601,6 @@ - - - - - - - @@ -817,13 +613,6 @@ - - - - - - - @@ -844,13 +633,6 @@ - - - - - - - @@ -863,13 +645,6 @@ - - - - - - - @@ -885,13 +660,6 @@ - - - - - - - @@ -904,13 +672,6 @@ - - - - - - - @@ -926,13 +687,6 @@ - - - - - - - @@ -945,13 +699,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/simple-eu-loop80.svg b/network-area-diagram/src/test/resources/simple-eu-loop80.svg index b6875737d..76f654178 100644 --- a/network-area-diagram/src/test/resources/simple-eu-loop80.svg +++ b/network-area-diagram/src/test/resources/simple-eu-loop80.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -219,13 +218,6 @@ - - - - - - - @@ -238,13 +230,6 @@ - - - - - - - @@ -260,13 +245,6 @@ - - - - - - - @@ -279,13 +257,6 @@ - - - - - - - @@ -301,13 +272,6 @@ - - - - - - - @@ -320,13 +284,6 @@ - - - - - - - @@ -342,13 +299,6 @@ - - - - - - - @@ -361,13 +311,6 @@ - - - - - - - @@ -383,13 +326,6 @@ - - - - - - - @@ -402,13 +338,6 @@ - - - - - - - @@ -429,13 +358,6 @@ - - - - - - - @@ -448,13 +370,6 @@ - - - - - - - @@ -470,13 +385,6 @@ - - - - - - - @@ -489,13 +397,6 @@ - - - - - - - @@ -511,13 +412,6 @@ - - - - - - - @@ -530,13 +424,6 @@ - - - - - - - @@ -552,13 +439,6 @@ - - - - - - - @@ -571,13 +451,6 @@ - - - - - - - @@ -593,13 +466,6 @@ - - - - - - - @@ -612,13 +478,6 @@ - - - - - - - @@ -634,13 +493,6 @@ - - - - - - - @@ -653,13 +505,6 @@ - - - - - - - @@ -675,13 +520,6 @@ - - - - - - - @@ -694,13 +532,6 @@ - - - - - - - @@ -716,13 +547,6 @@ - - - - - - - @@ -735,13 +559,6 @@ - - - - - - - @@ -757,13 +574,6 @@ - - - - - - - @@ -776,13 +586,6 @@ - - - - - - - @@ -798,13 +601,6 @@ - - - - - - - @@ -817,13 +613,6 @@ - - - - - - - @@ -844,13 +633,6 @@ - - - - - - - @@ -863,13 +645,6 @@ - - - - - - - @@ -885,13 +660,6 @@ - - - - - - - @@ -904,13 +672,6 @@ - - - - - - - @@ -926,13 +687,6 @@ - - - - - - - @@ -945,13 +699,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/simple-eu.svg b/network-area-diagram/src/test/resources/simple-eu.svg index aec61aa9c..0cd8ff7e2 100644 --- a/network-area-diagram/src/test/resources/simple-eu.svg +++ b/network-area-diagram/src/test/resources/simple-eu.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -219,13 +218,6 @@ - - - - - - - @@ -238,13 +230,6 @@ - - - - - - - @@ -260,13 +245,6 @@ - - - - - - - @@ -279,13 +257,6 @@ - - - - - - - @@ -301,13 +272,6 @@ - - - - - - - @@ -320,13 +284,6 @@ - - - - - - - @@ -342,13 +299,6 @@ - - - - - - - @@ -361,13 +311,6 @@ - - - - - - - @@ -383,13 +326,6 @@ - - - - - - - @@ -402,13 +338,6 @@ - - - - - - - @@ -429,13 +358,6 @@ - - - - - - - @@ -448,13 +370,6 @@ - - - - - - - @@ -470,13 +385,6 @@ - - - - - - - @@ -489,13 +397,6 @@ - - - - - - - @@ -511,13 +412,6 @@ - - - - - - - @@ -530,13 +424,6 @@ - - - - - - - @@ -552,13 +439,6 @@ - - - - - - - @@ -571,13 +451,6 @@ - - - - - - - @@ -593,13 +466,6 @@ - - - - - - - @@ -612,13 +478,6 @@ - - - - - - - @@ -634,13 +493,6 @@ - - - - - - - @@ -653,13 +505,6 @@ - - - - - - - @@ -675,13 +520,6 @@ - - - - - - - @@ -694,13 +532,6 @@ - - - - - - - @@ -716,13 +547,6 @@ - - - - - - - @@ -735,13 +559,6 @@ - - - - - - - @@ -757,13 +574,6 @@ - - - - - - - @@ -776,13 +586,6 @@ - - - - - - - @@ -798,13 +601,6 @@ - - - - - - - @@ -817,13 +613,6 @@ - - - - - - - @@ -844,13 +633,6 @@ - - - - - - - @@ -863,13 +645,6 @@ - - - - - - - @@ -885,13 +660,6 @@ - - - - - - - @@ -904,13 +672,6 @@ - - - - - - - @@ -926,13 +687,6 @@ - - - - - - - @@ -945,13 +699,6 @@ - - - - - - - diff --git a/network-area-diagram/src/test/resources/vl_description_id.svg b/network-area-diagram/src/test/resources/vl_description_id.svg index 23c09cc11..583868282 100644 --- a/network-area-diagram/src/test/resources/vl_description_id.svg +++ b/network-area-diagram/src/test/resources/vl_description_id.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -153,13 +152,6 @@ - - - - - - - @@ -172,13 +164,6 @@ - - - - - - - @@ -193,18 +178,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/vl_description_substation.svg b/network-area-diagram/src/test/resources/vl_description_substation.svg index 5726c1a41..879ea2591 100644 --- a/network-area-diagram/src/test/resources/vl_description_substation.svg +++ b/network-area-diagram/src/test/resources/vl_description_substation.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -153,13 +152,6 @@ - - - - - - - @@ -172,13 +164,6 @@ - - - - - - - @@ -193,18 +178,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/vl_description_substation_id.svg b/network-area-diagram/src/test/resources/vl_description_substation_id.svg index 964d8aba4..04e8df6b5 100644 --- a/network-area-diagram/src/test/resources/vl_description_substation_id.svg +++ b/network-area-diagram/src/test/resources/vl_description_substation_id.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -153,13 +152,6 @@ - - - - - - - @@ -172,13 +164,6 @@ - - - - - - - @@ -193,18 +178,10 @@ - - - - - - - - diff --git a/network-area-diagram/src/test/resources/voltage_limits.svg b/network-area-diagram/src/test/resources/voltage_limits.svg index d26ca97ab..8134669bb 100644 --- a/network-area-diagram/src/test/resources/voltage_limits.svg +++ b/network-area-diagram/src/test/resources/voltage_limits.svg @@ -13,9 +13,8 @@ .nad-state-out .nad-arrow-in {visibility: hidden} .nad-state-in .nad-arrow-out {visibility: hidden} .nad-active path {stroke: none; fill: #546e7a} -.nad-active {visibility: visible} -.nad-reactive {visibility: hidden} .nad-reactive path {stroke: none; fill: #0277bd} +.nad-current path {stroke: none; fill: #bd4802} .nad-text-background {flood-color: #90a4aeaa} .nad-text-nodes {font: 25px serif; fill: black; dominant-baseline: central} .nad-text-nodes foreignObject {overflow: visible; color: black} @@ -91,13 +90,6 @@ - - - - - - - @@ -110,13 +102,6 @@ - - - - - - - @@ -131,13 +116,6 @@ - - - - - - - @@ -150,13 +128,6 @@ - - - - - - - @@ -171,18 +142,10 @@ - - - - - - - - diff --git a/single-line-diagram/single-line-diagram-core/pom.xml b/single-line-diagram/single-line-diagram-core/pom.xml index 5b207fd8a..ee5b90fb1 100644 --- a/single-line-diagram/single-line-diagram-core/pom.xml +++ b/single-line-diagram/single-line-diagram-core/pom.xml @@ -91,5 +91,10 @@ powsybl-tools-test test + + com.powsybl + powsybl-ieee-cdf-converter + test + diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java index 6033f3c58..8ad81051a 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java @@ -95,12 +95,14 @@ public class LayoutParameters { private int voltageValuePrecision = 1; private int powerValuePrecision = 0; private int angleValuePrecision = 1; + private int currentValuePrecision = 0; /** em dash unicode for undefined value */ private String undefinedValueSymbol = "\u2014"; @JsonIgnore private Map componentsSize; + private boolean displayCurrentFeederInfo = false; @JsonCreator public LayoutParameters() { @@ -147,8 +149,11 @@ public LayoutParameters(@JsonProperty("voltageLevelPadding") Padding voltageLeve @JsonProperty("voltageValuePrecision") int voltageValuePrecision, @JsonProperty("powerValuePrecision") int powerValuePrecision, @JsonProperty("angleValuePrecision") int angleValuePrecision, + @JsonProperty("currentValuePrecision") int currentValuePrecision, + @JsonProperty("displayCurrentFeederInfo") boolean displayCurrentFeederInfo, @JsonProperty("undefinedValueSymbol") String undefinedValueSymbol, @JsonProperty("removeFictitiousSwitchNodes") boolean removeFictitiousSwitchNodes) { + this.diagramPadding = diagramPadding; this.voltageLevelPadding = voltageLevelPadding; this.verticalSpaceBus = verticalSpaceBus; @@ -189,6 +194,8 @@ public LayoutParameters(@JsonProperty("voltageLevelPadding") Padding voltageLeve this.voltageValuePrecision = voltageValuePrecision; this.powerValuePrecision = powerValuePrecision; this.angleValuePrecision = angleValuePrecision; + this.currentValuePrecision = currentValuePrecision; + this.displayCurrentFeederInfo = displayCurrentFeederInfo; this.undefinedValueSymbol = undefinedValueSymbol; this.removeFictitiousSwitchNodes = removeFictitiousSwitchNodes; } @@ -236,6 +243,8 @@ public LayoutParameters(LayoutParameters other) { voltageValuePrecision = other.voltageValuePrecision; powerValuePrecision = other.powerValuePrecision; angleValuePrecision = other.angleValuePrecision; + currentValuePrecision = other.currentValuePrecision; + displayCurrentFeederInfo = other.displayCurrentFeederInfo; undefinedValueSymbol = other.undefinedValueSymbol; removeFictitiousSwitchNodes = other.removeFictitiousSwitchNodes; } @@ -617,8 +626,26 @@ public LayoutParameters setAngleValuePrecision(int angleValuePrecision) { return this; } + public int getCurrentValuePrecision() { + return currentValuePrecision; + } + + public LayoutParameters setCurrentValuePrecision(int currentValuePrecision) { + this.currentValuePrecision = currentValuePrecision; + return this; + } + public ValueFormatter createValueFormatter() { - return new ValueFormatter(powerValuePrecision, voltageValuePrecision, angleValuePrecision, Locale.forLanguageTag(languageTag), undefinedValueSymbol); + return new ValueFormatter(powerValuePrecision, voltageValuePrecision, currentValuePrecision, angleValuePrecision, Locale.forLanguageTag(languageTag), undefinedValueSymbol); + } + + public boolean isDisplayCurrentFeederInfo() { + return this.displayCurrentFeederInfo; + } + + public LayoutParameters setDisplayCurrentFeederInfo(boolean displayCurrentFeederInfo) { + this.displayCurrentFeederInfo = displayCurrentFeederInfo; + return this; } public enum Alignment { diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/library/ComponentTypeName.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/library/ComponentTypeName.java index 9bc867e91..1ce98b408 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/library/ComponentTypeName.java +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/library/ComponentTypeName.java @@ -12,6 +12,7 @@ public final class ComponentTypeName { public static final String ARROW_ACTIVE = "ARROW_ACTIVE"; public static final String ARROW_REACTIVE = "ARROW_REACTIVE"; + public static final String ARROW_CURRENT = "ARROW_CURRENT"; public static final String BUSBAR_SECTION = "BUSBAR_SECTION"; public static final String BREAKER = "BREAKER"; public static final String DISCONNECTOR = "DISCONNECTOR"; diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultDiagramLabelProvider.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultDiagramLabelProvider.java index c7168b06a..9f824e2a2 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultDiagramLabelProvider.java +++ b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultDiagramLabelProvider.java @@ -20,6 +20,7 @@ import java.util.stream.Collectors; import static com.powsybl.sld.library.ComponentTypeName.ARROW_ACTIVE; +import static com.powsybl.sld.library.ComponentTypeName.ARROW_CURRENT; import static com.powsybl.sld.library.ComponentTypeName.ARROW_REACTIVE; import static com.powsybl.sld.model.coordinate.Direction.BOTTOM; @@ -195,28 +196,30 @@ private NodeDecorator getBranchStatusDecorator(Node node, Direction direction, S } private List buildFeederInfos(ThreeWindingsTransformer transformer, ThreeWindingsTransformer.Side side) { - return Arrays.asList( - new DirectionalFeederInfo(ARROW_ACTIVE, transformer.getTerminal(side).getP(), valueFormatter::formatPower), - new DirectionalFeederInfo(ARROW_REACTIVE, transformer.getTerminal(side).getQ(), valueFormatter::formatPower)); + return this.buildFeederInfos(transformer.getTerminal(side)); } private List buildFeederInfos(Injection injection) { - return Arrays.asList( - new DirectionalFeederInfo(ARROW_ACTIVE, injection.getTerminal().getP(), valueFormatter::formatPower), - new DirectionalFeederInfo(ARROW_REACTIVE, injection.getTerminal().getQ(), valueFormatter::formatPower)); + return this.buildFeederInfos(injection.getTerminal()); } private List buildFeederInfos(Branch branch, Branch.Side side) { - return Arrays.asList( - new DirectionalFeederInfo(ARROW_ACTIVE, branch.getTerminal(side).getP(), valueFormatter::formatPower), - new DirectionalFeederInfo(ARROW_REACTIVE, branch.getTerminal(side).getQ(), valueFormatter::formatPower)); + return this.buildFeederInfos(branch.getTerminal(side)); } private List buildFeederInfos(HvdcLine hvdcLine, NodeSide side) { HvdcConverterStation hvdcConverterStation = side == NodeSide.ONE ? hvdcLine.getConverterStation1() : hvdcLine.getConverterStation2(); - return Arrays.asList( - new DirectionalFeederInfo(ARROW_ACTIVE, hvdcConverterStation.getTerminal().getP(), valueFormatter::formatPower), - new DirectionalFeederInfo(ARROW_REACTIVE, hvdcConverterStation.getTerminal().getQ(), valueFormatter::formatPower)); + return this.buildFeederInfos(hvdcConverterStation.getTerminal()); + } + + private List buildFeederInfos(Terminal terminal) { + List feederInfoList = new ArrayList<>(); + feederInfoList.add(new DirectionalFeederInfo(ARROW_ACTIVE, terminal.getP(), valueFormatter::formatPower)); + feederInfoList.add(new DirectionalFeederInfo(ARROW_REACTIVE, terminal.getQ(), valueFormatter::formatPower)); + if (this.layoutParameters.isDisplayCurrentFeederInfo()) { + feederInfoList.add(new DirectionalFeederInfo(ARROW_CURRENT, terminal.getI(), valueFormatter::formatCurrent)); + } + return feederInfoList; } } diff --git a/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.css b/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.css index e81d8ea76..6e9d639d3 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.css +++ b/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.css @@ -39,6 +39,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.json b/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.json index 71d3686e9..92a829105 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.json +++ b/single-line-diagram/single-line-diagram-core/src/main/resources/ConvergenceLibrary/components.json @@ -443,5 +443,28 @@ "styleClass" : "sld-arrow-in" } ], "styleClass" : "sld-reactive-power" - } ] + }, { + "type": "ARROW_CURRENT", + "size": { + "width": 10.0, + "height": 10.0 + }, + "transformations": { + "LEFT": "ROTATION", + "RIGHT": "ROTATION" + }, + "subComponents": [ + { + "name": "UP", + "fileName": "arrow-up.svg", + "styleClass": "sld-arrow-out" + }, + { + "name": "DOWN", + "fileName": "arrow-down.svg", + "styleClass": "sld-arrow-in" + } + ], + "styleClass": "sld-current" + }] } \ No newline at end of file diff --git a/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.css b/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.css index 8530285da..d2bf8d144 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.css +++ b/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.css @@ -27,6 +27,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill: #37474f} .sld-feeder-info.sld-reactive-power {fill: #0277bd} +.sld-feeder-info.sld-current {fill:#800080} .sld-frame {fill: var(--sld-background-color, transparent)} /* fictitious switches and busbar */ .sld-breaker.sld-fictitious {stroke: maroon; stroke-width: 1.5} diff --git a/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.json b/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.json index 169d19516..654b077f8 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.json +++ b/single-line-diagram/single-line-diagram-core/src/main/resources/FlatDesignLibrary/components.json @@ -523,6 +523,29 @@ } ], "styleClass": "sld-reactive-power" + }, { + "type": "ARROW_CURRENT", + "size": { + "width": 10.0, + "height": 10.0 + }, + "transformations": { + "LEFT": "ROTATION", + "RIGHT": "ROTATION" + }, + "subComponents": [ + { + "name": "UP", + "fileName": "arrow-up.svg", + "styleClass": "sld-arrow-out" + }, + { + "name": "DOWN", + "fileName": "arrow-down.svg", + "styleClass": "sld-arrow-in" + } + ], + "styleClass": "sld-current" } ] } diff --git a/single-line-diagram/single-line-diagram-core/src/main/resources/tautologies.css b/single-line-diagram/single-line-diagram-core/src/main/resources/tautologies.css index 625289492..eb5a18060 100644 --- a/single-line-diagram/single-line-diagram-core/src/main/resources/tautologies.css +++ b/single-line-diagram/single-line-diagram-core/src/main/resources/tautologies.css @@ -7,5 +7,6 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} diff --git a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java index 868c1ae1c..de9daa56b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java +++ b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestFeederInfos.java @@ -6,6 +6,8 @@ */ package com.powsybl.sld.iidm; +import com.powsybl.ieeecdf.converter.IeeeCdfNetworkFactory; + import com.powsybl.iidm.network.*; import com.powsybl.iidm.network.extensions.ConnectablePosition; import com.powsybl.sld.builders.NetworkGraphBuilder; @@ -20,6 +22,8 @@ import java.util.*; +import static com.powsybl.sld.library.ComponentTypeName.*; + import static com.powsybl.sld.library.ComponentTypeName.ARROW_ACTIVE; import static com.powsybl.sld.library.ComponentTypeName.ARROW_REACTIVE; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -90,8 +94,27 @@ public List getNodeDecorators(Node node, Dir assertEquals(toString("/TestFeederInfos.svg"), toSVG(g, "/TestFeederInfos.svg", manyFeederInfoProvider, new BasicStyleProvider())); } + @Test + void testAllPossibleInfoItems() { + // build graph + network.getLoad("l").getTerminal().setP(100).setQ(10).getBusView().getBus().setV(vl.getNominalV()); + VoltageLevelGraph g = graphBuilder.buildVoltageLevelGraph(vl.getId()); + + layoutParameters.setSpaceForFeederInfos(100) + .setFeederInfosIntraMargin(5) + .setPowerValuePrecision(0) + .setDisplayCurrentFeederInfo(true); + + // Run layout + voltageLevelGraphLayout(g); + + // write SVG and compare to reference + assertEquals(toString("/TestAllPossibleInfoItems.svg"), toSVG(g, "/TestAllPossibleInfoItems.svg", new DefaultDiagramLabelProvider(network, getResourcesComponentLibrary(), layoutParameters), new BasicStyleProvider())); + } + @Test void testFrenchFormatting() { + // Add power values to the load network.getLoad("l").getTerminal().setP(1200.29); network.getLoad("l").getTerminal().setQ(-1); @@ -108,8 +131,32 @@ void testFrenchFormatting() { assertEquals(toString("/TestFormattingFeederInfos.svg"), toSVG(g, "/TestFormattingFeederInfos.svg")); } + @Test + void testBuildFeederInfosWithCurrent() { + Network network = IeeeCdfNetworkFactory.create9(); + layoutParameters.setDisplayCurrentFeederInfo(true); + VoltageLevelGraph g = new NetworkGraphBuilder(network).buildVoltageLevelGraph("VL5"); + List feederInfoList = new DefaultDiagramLabelProvider(network, componentLibrary, layoutParameters).getFeederInfos(g.getFeederNodes().get(0)); + assertEquals(3, feederInfoList.size()); + assertEquals(ARROW_ACTIVE, feederInfoList.get(0).getComponentType()); + assertEquals(ARROW_REACTIVE, feederInfoList.get(1).getComponentType()); + assertEquals(ARROW_CURRENT, feederInfoList.get(2).getComponentType()); + } + + @Test + void testBuildFeederInfosWithoutCurrent() { + Network network = IeeeCdfNetworkFactory.create9(); + layoutParameters.setDisplayCurrentFeederInfo(false); + VoltageLevelGraph g = new NetworkGraphBuilder(network).buildVoltageLevelGraph("VL5"); + List feederInfoList = new DefaultDiagramLabelProvider(network, componentLibrary, layoutParameters).getFeederInfos(g.getFeederNodes().get(0)); + assertEquals(2, feederInfoList.size()); + assertEquals(ARROW_ACTIVE, feederInfoList.get(0).getComponentType()); + assertEquals(ARROW_REACTIVE, feederInfoList.get(1).getComponentType()); + } + @Test void testAnimation() { + // Add load at bottom createSwitch(vl, "d2", "d2", SwitchKind.DISCONNECTOR, false, false, false, 0, 3); createLoad(vl, "l2", "l2", "l2", 0, ConnectablePosition.Direction.BOTTOM, 3, 10, 10); @@ -173,5 +220,6 @@ public Optional getRightLabel() { // write SVG and compare to reference assertEquals(toString("/TestAnimatedFeederInfos.svg"), toSVG(g, "/TestAnimatedFeederInfos.svg", labelProvider, styleProvider)); + } } diff --git a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestUnknownComponent.java b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestUnknownComponent.java index 21876b881..93a5f165b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestUnknownComponent.java +++ b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestUnknownComponent.java @@ -18,7 +18,7 @@ /** * @author Thomas Adam */ -public class TestUnknownComponent extends AbstractTestCaseIidm { +class TestUnknownComponent extends AbstractTestCaseIidm { @BeforeEach public void setUp() { @@ -35,7 +35,7 @@ protected ResourcesComponentLibrary getResourcesComponentLibrary() { } @Test - public void test() { + void test() { layoutParameters.setAddNodesInfos(true); // build voltage level 1 graph diff --git a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/layout/LayoutParametersTest.java b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/layout/LayoutParametersTest.java index 8cc73a9a0..57d5fbf2e 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/layout/LayoutParametersTest.java +++ b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/layout/LayoutParametersTest.java @@ -63,6 +63,8 @@ void test() { .setPowerValuePrecision(2) .setAngleValuePrecision(0) .setUndefinedValueSymbol("\u002A") + .setDisplayCurrentFeederInfo(true) + .setCurrentValuePrecision(1) .setRemoveFictitiousSwitchNodes(true); layoutParameters.setComponentsSize(null); @@ -115,6 +117,8 @@ void test() { assertEquals(layoutParameters.getVoltageValuePrecision(), layoutParameters2.getVoltageValuePrecision()); assertEquals(layoutParameters.getPowerValuePrecision(), layoutParameters2.getPowerValuePrecision()); assertEquals(layoutParameters.getAngleValuePrecision(), layoutParameters2.getAngleValuePrecision()); + assertEquals(layoutParameters.getCurrentValuePrecision(), layoutParameters2.getCurrentValuePrecision()); + assertEquals(layoutParameters.isDisplayCurrentFeederInfo(), layoutParameters2.isDisplayCurrentFeederInfo()); assertEquals(layoutParameters.getUndefinedValueSymbol(), layoutParameters2.getUndefinedValueSymbol()); assertEquals(layoutParameters.getComponentsSize(), layoutParameters2.getComponentsSize()); assertEquals(layoutParameters.isRemoveFictitiousSwitchNodes(), layoutParameters2.isRemoveFictitiousSwitchNodes()); diff --git a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/library/ComponentLibraryTest.java b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/library/ComponentLibraryTest.java index e3c9dec69..25a9d4b05 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/library/ComponentLibraryTest.java +++ b/single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/library/ComponentLibraryTest.java @@ -25,6 +25,6 @@ void test() { ComponentLibrary cvg = ComponentLibrary.find("Convergence").orElse(null); assertNotNull(cvg); assertEquals("Convergence", cvg.getName()); - assertEquals(21, cvg.getComponentsSize().size()); + assertEquals(22, cvg.getComponentsSize().size()); } } diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg index 3a80be784..83c3d335d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: baseVoltages.css ------------------------------------------------ */ .sld-vl300to500 {--sld-vl-color: #ff0000} @@ -67,6 +68,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg index c42197e91..a33ff3d55 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg index 8a536543f..6cffb472d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg index 3dd164dab..484a72cce 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg index 3349b0b76..4f5782add 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestAllPossibleInfoItems.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestAllPossibleInfoItems.svg new file mode 100644 index 000000000..234a95779 --- /dev/null +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestAllPossibleInfoItems.svg @@ -0,0 +1,122 @@ + + + + + + + + bbs + + + + + + + + + + + + + + + + + + 100 + + + + + 10 + + + + + 153 + + + + + + + + + + + + + + + + + + + + l + + + + diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg index efd2a129c..9844b23ca 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestAnimatedFeederInfos.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -164,6 +165,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteries.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteries.svg index 57b075421..96e124017 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteries.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteries.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteriesRaw.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteriesRaw.svg index 57d98ce72..235d47822 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteriesRaw.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestBatteriesRaw.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* File : components.css ------------------------------------------------- */ .sld-disconnector.sld-open {stroke-width: 1.5; stroke: var(--sld-vl-color, black); fill: none} .sld-disconnector.sld-closed {fill: var(--sld-vl-color, black)} @@ -41,6 +42,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill: #37474f} .sld-feeder-info.sld-reactive-power {fill: #0277bd} +.sld-feeder-info.sld-current {fill:#800080} .sld-frame {fill: var(--sld-background-color, transparent)} /* fictitious switches and busbar */ .sld-breaker.sld-fictitious {stroke: maroon; stroke-width: 1.5} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg index 966c95419..2c9791773 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase1.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg index 9991daeda..ca6bbe32a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11FlatDesign.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -119,6 +120,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill: #37474f} .sld-feeder-info.sld-reactive-power {fill: #0277bd} +.sld-feeder-info.sld-current {fill:#800080} .sld-frame {fill: var(--sld-background-color, transparent)} /* fictitious switches and busbar */ .sld-breaker.sld-fictitious {stroke: maroon; stroke-width: 1.5} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg index 1a4ccfa44..f1cf189f4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg index b1b98fc06..da7099a8f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg index f2f61e391..aac66d706 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg index 1a4ccfa44..f1cf189f4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg index d7318f413..5b6e4bd67 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: baseVoltages.css ------------------------------------------------ */ .sld-vl300to500 {--sld-vl-color: #ff0000} @@ -67,6 +68,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg index be51b9325..f957febc8 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg index bd5e61200..aec3f7ef4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg index c857b372b..559076d99 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg index 7f8c966d5..7bfb64a41 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg index 8b29b8a7f..94309453e 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseComplexCoupling.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg index 8093db38e..4f590f73f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg index 8093db38e..4f590f73f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg index 6b5cd6cc2..6823b7cc6 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseKeepFictitiousSwitchNode.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg index 1ea5d2e08..eed4e0767 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseLoadBreakSwitch.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg index d6fae7918..ff666b6d3 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCaseRemoveFictitiousSwitchNode.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg index 7b628e22e..ee0eb018b 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestCheese.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg index 609b4acf2..de1800a98 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestComplexParallelLegsInternalPst.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -119,6 +120,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill: #37474f} .sld-feeder-info.sld-reactive-power {fill: #0277bd} +.sld-feeder-info.sld-current {fill:#800080} .sld-frame {fill: var(--sld-background-color, transparent)} /* fictitious switches and busbar */ .sld-breaker.sld-fictitious {stroke: maroon; stroke-width: 1.5} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg index d8a70fba4..880dc4ab3 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederInfos.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg index 4e39af356..3fee5b941 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBus.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg index b874efc0d..cb7a46e15 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFeederOnBusDisconnector.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg index fe74e1b9a..9525577e4 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestFormattingFeederInfos.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg index 1fe19242f..23f772739 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json index 0bbe0c0f2..53e4b1a5d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassSubstationMetadata.json @@ -586,6 +586,8 @@ "voltageValuePrecision" : 1, "powerValuePrecision" : 0, "angleValuePrecision" : 1, + "currentValuePrecision" : 0, + "displayCurrentFeederInfo" : false, "undefinedValueSymbol" : "—", "removeFictitiousSwitchNodes" : false } diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg index 1496e74da..31b0d5e2d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestSldClassVl.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} 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 index 8e147cb6c..fe608ad5c 100644 --- 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 @@ -345,6 +345,8 @@ "voltageValuePrecision" : 1, "powerValuePrecision" : 0, "angleValuePrecision" : 1, + "currentValuePrecision" : 0, + "displayCurrentFeederInfo" : false, "undefinedValueSymbol" : "—", "removeFictitiousSwitchNodes" : false } diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnknownLibrary.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnknownLibrary.svg index b0e45cae4..c04ce6c66 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnknownLibrary.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/TestUnknownLibrary.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg index 1e8dd7060..8fa92f26f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/consecutive_shunts.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg index 0a5d55ef8..258e0fb7f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/feederInfoTest.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/label_on_all_nodes.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/label_on_all_nodes.svg index 69375a14b..7a39e9ce3 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/label_on_all_nodes.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/label_on_all_nodes.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg index 96eb4747d..f10ed957d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/noComponentsOnBus.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg index d4803e172..e4be13006 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_substation.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: baseVoltages.css ------------------------------------------------ */ .sld-vl300to500 {--sld-vl-color: #ff0000} @@ -67,6 +68,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg index 67374bd71..082c45114 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl2.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: baseVoltages.css ------------------------------------------------ */ .sld-vl300to500 {--sld-vl-color: #ff0000} @@ -67,6 +68,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg index a2bc649c8..20a135a2f 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/nominal_voltage_style_vl3.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: baseVoltages.css ------------------------------------------------ */ .sld-vl300to500 {--sld-vl-color: #ff0000} @@ -67,6 +68,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} 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 index 9075cf749..e2914ca25 100644 --- 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 @@ -2968,6 +2968,8 @@ "voltageValuePrecision" : 1, "powerValuePrecision" : 0, "angleValuePrecision" : 1, + "currentValuePrecision" : 0, + "displayCurrentFeederInfo" : false, "undefinedValueSymbol" : "—", "removeFictitiousSwitchNodes" : false } diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/substation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/substation.svg index 762dbb614..a3d5eef43 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/substation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/substation.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: baseVoltages.css ------------------------------------------------ */ .sld-vl300to500 {--sld-vl-color: #ff0000} @@ -67,6 +68,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/substation_feeder_arrow_symmetry.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/substation_feeder_arrow_symmetry.svg index 948e83b97..c77e7c0d8 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/substation_feeder_arrow_symmetry.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/substation_feeder_arrow_symmetry.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/substation_no_feeder_values.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/substation_no_feeder_values.svg index 517db3947..d71915d34 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/substation_no_feeder_values.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/substation_no_feeder_values.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/substation_optimized.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/substation_optimized.svg index e62086158..0cafe6d5a 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/substation_optimized.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/substation_optimized.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg index e37d15693..b763e106c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/switchesOnBus.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg index 76c66d9b2..dbb9252b9 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/topological_style_substation.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: topologicalBaseVoltages.css ------------------------------------- */ .sld-disconnected {--sld-vl-color: #808080} @@ -131,6 +132,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1.svg index 341d8411d..045becbb6 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_multiline_tooltip.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_multiline_tooltip.svg index c64a14710..0e2e4fb64 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_multiline_tooltip.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_multiline_tooltip.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_optimized.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_optimized.svg index a8e7c2b00..cc2047689 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_optimized.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_optimized.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_straightWires.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_straightWires.svg index 6dc01447e..d27ca4255 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_straightWires.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_straightWires.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_tooltip.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_tooltip.svg index 9d25b69aa..9da0fe65d 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_tooltip.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl1_tooltip.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl2.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl2.svg index 97317329e..9db0aaef6 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl2.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl2.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl2_optimized.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl2_optimized.svg index 58b46c513..350195c1c 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl2_optimized.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl2_optimized.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl3.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl3.svg index 8c2408f13..3665f7629 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl3.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl3.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/vl3_optimized.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/vl3_optimized.svg index 433acd535..855642405 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/vl3_optimized.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/vl3_optimized.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} 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 index 5d9c084a3..1b967860a 100644 --- 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 @@ -1501,6 +1501,8 @@ "voltageValuePrecision" : 1, "powerValuePrecision" : 0, "angleValuePrecision" : 1, + "currentValuePrecision" : 0, + "displayCurrentFeederInfo" : false, "undefinedValueSymbol" : "—", "removeFictitiousSwitchNodes" : false } diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/with_frame_background.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/with_frame_background.svg index 69299a5e7..7039a6471 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/with_frame_background.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/with_frame_background.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File: baseVoltages.css ------------------------------------------------ */ .sld-vl300to500 {--sld-vl-color: #ff0000} @@ -70,6 +71,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon} diff --git a/single-line-diagram/single-line-diagram-core/src/test/resources/zone.svg b/single-line-diagram/single-line-diagram-core/src/test/resources/zone.svg index 828829fdd..137b30525 100644 --- a/single-line-diagram/single-line-diagram-core/src/test/resources/zone.svg +++ b/single-line-diagram/single-line-diagram-core/src/test/resources/zone.svg @@ -10,8 +10,9 @@ .sld-hidden-node {visibility: hidden} .sld-top-feeder .sld-label {dominant-baseline: auto} .sld-bottom-feeder .sld-label {dominant-baseline: hanging} -.sld-active-power .sld-label {dominant-baseline: middle} -.sld-reactive-power .sld-label {dominant-baseline: middle} +.sld-active-power .sld-label {dominant-baseline: mathematical} +.sld-reactive-power .sld-label {dominant-baseline: mathematical} +.sld-current .sld-label {dominant-baseline: mathematical} /* ----------------------------------------------------------------------- */ /* File : components.css ------------------------------------------------- */ /* Stroke black */ @@ -53,6 +54,7 @@ .sld-grid {stroke: #003700; stroke-dasharray: 1,10} .sld-feeder-info.sld-active-power {fill:black} .sld-feeder-info.sld-reactive-power {fill:blue} +.sld-feeder-info.sld-current {fill:purple} .sld-frame {fill: var(--sld-background-color, transparent)} /* Stroke maroon for fictitious switch */ .sld-breaker.sld-fictitious {stroke: maroon}