Skip to content

Commit 106ef99

Browse files
TruongQuangSBmariusheineeclipse-set-bot
authored
Update sszs (#1774)
* Update Sszs transformation * FOP Export with subscript/super Characters * Update java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/export/xsl/TransformStyle.java Co-authored-by: Marius Heine <[email protected]> * rebase * Modify Pdf export * Update table reference * update excel template --------- Co-authored-by: Marius Heine <[email protected]> Co-authored-by: eclipse-set-bot <[email protected]>
1 parent 50fdf7d commit 106ef99

File tree

9 files changed

+167
-38
lines changed

9 files changed

+167
-38
lines changed

‎java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsColumns.java‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,34 +147,44 @@ public class SszsColumns {
147147
*/
148148
public static final String Haltfallkriterium_2 = "Z";
149149

150+
/**
151+
* Sszs.Sonstige_Funktionen.ZSS
152+
*/
153+
public static final String ZSS = "AA";
154+
150155
/**
151156
* Sszs.TBV.Meldepunkt
152157
*/
153-
public static final String Meldepunkt = "AA";
158+
public static final String Meldepunkt = "AB";
154159

155160
/**
156161
* Sszs.TBV.Laenge_Tunnelbereich
157162
*/
158-
public static final String Laenge_Tunnelbereich = "AB";
163+
public static final String Laenge_Tunnelbereich = "AC";
159164

160165
/**
161166
* Sszs.TBV.Tunnelsignal
162167
*/
163-
public static final String Tunnelsignal = "AC";
168+
public static final String Tunnelsignal = "AD";
164169

165170
/**
166171
* Sszs.Ansteuerung.ESTW-Zentraleinheit
167172
*/
168-
public static final String ESTW_Zentraleinheit = "AD";
173+
public static final String ESTW_Zentraleinheit = "AE";
169174

170175
/**
171176
* Sszs.Ansteuerung.Stellbereich
172177
*/
173-
public static final String Stellbereich = "AE";
178+
public static final String Stellbereich = "AF";
179+
180+
/**
181+
* Sszs.Ansteuerung.RBC-Anschaltung
182+
*/
183+
public static final String RBC_Anschaltung = "AG";
174184

175185
/**
176186
* Sssz.Bemerkung
177187
*/
178-
public static final String Bemerkung = "AF";
188+
public static final String Bemerkung = "AH";
179189

180190
}

‎java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend‎

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
7474

7575
new(Set<ColumnDescriptor> cols,
7676
EnumTranslationService enumTranslationService,
77-
TopologicalGraphService topGraphService,
78-
EventAdmin eventAdmin) {
77+
TopologicalGraphService topGraphService, EventAdmin eventAdmin) {
7978
super(cols, enumTranslationService, eventAdmin)
8079
this.topGraphService = topGraphService
8180
}
@@ -105,7 +104,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
105104
new Case<ETCS_Signal>(
106105
[
107106
isRelevantSignal(
108-
IDSignal.value,
107+
IDSignal?.value,
109108
[
110109
signalReal?.signalRealAktiv?.autoEinstellung?.
111110
wert === ENUM_AUTO_EINSTELLUNG_SB
@@ -248,9 +247,9 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
248247
if (isZs3SignalGeschaltet.empty) {
249248
return #[]
250249
}
251-
val symbols = refSignal?.getSignalbegriffe(Zs3).
252-
filterNull.map[signalbegriffID?.symbol]?.
253-
filterNull ?: []
250+
val symbols = zs3Signals.filterNull.map [
251+
signalbegriffID?.symbol
252+
]?.filterNull ?: []
254253
return isZs3SignalGeschaltet.get
255254
? symbols
256255
: symbols.map [
@@ -295,7 +294,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
295294
["x"]
296295
)
297296

298-
// K: Sszs.Signalisierung.Loeschung_Zs
297+
// K: Sszs.Signalisierung.Loeschung_Zs_1_7_8
299298
fillConditional(
300299
row,
301300
cols.getColumn(Loeschung_Zs),
@@ -480,9 +479,9 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
480479
return ""
481480
}
482481
val distanceValue = distance.get
483-
return distanceValue <= 5 || distanceValue >= -3
484-
? "0"
485-
: AgateRounding.roundUp(distanceValue).toString
482+
return distanceValue <= 5 ||
483+
distanceValue >= -3 ? "0" : AgateRounding.roundUp(
484+
distanceValue).toString
486485
]
487486
)
488487

@@ -550,15 +549,32 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
550549
["x"]
551550
)
552551

553-
// AA: Sszs.TBV.Meldepunkt
552+
// AA: Sszs.SOnstige_FUnktionen.ZSS
553+
fillConditional(
554+
row,
555+
cols.getColumn(ZSS),
556+
refSignal,
557+
[
558+
container.ZUBBereichsgrenze.exists [ zubBereich |
559+
zubBereich.ZUBBereichsgrenzeNachL2.exists [ zubBereichL2 |
560+
zubBereichL2.IDSignalZufahrtsicherungL2oS.exists [ idSignal |
561+
idSignal.value === it
562+
]
563+
]
564+
]
565+
],
566+
["x"]
567+
)
568+
569+
// AB: Sszs.TBV.Meldepunkt
554570
fill(
555571
row,
556572
cols.getColumn(Meldepunkt),
557573
etcsSignal,
558574
[ETCSSignalTBV?.TBVMeldepunkt?.wert.translate]
559575
)
560576

561-
// AB: Sszs.TBV.Laenge_Tunnelbereich
577+
// AC: Sszs.TBV.Laenge_Tunnelbereich
562578
fill(
563579
row,
564580
cols.getColumn(Laenge_Tunnelbereich),
@@ -569,15 +585,15 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
569585
]
570586
)
571587

572-
// AC: Sszs.TBV.Tunnelsignal
588+
// AD: Sszs.TBV.Tunnelsignal
573589
fill(
574590
row,
575591
cols.getColumn(Tunnelsignal),
576592
etcsSignal,
577593
[ETCSSignalTBV?.TBVTunnelsignal?.wert.translate]
578594
)
579595

580-
// AD: Sszs.Ansteuerung.ESTW-Zentraleinheit
596+
// AE: Sszs.Ansteuerung.ESTW-Zentraleinheit
581597
fillIterable(
582598
row,
583599
cols.getColumn(ESTW_Zentraleinheit),
@@ -591,7 +607,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
591607
MIXED_STRING_COMPARATOR
592608
)
593609

594-
// AE: Sszs.Ansteuerung.Stellbereich
610+
// AF: Sszs.Ansteuerung.Stellbereich
595611
fillIterable(
596612
row,
597613
cols.getColumn(Stellbereich),
@@ -607,6 +623,15 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
607623
],
608624
MIXED_STRING_COMPARATOR
609625
)
626+
627+
// AG: Sszs.Ansteuerung.RBC-Anschaltung
628+
fillConditional(
629+
row,
630+
cols.getColumn(RBC_Anschaltung),
631+
etcsSignal,
632+
[IDRBC.nullOrEmpty],
633+
["x"]
634+
)
610635

611636
// AF: Sszs.Bemerkung
612637
fillSwitchGrouped(
@@ -720,8 +745,9 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
720745
if (distances.compareTo(BigDecimal.ZERO) == 0) {
721746
return fma -> 0.0
722747
}
723-
return topGraph.isInWirkrichtungOfSignal(signal, fma) ? fma ->
724-
distances.doubleValue : fma -> -distances.doubleValue
748+
return topGraph.isInWirkrichtungOfSignal(signal, fma)
749+
? fma -> distances.doubleValue
750+
: fma -> -distances.doubleValue
725751
].filterNull
726752
if (distanceToSignal.empty) {
727753
return Optional.empty

‎java/bundles/org.eclipse.set.feature/rootdir/data/export/excel/sszs_vorlage.xlsx‎

233 Bytes
Binary file not shown.

‎java/bundles/org.eclipse.set.nattable.utils/src/org/eclipse/set/nattable/utils/PlanProTableCellPainter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public PlanProTableCellPainter(final ICellPainter interiorPainter,
4747
BaseEdgeEnum.BEFORE,
4848
new WarningPainter(blackWarningImage,
4949
CellContentExtensions.WARNING_MARK_BLACK)),
50-
BaseEdgeEnum.AFTER,
50+
BaseEdgeEnum.BEFORE,
5151
new WarningPainter(yellowWarningImage,
5252
CellContentExtensions.WARNING_MARK_YELLOW)),
5353
TOP_PADDING, RIGHT_PADDING, BOTTOM_PADDING, LEFT_PADDING,

‎java/bundles/org.eclipse.set.swtbot/test_res/table_reference/pphn/sszs_reference.csv‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,37 @@
1-
Row;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z;AA;AB;AC;AD;AE;AF
2-
;Signal-Art;Signal-Art;Signal-Art;Signal-Art;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Tunnelbegegnungverbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​;Tunnelbegegnungverbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​;Tunnelbegegnungverbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemekung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​
3-
;Bezeichnung;Art​;Standort​​;Standort​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Tunnelbegegnungverbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​;Tunnelbegegnungverbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​;Tunnelbegegnungverbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemekung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​
4-
;Bezeichnung;Art​;Strecke​​;km​​​;Zs 1​​​​;Zs 2​​​​​;Zs 3​​​​​​;Zs 6​​​​​​​;Zs 7​​​​​​​​;Zs 8​​​​​​​​​;"Loesch-
5-
ung Zs 1/7/8​​​​​​​​​​";Zs 13​​​​​​​​​​​;Kl​​​​​​​​​​​​;Ne 14 Rz Nr. (Bild)​​​​​​​​​​​​​;"Bezeichn-
6-
ung​​​​​​​​​​​​​​";Abstand vom Signal​​​​​​​​​​​​​​​;< 50 m​​​​​​​​​​​​​​​​;50 bis < 200 m​​​​​​​​​​​​​​​​​;>= 200 m​​​​​​​​​​​​​​​​​​;"Dunkelschalt-
7-
anstoss​​​​​​​​​​​​​​​​​​​";"Fahrstell-
8-
ung​​​​​​​​​​​​​​​​​​​​";Dend​​​​​​​​​​​​​​​​​​​​​;Einstieg erlaubt​​​​​​​​​​​​​​​​​​​​​​;"Ausstieg bei ETCS
9-
-Sperre​​​​​​​​​​​​​​​​​​​​​​​";dHaltFall​​​​​​​​​​​​​​​​​​​​​​​​;Haltfallkriterium 2​​​​​​​​​​​​​​​​​​​​​​​​​;Meldepunkt​​​​​​​​​​​​​​​​​​​​​​​​​​;Länge Tunnelbereich (bei Portalsignal)​​​​​​​​​​​​​​​​​​​​​​​​​​​;Tunnelsignal​​​​​​​​​​​​​​​​​​​​​​​​​​​​;ESTW-Zentraleinheit​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Stellbereich​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemekung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​
10-
;;;;;;;;;;;;;;;;m;m;m;m;;;m;;;m;;;m;;;;
1+
Row;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z;AA;AB;AC;AD;AE;AF;AG;AH
2+
;Signal;Signal;Signal;Signal;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;"Tunnelbegegnungs-
3+
verbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Tunnelbegegnungs-
4+
verbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Tunnelbegegnungs-
5+
verbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​​";Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​
6+
;Bezeichnung;Art​;Standort​​;Standort​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;Signalisierung​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;ETCS-Gefahrpunkt​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Kürzester Durchrutschweg​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;Sonstige Funktionen​​​​​​​​​​​​​​​​​​​;"Tunnelbegegnungs-
7+
verbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Tunnelbegegnungs-
8+
verbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Tunnelbegegnungs-
9+
verbot (TBV)​​​​​​​​​​​​​​​​​​​​​​​​​​​";Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Ansteuerung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​;Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​
10+
;Bezeichnung;Art​;Strecke​​;km​​​;Zs 1​​​​;Zs 2​​​​​;Zs 3​​​​​​;Zs 6​​​​​​​;Zs 7​​​​​​​​;Zs 8​​​​​​​​​;Löschg. Zs 1/7/8​​​​​​​​​​;Zs 13​​​​​​​​​​​;Kl​​​​​​​​​​​​;Ne 14​​​​​​​​​​​​​;Bezeichnung​​​​​​​​​​​​​​;"Ab-
11+
stand
12+
vom
13+
Signal​​​​​​​​​​​​​​​";< 50 m​​​​​​​​​​​​​​​​;"50 bis
14+
< 200 m​​​​​​​​​​​​​​​​​";≥ 200 m​​​​​​​​​​​​​​​​​​;"Dunkel-
15+
schalt-
16+
anstoß​​​​​​​​​​​​​​​​​​​";"Autom.
17+
Fahrt-
18+
stellung​​​​​​​​​​​​​​​​​​​​";DEnd​​​​​​​​​​​​​​​​​​​​​;"Ein-
19+
stieg
20+
erlaubt​​​​​​​​​​​​​​​​​​​​​​";"Aus-
21+
stieg
22+
bei
23+
ETCS-
24+
Sperre​​​​​​​​​​​​​​​​​​​​​​​";dHaltfall​​​​​​​​​​​​​​​​​​​​​​​​;"Haltfall-
25+
kriterium 2​​​​​​​​​​​​​​​​​​​​​​​​​";ZSS​​​​​​​​​​​​​​​​​​​​​​​​​​;"Melde-
26+
punkt​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Länge
27+
Tunnel-
28+
bereich
29+
(Portal-
30+
signal)​​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Tunnel-
31+
signal​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";"ESTW-
32+
ZE​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";"Stell-
33+
bereich​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";"keine
34+
Über-
35+
trag. an
36+
RBC​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​";Bemerkung​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​
37+
;;;;;;;;;;;;;;;;m;m;m;m;;;m;;;m;;;;m;;;;;

‎java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/sorting/EmptyLastCellComparator.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public EmptyLastCellComparator(final SortDirectionEnum direction) {
2828
super(direction);
2929
}
3030

31-
@SuppressWarnings("null")
3231
@Override
3332
public int compareString(final String text1, final String text2) {
3433
final boolean isFirstTextEmpty = text1 == null || text1.isEmpty()

‎java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/export/xsl/AbstractTransformTableHeader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,12 @@ protected Element transformFirstColumnCell(final Row row) {
312312
private Element createTableCell(final Optional<Cell> excelCell) {
313313
final Element cell = doc.createElement(FO_TABLE_CELL);
314314
transformCellStyle(cell, excelCell);
315-
final Optional<String> cellContent = getCellStringValue(excelCell);
316315
final Element block = doc.createElement(FO_BLOCK);
317316
block.setAttribute(START_INDENT, "0mm"); //$NON-NLS-1$
318-
if (cellContent.isPresent()) {
319-
block.setTextContent(cellContent.get());
317+
if (excelCell.isPresent()) {
318+
TransformStyle.setCellContent(block, excelCell.get());
320319
}
320+
321321
cell.appendChild(block);
322322
return cell;
323323
}

0 commit comments

Comments
 (0)