Skip to content

Commit 6d8cab7

Browse files
quinarygioquinarygio
committed
Separate nominal voltage css classes from bus number
Signed-off-by: Giovanni Ferrari <[email protected]>
1 parent bb60a71 commit 6d8cab7

File tree

94 files changed

+7602
-7587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+7602
-7587
lines changed

‎network-area-diagram/src/main/java/com/powsybl/nad/svg/iidm/TopologicalStyleProvider.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,18 @@ public List<String> getBusNodeStyleClasses(BusNode busNode) {
4343
if (busNode instanceof BoundaryBusNode) {
4444
String dlId = busNode.getEquipmentId();
4545
getBaseVoltageStyle(network.getDanglingLine(dlId).getTerminal().getVoltageLevel().getNominalV())
46-
.map(baseVoltageStyle -> baseVoltageStyle + "-" + busNode.getBusIndex())
47-
.ifPresent(styles::add);
46+
.ifPresent(baseVoltageStyle -> {
47+
styles.add(baseVoltageStyle);
48+
styles.add(baseVoltageStyle + "-bus-" + busNode.getBusIndex());
49+
});
4850
} else {
4951
Bus b = network.getBusView().getBus(busNode.getEquipmentId());
5052
if (b != null) {
5153
getBaseVoltageStyle(b.getVoltageLevel().getNominalV())
52-
.map(baseVoltageStyle -> baseVoltageStyle + "-" + busNode.getBusIndex())
53-
.ifPresent(styles::add);
54+
.ifPresent(baseVoltageStyle -> {
55+
styles.add(baseVoltageStyle);
56+
styles.add(baseVoltageStyle + "-bus-" + busNode.getBusIndex());
57+
});
5458
}
5559
}
5660
return styles;

‎network-area-diagram/src/main/resources/topologicalStyle.css

+63-63
Original file line numberDiff line numberDiff line change
@@ -20,75 +20,75 @@ path.nad-arrow-in:not(.nad-state-in .nad-arrow-in) {visibility: hidden}
2020
.nad-edge-infos text, .nad-edge-label text {font: 20px serif; dominant-baseline:middle; stroke: #FFFFFFAA; stroke-width: 10; stroke-linejoin:round; paint-order: stroke}
2121
.nad-disconnected {--nad-vl-color: #808080}
2222
.nad-vl0to30-line {--nad-vl-color: #afb42b}
23-
.nad-vl0to30-0 {--nad-vl-color: #827717}
24-
.nad-vl0to30-1 {--nad-vl-color: #d4e157}
25-
.nad-vl0to30-2 {--nad-vl-color: #e6ee9c}
26-
.nad-vl0to30-3 {--nad-vl-color: #c0ca33}
27-
.nad-vl0to30-4 {--nad-vl-color: #f0fc83}
28-
.nad-vl0to30-5 {--nad-vl-color: #9e9d24}
29-
.nad-vl0to30-6 {--nad-vl-color: #cddc39}
30-
.nad-vl0to30-7 {--nad-vl-color: #dce775}
31-
.nad-vl0to30-8 {--nad-vl-color: #ddfc88}
23+
.nad-vl0to30-bus-0 {--nad-vl-color: #827717}
24+
.nad-vl0to30-bus-1 {--nad-vl-color: #d4e157}
25+
.nad-vl0to30-bus-2 {--nad-vl-color: #e6ee9c}
26+
.nad-vl0to30-bus-3 {--nad-vl-color: #c0ca33}
27+
.nad-vl0to30-bus-4 {--nad-vl-color: #f0fc83}
28+
.nad-vl0to30-bus-5 {--nad-vl-color: #9e9d24}
29+
.nad-vl0to30-bus-6 {--nad-vl-color: #cddc39}
30+
.nad-vl0to30-bus-7 {--nad-vl-color: #dce775}
31+
.nad-vl0to30-bus-8 {--nad-vl-color: #ddfc88}
3232
.nad-vl30to50-line {--nad-vl-color: #ef9a9a}
33-
.nad-vl30to50-0 {--nad-vl-color: #c2185b}
34-
.nad-vl30to50-1 {--nad-vl-color: #f06292}
35-
.nad-vl30to50-2 {--nad-vl-color: #d81b60}
36-
.nad-vl30to50-3 {--nad-vl-color: #ec407a}
37-
.nad-vl30to50-4 {--nad-vl-color: #880e4f}
38-
.nad-vl30to50-5 {--nad-vl-color: #ad1457}
39-
.nad-vl30to50-6 {--nad-vl-color: #e91e63}
40-
.nad-vl30to50-7 {--nad-vl-color: #f48fb1}
41-
.nad-vl30to50-8 {--nad-vl-color: #f8bbd0}
33+
.nad-vl30to50-bus-0 {--nad-vl-color: #c2185b}
34+
.nad-vl30to50-bus-1 {--nad-vl-color: #f06292}
35+
.nad-vl30to50-bus-2 {--nad-vl-color: #d81b60}
36+
.nad-vl30to50-bus-3 {--nad-vl-color: #ec407a}
37+
.nad-vl30to50-bus-4 {--nad-vl-color: #880e4f}
38+
.nad-vl30to50-bus-5 {--nad-vl-color: #ad1457}
39+
.nad-vl30to50-bus-6 {--nad-vl-color: #e91e63}
40+
.nad-vl30to50-bus-7 {--nad-vl-color: #f48fb1}
41+
.nad-vl30to50-bus-8 {--nad-vl-color: #f8bbd0}
4242
.nad-vl50to70-line {--nad-vl-color: #9c27b0}
43-
.nad-vl50to70-0 {--nad-vl-color: #7b1fa2}
44-
.nad-vl50to70-1 {--nad-vl-color: #ba68c8}
45-
.nad-vl50to70-2 {--nad-vl-color: #512da8}
46-
.nad-vl50to70-3 {--nad-vl-color: #ab47bc}
47-
.nad-vl50to70-4 {--nad-vl-color: #e1bee7}
48-
.nad-vl50to70-5 {--nad-vl-color: #6a1b9a}
49-
.nad-vl50to70-6 {--nad-vl-color: #4a148c}
50-
.nad-vl50to70-7 {--nad-vl-color: #ce93d8}
51-
.nad-vl50to70-8 {--nad-vl-color: #9575cd}
43+
.nad-vl50to70-bus-0 {--nad-vl-color: #7b1fa2}
44+
.nad-vl50to70-bus-1 {--nad-vl-color: #ba68c8}
45+
.nad-vl50to70-bus-2 {--nad-vl-color: #512da8}
46+
.nad-vl50to70-bus-3 {--nad-vl-color: #ab47bc}
47+
.nad-vl50to70-bus-4 {--nad-vl-color: #e1bee7}
48+
.nad-vl50to70-bus-5 {--nad-vl-color: #6a1b9a}
49+
.nad-vl50to70-bus-6 {--nad-vl-color: #4a148c}
50+
.nad-vl50to70-bus-7 {--nad-vl-color: #ce93d8}
51+
.nad-vl50to70-bus-8 {--nad-vl-color: #9575cd}
5252
.nad-vl70to120-line {--nad-vl-color: #e65100}
53-
.nad-vl70to120-0 {--nad-vl-color: #fb8c00}
54-
.nad-vl70to120-1 {--nad-vl-color: #ffb74d}
55-
.nad-vl70to120-2 {--nad-vl-color: #f57c00}
56-
.nad-vl70to120-3 {--nad-vl-color: #ffa726}
57-
.nad-vl70to120-4 {--nad-vl-color: #ffe0b2}
58-
.nad-vl70to120-5 {--nad-vl-color: #ef6c00}
59-
.nad-vl70to120-6 {--nad-vl-color: #ff9800}
60-
.nad-vl70to120-7 {--nad-vl-color: #ffcc80}
61-
.nad-vl70to120-8 {--nad-vl-color: #fff3e0}
53+
.nad-vl70to120-bus-0 {--nad-vl-color: #fb8c00}
54+
.nad-vl70to120-bus-1 {--nad-vl-color: #ffb74d}
55+
.nad-vl70to120-bus-2 {--nad-vl-color: #f57c00}
56+
.nad-vl70to120-bus-3 {--nad-vl-color: #ffa726}
57+
.nad-vl70to120-bus-4 {--nad-vl-color: #ffe0b2}
58+
.nad-vl70to120-bus-5 {--nad-vl-color: #ef6c00}
59+
.nad-vl70to120-bus-6 {--nad-vl-color: #ff9800}
60+
.nad-vl70to120-bus-7 {--nad-vl-color: #ffcc80}
61+
.nad-vl70to120-bus-8 {--nad-vl-color: #fff3e0}
6262
.nad-vl120to180-line {--nad-vl-color: #00ACC1}
63-
.nad-vl120to180-0 {--nad-vl-color: #4fc3f7}
64-
.nad-vl120to180-1 {--nad-vl-color: #01579b}
65-
.nad-vl120to180-2 {--nad-vl-color: #b3e5fc}
66-
.nad-vl120to180-3 {--nad-vl-color: #039be5}
67-
.nad-vl120to180-4 {--nad-vl-color: #81d4fa}
68-
.nad-vl120to180-5 {--nad-vl-color: #0288d1}
69-
.nad-vl120to180-6 {--nad-vl-color: #29b6f6}
70-
.nad-vl120to180-7 {--nad-vl-color: #0277bd}
71-
.nad-vl120to180-8 {--nad-vl-color: #03a9f4}
63+
.nad-vl120to180-bus-0 {--nad-vl-color: #4fc3f7}
64+
.nad-vl120to180-bus-1 {--nad-vl-color: #01579b}
65+
.nad-vl120to180-bus-2 {--nad-vl-color: #b3e5fc}
66+
.nad-vl120to180-bus-3 {--nad-vl-color: #039be5}
67+
.nad-vl120to180-bus-4 {--nad-vl-color: #81d4fa}
68+
.nad-vl120to180-bus-5 {--nad-vl-color: #0288d1}
69+
.nad-vl120to180-bus-6 {--nad-vl-color: #29b6f6}
70+
.nad-vl120to180-bus-7 {--nad-vl-color: #0277bd}
71+
.nad-vl120to180-bus-8 {--nad-vl-color: #03a9f4}
7272
.nad-vl180to300-line {--nad-vl-color: #2e7d32}
73-
.nad-vl180to300-0 {--nad-vl-color: #81c784}
74-
.nad-vl180to300-1 {--nad-vl-color: #558b2f}
75-
.nad-vl180to300-2 {--nad-vl-color: #c8e6c9}
76-
.nad-vl180to300-3 {--nad-vl-color: #43a047}
77-
.nad-vl180to300-4 {--nad-vl-color: #a5d6a7}
78-
.nad-vl180to300-5 {--nad-vl-color: #388e3c}
79-
.nad-vl180to300-6 {--nad-vl-color: #66bb6a}
80-
.nad-vl180to300-7 {--nad-vl-color: #1b5e20}
81-
.nad-vl180to300-8 {--nad-vl-color: #4caf50}
73+
.nad-vl180to300-bus-0 {--nad-vl-color: #81c784}
74+
.nad-vl180to300-bus-1 {--nad-vl-color: #558b2f}
75+
.nad-vl180to300-bus-2 {--nad-vl-color: #c8e6c9}
76+
.nad-vl180to300-bus-3 {--nad-vl-color: #43a047}
77+
.nad-vl180to300-bus-4 {--nad-vl-color: #a5d6a7}
78+
.nad-vl180to300-bus-5 {--nad-vl-color: #388e3c}
79+
.nad-vl180to300-bus-6 {--nad-vl-color: #66bb6a}
80+
.nad-vl180to300-bus-7 {--nad-vl-color: #1b5e20}
81+
.nad-vl180to300-bus-8 {--nad-vl-color: #4caf50}
8282
.nad-vl300to500-line {--nad-vl-color: #d32f2f}
83-
.nad-vl300to500-0 {--nad-vl-color: #ef5350}
84-
.nad-vl300to500-1 {--nad-vl-color: #ef9a9a}
85-
.nad-vl300to500-2 {--nad-vl-color: #b71c1c}
86-
.nad-vl300to500-3 {--nad-vl-color: #e57373}
87-
.nad-vl300to500-4 {--nad-vl-color: #e53935}
88-
.nad-vl300to500-5 {--nad-vl-color: #ff8a80}
89-
.nad-vl300to500-6 {--nad-vl-color: #f44336}
90-
.nad-vl300to500-7 {--nad-vl-color: #ffcdd2}
91-
.nad-vl300to500-8 {--nad-vl-color: #c62828}
83+
.nad-vl300to500-bus-0 {--nad-vl-color: #ef5350}
84+
.nad-vl300to500-bus-1 {--nad-vl-color: #ef9a9a}
85+
.nad-vl300to500-bus-2 {--nad-vl-color: #b71c1c}
86+
.nad-vl300to500-bus-3 {--nad-vl-color: #e57373}
87+
.nad-vl300to500-bus-4 {--nad-vl-color: #e53935}
88+
.nad-vl300to500-bus-5 {--nad-vl-color: #ff8a80}
89+
.nad-vl300to500-bus-6 {--nad-vl-color: #f44336}
90+
.nad-vl300to500-bus-7 {--nad-vl-color: #ffcdd2}
91+
.nad-vl300to500-bus-8 {--nad-vl-color: #c62828}
9292
.nad-branch-edges .nad-overload .nad-edge-path {animation: line-blink 3s infinite}
9393
.nad-vl-nodes .nad-overvoltage {animation: node-over-blink 3s infinite}
9494
.nad-vl-nodes .nad-undervoltage {animation: node-under-blink 3s infinite}

‎network-area-diagram/src/test/resources/3wt_disconnected_topological.svg

+67-67
Loading

0 commit comments

Comments
 (0)