From 3396ca6448eba0778c4e1d5eed73937266ce8514 Mon Sep 17 00:00:00 2001 From: Quang Truong Date: Mon, 15 Dec 2025 15:20:39 +0100 Subject: [PATCH 1/4] Update Sszs --- .../set/basis/constants/ToolboxConstants.java | 2 +- .../table/pt1/sszs/SszsTransformator.xtend | 29 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java index 43dd6f491..b3c478fe9 100644 --- a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java +++ b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java @@ -160,7 +160,7 @@ public interface CacheId { * Compares strings numerical. */ public static final MixedStringComparator NUMERIC_COMPARATOR = new MixedStringComparator( - "(?-)?(?[0-9]+)(,(?[0-9]+))?"); + "(?-)?(?[0-9]+)([,|.](?[0-9]+))?"); /** * The id of the attachment viewer part. diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend index f3bc4a10f..b18140bf7 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend @@ -4,7 +4,7 @@ * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v2.0 which is available at * https://www.eclipse.org/legal/epl-2.0. - * + * * SPDX-License-Identifier: EPL-2.0 * */ @@ -367,7 +367,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator { ITERABLE_FILLING_SEPARATOR ) - // O: Sszs.ETCS_Gefahrpunkt.Bezeichnung: + // O: Sszs.ETCS_Gefahrpunkt.Bezeichnung fillConditional( row, cols.getColumn(Gefahrpunkt_Bezeichnung), @@ -393,10 +393,13 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator { etcsSignal, new Case( [ETCSGefahrpunktabstandAbweichend !== null], - [ETCSGefahrpunktabstandAbweichend?.wert?.toTableDecimal] + [ETCSGefahrpunktabstandAbweichend?.wert?.toTableDecimal ?: ""] ), new Case( - [IDETCSGefahrpunkt2?.value !== null], + [ + IDETCSGefahrpunkt2?.value !== null && + IDETCSGefahrpunkt?.value !== null + ], [ row.addTopologicalCell( cols.getColumn(Abstand_vom_Signal)) @@ -407,16 +410,21 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator { IDETCSGefahrpunkt2?.value?.IDMarkanteStelle?.value). toTableDecimal return '''«distanceToETCSGefahrpunkt»(«distanceToETCSGefahrpunkt2»)''' + ] ), new Case( - [IDETCSGefahrpunkt2?.value === null], + [ + IDETCSGefahrpunkt2?.value === null && + IDETCSGefahrpunkt?.value !== null + ], [ row.addTopologicalCell( cols.getColumn(Abstand_vom_Signal)) distanceToSignal( IDETCSGefahrpunkt?.value?.IDMarkanteStelle?.value). toTableDecimal + ] ) ) @@ -503,9 +511,9 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator { return "" } val distanceValue = distance.get - return distanceValue <= 5 || - distanceValue >= -3 ? "0" : AgateRounding.roundUp( - distanceValue).toString + return distanceValue <= 5 || distanceValue >= -3 + ? "0" + : AgateRounding.roundUp(distanceValue).toString ] ) @@ -775,9 +783,8 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator { if (distances.compareTo(BigDecimal.ZERO) == 0) { return fma -> 0.0 } - return topGraph.isInWirkrichtungOfSignal(signal, fma) - ? fma -> distances.doubleValue - : fma -> -distances.doubleValue + return topGraph.isInWirkrichtungOfSignal(signal, fma) ? fma -> + distances.doubleValue : fma -> -distances.doubleValue ].filterNull if (distanceToSignal.empty) { return Optional.empty From 8c7f262d0b508521ddb9f89cca80c4437e578937 Mon Sep 17 00:00:00 2001 From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com> Date: Tue, 16 Dec 2025 11:51:00 +0100 Subject: [PATCH 2/4] Update java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java Co-authored-by: Marius Heine --- .../src/org/eclipse/set/basis/constants/ToolboxConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java index b3c478fe9..836c30dac 100644 --- a/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java +++ b/java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java @@ -160,7 +160,7 @@ public interface CacheId { * Compares strings numerical. */ public static final MixedStringComparator NUMERIC_COMPARATOR = new MixedStringComparator( - "(?-)?(?[0-9]+)([,|.](?[0-9]+))?"); + "(?-)?(?[0-9]+)(.(?[0-9]+))?"); /** * The id of the attachment viewer part. From 1524b635969c0b31f22f5ea75af273990d92fb01 Mon Sep 17 00:00:00 2001 From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com> Date: Tue, 16 Dec 2025 11:58:24 +0100 Subject: [PATCH 3/4] Update java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend Co-authored-by: Marius Heine --- .../eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend index b18140bf7..106fd1b2a 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend @@ -409,7 +409,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator { val distanceToETCSGefahrpunkt2 = distanceToSignal( IDETCSGefahrpunkt2?.value?.IDMarkanteStelle?.value). toTableDecimal - return '''«distanceToETCSGefahrpunkt»(«distanceToETCSGefahrpunkt2»)''' + return '''«distanceToETCSGefahrpunkt» («distanceToETCSGefahrpunkt2»)''' ] ), From 4ab0f36e6173e2d645f9c97a617cbd172ea30caa Mon Sep 17 00:00:00 2001 From: TruongQuangSB <131350493+TruongQuangSB@users.noreply.github.com> Date: Tue, 16 Dec 2025 11:58:49 +0100 Subject: [PATCH 4/4] Update java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend --- .../eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend index 106fd1b2a..dcca7d5c1 100644 --- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend +++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend @@ -393,7 +393,7 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator { etcsSignal, new Case( [ETCSGefahrpunktabstandAbweichend !== null], - [ETCSGefahrpunktabstandAbweichend?.wert?.toTableDecimal ?: ""] + [ETCSGefahrpunktabstandAbweichend?.wert?.toTableDecimal] ), new Case( [