Skip to content

Ssks,Sskx: display some tafeln in ssks #2478

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

Open
mariusheine wants to merge 4 commits into
base: main
Choose a base branch
from
+44 −29
Open

Ssks,Sskx: display some tafeln in ssks #2478

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
d94230e
ignore alleinstehende zusatzsignale in sskx table
mariusheine Jun 12, 2026
49322cb
improve naming of field as it was confusing
mariusheine Jun 12, 2026
5d080e2
fix sorting of ssks
mariusheine Jun 12, 2026
9b43086
fix pdf export when there is an alleinstehende Tafel between real and…
mariusheine Jun 12, 2026
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
43 changes: 19 additions & 24 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTablePdfExportBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,36 +70,31 @@ public void setFopService(final FopService fopService) {
@Override
public List<String> getPageBreakRowsIndex(final Table table) {
final List<String> result = new ArrayList<>();
List.of(SsksColumns.Fiktives_Signal, SsksColumns.Reales_Signal)
.forEach(columnPosition -> {
final ColumnDescriptor col = TableExtensions
.getColumns(table)
.stream()
.filter(column -> column.getColumnPosition()
.equals(columnPosition))
.findFirst()
.orElse(null);
final Optional<Integer> lastRowIndex = getLastRowIndex(
table, col);
if (lastRowIndex.isPresent()) {
result.add(lastRowIndex.get().toString());
}
});
List.of(SsksColumns.Fiktives_Signal).forEach(columnPosition -> {
final ColumnDescriptor col = TableExtensions.getColumns(table)
.stream()
.filter(column -> column.getColumnPosition()
.equals(columnPosition))
.findFirst()
.orElse(null);
final Optional<Integer> firstRowIndex = getFirstRowIndex(table,
col);
if (firstRowIndex.isPresent()) {
result.add(firstRowIndex.get().toString());
}
});
return result;
}

private static Optional<Integer> getLastRowIndex(final Table table,
private static Optional<Integer> getFirstRowIndex(final Table table,
final ColumnDescriptor column) {
final List<Entry<Integer, TableRow>> signalEntries = getSignalEntries(
table, column);
final Optional<Entry<Integer, TableRow>> collect = signalEntries
.stream()
final Optional<Integer> collect = signalEntries.stream()
.map(Map.Entry::getKey)
.collect(Collectors
.maxBy(Comparator.comparingInt(Map.Entry::getKey)));
if (collect.isPresent()) {
return Optional.of(collect.get().getKey());
}
return Optional.empty();
.minBy(Comparator.comparingInt((i) -> i.intValue())));
return collect;
}

private static List<Entry<Integer, TableRow>> getSignalEntries(
Expand All @@ -110,7 +105,7 @@ private static List<Entry<Integer, TableRow>> getSignalEntries(
final List<TableRow> tableRows = TableExtensions.getTableRows(table);
return tableRows.stream()
.collect(Collectors.toMap(
e -> Integer.valueOf(tableRows.indexOf(e) + 1),
e -> Integer.valueOf(tableRows.indexOf(e)),
Function.identity()))
.entrySet()
.parallelStream()
Expand Down
4 changes: 2 additions & 2 deletions ...ature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
package org.eclipse.set.feature.table.pt1.ssks;

import static org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum.ASC;
import static org.eclipse.nebula.widgets.nattable.sort.SortDirectionEnum.DESC;
import static org.eclipse.set.feature.table.pt1.ssks.SsksColumns.*;
import static org.eclipse.set.utils.table.sorting.ComparatorBuilder.CellComparatorType.EMPTY_LAST;
import static org.eclipse.set.utils.table.sorting.ComparatorBuilder.CellComparatorType.LEXICOGRAPHICAL;
Expand Down Expand Up @@ -116,8 +117,7 @@ public void handleEvent(final Event event) {
public Comparator<RowGroup> getRowGroupComparator(
final TableType tableType) {
return TableRowGroupComparator.builder(tableType)
.sort(Reales_Signal, EMPTY_LAST, ASC)
.sort(Fiktives_Signal, EMPTY_LAST, ASC)
.sort(Fiktives_Signal, EMPTY_LAST, DESC)
// It can be directly compare by Column E/F but for consistent
// with another table the CompareRouteAndKm will be used.
.sortByRouteAndKm(obj -> {
Expand Down
4 changes: 2 additions & 2 deletions ....set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssks/SsksTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class SsksTransformator extends AbstractSignalTableTransform {

static val SIGNALBEGRIFF_COMPARATOR = new MixedStringComparator(
"(?<letters1>[A-Za-z]*)(?<number>[0-9]*)(?<letters2>[A-Za-z]*)")
static val inRelevantFiktivFunktion = #[
static val irrelevantFiktivFunktion = #[
ENUM_FIKTIVES_SIGNAL_FUNKTION_ZUG_START_ZIEL_BK_MIT_ZS_1,
ENUM_FIKTIVES_SIGNAL_FUNKTION_ZUG_START_ZIEL_BK_MIT_ZS_7,
ENUM_FIKTIVES_SIGNAL_FUNKTION_ZUG_START_ZIEL_NE_14_MIT_ZS_1,
Expand Down Expand Up @@ -643,7 +643,7 @@ class SsksTransformator extends AbstractSignalTableTransform {
private static def boolean isSsksSignal(Signal signal) {
if (signal?.signalFiktiv !== null &&
!signal?.signalFiktiv?.fiktivesSignalFunktion.exists [
inRelevantFiktivFunktion.contains(it)
irrelevantFiktivFunktion.contains(it)
]) {
return true
}
Expand Down
22 changes: 21 additions & 1 deletion ...e.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskx/SskxTransformator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,19 @@
*/
package org.eclipse.set.feature.table.pt1.sskx;

import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.*;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_ARBEITSBUEHNE;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_DACH_DECKE;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_OL_MAST;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_PFOSTEN_HOCH;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_PFOSTEN_NIEDRIG;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_MAST_HOCH;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_MAST_NIEDRIG;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_SONSTIGE_HOCH;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_REGELANORDNUNG_SONSTIGE_NIEDRIG;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_SCHIENENFUSS;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_SONDERANORDNUNG_MAST_HOCH;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_SONDERANORDNUNG_MAST_NIEDRIG;
import static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.ENUM_BEFESTIGUNG_ART_WAND;

import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -40,6 +52,7 @@
import org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt;
import org.eclipse.set.model.planpro.Signale.ENUMBeleuchtet;
import org.eclipse.set.model.planpro.Signale.ENUMGeltungsbereich;
import org.eclipse.set.model.planpro.Signale.ENUMSignalFunktion;
import org.eclipse.set.model.planpro.Signale.Signal;
import org.eclipse.set.model.planpro.Signale.Signal_Rahmen;
import org.eclipse.set.model.planpro.Signale.Signal_Signalbegriff;
Expand Down Expand Up @@ -103,6 +116,13 @@ private static Predicate<Signal> generalCondition() {
return false;
}

if (signal.getSignalReal().getSignalFunktion() != null && signal
.getSignalReal()
.getSignalFunktion()
.getWert() == ENUMSignalFunktion.ENUM_SIGNAL_FUNKTION_ALLEINSTEHENDES_ZUSATZSIGNAL) {
return false;
}

final Set<Signal_Signalbegriff> signalbegriffe = SignalExtensions
.getSignalbegriffe(signal);
return signalbegriffe.stream()
Expand Down
Loading