Skip to content

Update Sszs #2088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mariusheine merged 4 commits into from
Dec 16, 2025
Merged

Update Sszs #2088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3396ca6
Update Sszs
TruongQuangSB Dec 15, 2025
8c7f262
Update java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/c…
TruongQuangSB Dec 16, 2025
1524b63
Update java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse…
TruongQuangSB Dec 16, 2025
4ab0f36
Update java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse…
TruongQuangSB Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/constants/ToolboxConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public interface CacheId {
* Compares strings numerical.
*/
public static final MixedStringComparator NUMERIC_COMPARATOR = new MixedStringComparator(
"(?<numberPrefix>-)?(?<numberN>[0-9]+)(,(?<numberD>[0-9]+))?");
"(?<numberPrefix>-)?(?<numberN>[0-9]+)(.(?<numberD>[0-9]+))?");

/**
* The id of the attachment viewer part.
Expand Down
29 changes: 18 additions & 11 deletions ....set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sszs/SszsTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -396,7 +396,10 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
[ETCSGefahrpunktabstandAbweichend?.wert?.toTableDecimal]
),
new Case<ETCS_Signal>(
[IDETCSGefahrpunkt2?.value !== null],
[
IDETCSGefahrpunkt2?.value !== null &&
IDETCSGefahrpunkt?.value !== null
],
[
row.addTopologicalCell(
cols.getColumn(Abstand_vom_Signal))
Expand All @@ -406,17 +409,22 @@ class SszsTransformator extends AbstractPlanPro2TableModelTransformator {
val distanceToETCSGefahrpunkt2 = distanceToSignal(
IDETCSGefahrpunkt2?.value?.IDMarkanteStelle?.value).
toTableDecimal
return '''«distanceToETCSGefahrpunkt»(«distanceToETCSGefahrpunkt2»)'''
return '''«distanceToETCSGefahrpunkt» («distanceToETCSGefahrpunkt2»)'''

]
),
new Case<ETCS_Signal>(
[IDETCSGefahrpunkt2?.value === null],
[
IDETCSGefahrpunkt2?.value === null &&
IDETCSGefahrpunkt?.value !== null
],
[
row.addTopologicalCell(
cols.getColumn(Abstand_vom_Signal))
distanceToSignal(
IDETCSGefahrpunkt?.value?.IDMarkanteStelle?.value).
toTableDecimal

]
)
)
Expand Down Expand Up @@ -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
]
)

Expand Down Expand Up @@ -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
Expand Down
Loading