diff --git a/.github/diagram-demo.svg b/.github/diagram-demo.svg index 632dec245..c1f121b3d 100644 --- a/.github/diagram-demo.svg +++ b/.github/diagram-demo.svg @@ -97,13 +97,14 @@ .sld-disconnector {stroke-width: 3; stroke: black; fill: none} /* Stroke blue */ .sld-breaker {stroke-width: 2; stroke: blue; fill:white} +.sld-load-break-switch {stroke: blue; fill: white} /* Stroke --sld-vl-color with fallback black */ -.sld-bus-connection {stroke: var(--sld-vl-color, black); stroke-width: 4; fill: none} +.sld-bus-connection {fill: var(--sld-vl-color, black)} +.sld-cell-shape-flat .sld-bus-connection {visibility: hidden} .sld-busbar-section {stroke: var(--sld-vl-color, black); stroke-width: 3; fill: none} /* Stroke --sld-vl-color with fallback red */ .sld-wire {stroke: var(--sld-vl-color, #c80000); fill: none} /* Stroke --sld-vl-color with fallback blue */ -.sld-load-break-switch {stroke: var(--sld-vl-color, blue); fill: none} .sld-load {stroke: var(--sld-vl-color, blue); fill: none} .sld-generator {stroke: var(--sld-vl-color, blue); fill: none} .sld-two-wt {stroke: var(--sld-vl-color, blue); fill: none} @@ -128,805 +129,810 @@ .sld-arrow-p {fill:black} .sld-arrow-q {fill:blue} .sld-frame {fill: var(--sld-background-color, transparent)} +/* Stroke maroon for fictitious switch */ +.sld-breaker.sld-fictitious {stroke: maroon} +.sld-disconnector.sld-fictitious {stroke: maroon} +.sld-load-break-switch.sld-fictitious {stroke: maroon} +.sld-busbar-section.sld-fictitious {stroke: var(--sld-vl-color, #c80000); stroke-width: 1} ]]> - + 400.0 - - + + - - + + - + - + - NL-Load_1 + NL-Load_1 - - + + - + - + - + 280 - + 90 - - + + - - + + - + - + - NL-Load_2 + NL-Load_2 - - + + - + - + - + 10 - + 10 - - + + - - + + - + - + - NL-S1 + NL-S1 - - + + - + - + - + - 0 + - - + -53 - - + + - - + + - + - - NL-TR2_1 + + NL-TR2_1 - - + + - + - + - + - 0 + - - + - 0 + - - - + + - - + + - + - - BE-Line_5 + NL-Line_5 + + BE-Line_5 + NL-Line_5 - - + + - + - + - + - + - 0 + - - + - 0 + - - - + + - + - - + + - + - - BE-Line_3 + NL-Line_1 + + BE-Line_3 + NL-Line_1 - - + + - + - + - + - + - 0 + - - + - 0 + - - - + + - + - - + + - + - - NL-Line_2 + BE-Line_4 + + NL-Line_2 + BE-Line_4 - - + + - + - + - + - + - 0 + - - + - 0 + - - - + + - + - + 220.0 - + - N1230822396 + N1230822396 - + - NL-Busbar_2 + NL-Busbar_2 - - + + - + - - NL_TR2_2 + + NL_TR2_2 - - + + - + - + - + - 0 + - - + - 0 + - - - + + - - + + - + - + - + - - BE-Line_1 + NL-Line_4 + + BE-Line_1 + NL-Line_4 - + - - BE-Line_7 + NL-Line_3 + + BE-Line_7 + NL-Line_3 - - + + - - - - - + + - + - - + + - + - - + + - - + + - - + + - - + + + + + - + - 0 + - - + - 0 + - - - + + - - + + - + - 0 + - - + - 0 + - - - + + - + - + - - + + - + - + - - + + - + - + - NL-Load_3 + NL-Load_3 - - + + - + - + - + 231 - + 488 - - + + - - + + - + - - NL-TR2_1 + + NL-TR2_1 - - + + - + - + - + - 0 + - - + - 0 + - - - + + - - + + - + - - NL_TR2_3 + + NL_TR2_3 - - + + - + - + - + - + - 0 + - - + - 0 + - - - + + - + - + 15.8 - + - NL-Busbar_3 + NL-Busbar_3 - + - NL-Busbar_5 + NL-Busbar_5 - - + + - + - - + + - + - + - + - + - - + + - - + + - + - + - + - - + + - - + + - + - + - NL-G2 + NL-G2 - - + + - + - + - + -140 - + -16 - - + + - - + + - + - + - NL-G3 + NL-G3 - - + + - + - + - + -16 - + -150 - - + + - - + + - + - - NL_TR2_2 + + NL_TR2_2 - - + + - + - + - + - + - 0 + - - + - 0 + - - - + + - + - - + + - + - + - NL-G1 + NL-G1 - - + + - + - + - + -558 - + -226 - - + + - - + + - + - - NL_TR2_3 + + NL_TR2_3 - - + + - + - + - + - + - 0 + - - + - 0 + - - - + + - + - - + + - - + + - - + + - - + + - + - + - + + + + + + - + - - - - - diff --git a/.github/example_n.svg b/.github/example_n.svg index e364540db..0f08a70be 100644 --- a/.github/example_n.svg +++ b/.github/example_n.svg @@ -97,13 +97,14 @@ .sld-disconnector {stroke-width: 3; stroke: black; fill: none} /* Stroke blue */ .sld-breaker {stroke-width: 2; stroke: blue; fill:white} +.sld-load-break-switch {stroke: blue; fill: white} /* Stroke --sld-vl-color with fallback black */ -.sld-bus-connection {stroke: var(--sld-vl-color, black); stroke-width: 4; fill: none} +.sld-bus-connection {fill: var(--sld-vl-color, black)} +.sld-cell-shape-flat .sld-bus-connection {visibility: hidden} .sld-busbar-section {stroke: var(--sld-vl-color, black); stroke-width: 3; fill: none} /* Stroke --sld-vl-color with fallback red */ .sld-wire {stroke: var(--sld-vl-color, #c80000); fill: none} /* Stroke --sld-vl-color with fallback blue */ -.sld-load-break-switch {stroke: var(--sld-vl-color, blue); fill: none} .sld-load {stroke: var(--sld-vl-color, blue); fill: none} .sld-generator {stroke: var(--sld-vl-color, blue); fill: none} .sld-two-wt {stroke: var(--sld-vl-color, blue); fill: none} @@ -146,7 +147,7 @@ P - + @@ -178,7 +179,7 @@ - + @@ -229,7 +230,7 @@ - + @@ -280,7 +281,7 @@ - + @@ -331,7 +332,7 @@ - + @@ -362,12 +363,12 @@ - 0 + - - 0 + - @@ -382,7 +383,7 @@ - + @@ -413,12 +414,12 @@ - 0 + - - 0 + - @@ -433,7 +434,7 @@ - + @@ -484,7 +485,7 @@ - + @@ -527,12 +528,12 @@ - 0 + - - 0 + - @@ -551,7 +552,7 @@ - + @@ -596,7 +597,7 @@ - + @@ -664,12 +665,12 @@ - 0 + - - 0 + - diff --git a/README.md b/README.md index 5ea2e5f1a..78490e16c 100644 --- a/README.md +++ b/README.md @@ -47,17 +47,17 @@ and additionally for this example three other ones: two for the `Network` test c com.powsybl powsybl-iidm-impl - 4.8.0 + 4.9.0 com.powsybl powsybl-iidm-test - 4.8.0 + 4.9.0 com.powsybl powsybl-config-test - 4.8.0 + 4.9.0 org.slf4j @@ -76,7 +76,7 @@ After adding the single line diagram core module dependency: com.powsybl powsybl-single-line-diagram-core - 2.10.0 + 2.11.0 ``` diff --git a/pom.xml b/pom.xml index a098a5abd..a4e69c76c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ powsybl-single-line-diagram - 2.11.0-SNAPSHOT + 2.11.0 pom Single line diagram diff --git a/single-line-diagram-cgmes/pom.xml b/single-line-diagram-cgmes/pom.xml index 2e12cef22..349fe6ee0 100644 --- a/single-line-diagram-cgmes/pom.xml +++ b/single-line-diagram-cgmes/pom.xml @@ -15,7 +15,7 @@ powsybl-single-line-diagram com.powsybl - 2.11.0-SNAPSHOT + 2.11.0 powsybl-single-line-diagram-cgmes diff --git a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/pom.xml b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/pom.xml index b220f3918..a06976f63 100644 --- a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/pom.xml +++ b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/pom.xml @@ -12,7 +12,7 @@ com.powsybl powsybl-single-line-diagram-cgmes - 2.11.0-SNAPSHOT + 2.11.0 powsybl-single-line-diagram-cgmes-dl-conversion diff --git a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-iidm-extensions/pom.xml b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-iidm-extensions/pom.xml index 924438fc7..9b9b1e000 100644 --- a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-iidm-extensions/pom.xml +++ b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-iidm-extensions/pom.xml @@ -12,7 +12,7 @@ com.powsybl powsybl-single-line-diagram-cgmes - 2.11.0-SNAPSHOT + 2.11.0 powsybl-single-line-diagram-cgmes-iidm-extensions diff --git a/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/pom.xml b/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/pom.xml index 58e393a0a..9374d89ec 100644 --- a/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/pom.xml +++ b/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/pom.xml @@ -15,7 +15,7 @@ com.powsybl powsybl-single-line-diagram-cgmes - 2.11.0-SNAPSHOT + 2.11.0 powsybl-single-line-diagram-cgmes-layout diff --git a/single-line-diagram-core/pom.xml b/single-line-diagram-core/pom.xml index 93686d216..d2043d2c1 100644 --- a/single-line-diagram-core/pom.xml +++ b/single-line-diagram-core/pom.xml @@ -14,7 +14,7 @@ com.powsybl powsybl-single-line-diagram - 2.11.0-SNAPSHOT + 2.11.0 powsybl-single-line-diagram-core diff --git a/single-line-diagram-distribution/pom.xml b/single-line-diagram-distribution/pom.xml index 580a16039..467efaaa2 100644 --- a/single-line-diagram-distribution/pom.xml +++ b/single-line-diagram-distribution/pom.xml @@ -15,7 +15,7 @@ powsybl-single-line-diagram com.powsybl - 2.11.0-SNAPSHOT + 2.11.0 pom diff --git a/single-line-diagram-iidm-extensions/pom.xml b/single-line-diagram-iidm-extensions/pom.xml index ebf8d46a5..463f11b17 100644 --- a/single-line-diagram-iidm-extensions/pom.xml +++ b/single-line-diagram-iidm-extensions/pom.xml @@ -15,7 +15,7 @@ com.powsybl powsybl-single-line-diagram - 2.11.0-SNAPSHOT + 2.11.0 powsybl-single-line-diagram-iidm-extensions