Skip to content

Implementation Sskx - Table der Tafeln #2297

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
TruongQuangSB wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Implementation Sskx - Table der Tafeln #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb54047
Implementation Sskx - Table der Tafeln
TruongQuangSB Apr 1, 2026
385b68f
fix table transform by change control area
TruongQuangSB Apr 1, 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
13 changes: 9 additions & 4 deletions ...es/org.eclipse.set.application/src/org/eclipse/set/application/graph/BankServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,12 @@ public List<BigDecimal> findBankValue(final TopPoint point) {

final BigDecimal distanceLeft = leftPosition.subtract(pointDistance)
.abs();

return List.of(
bankingDefault(ueRight.subtract(ueLeft), distanceLeft, length)
.add(ueLeft));
final BigDecimal defaultValue = bankingDefault(ueRight.subtract(ueLeft),
distanceLeft, length);
if (defaultValue == null) {
return Collections.emptyList();
}
return List.of(defaultValue.add(ueLeft));
}

static BigDecimal findBankingValue(final TopPoint point,
Expand Down Expand Up @@ -630,6 +632,9 @@ private static BigDecimal bankingOfRampeS(final BigDecimal h_between,
*/
private static BigDecimal bankingDefault(final BigDecimal h_between,
final BigDecimal distanceFromLeft, final BigDecimal length) {
if (length.compareTo(BigDecimal.ZERO) == 0) {
return null;
}
return h_between.multiply(distanceFromLeft)
.divide(length, ToolboxConstants.ROUNDING_TO_PLACE,
RoundingMode.HALF_EVEN);
Expand Down
9 changes: 3 additions & 6 deletions ...g.eclipse.set.application/src/org/eclipse/set/application/table/TableMenuServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
import org.eclipse.set.application.Messages;
import org.eclipse.set.basis.constants.Events;
import org.eclipse.set.basis.constants.ToolboxConstants;
import org.eclipse.set.core.services.Services;
import org.eclipse.set.core.services.part.ToolboxPartService;
import org.eclipse.set.utils.events.JumpToSiteplanEvent;
Expand Down Expand Up @@ -141,11 +140,9 @@ public void widgetSelected(final SelectionEvent e) {
|| tableShortcut.isEmpty()) {
return;
}
String tableIdPrefix = ToolboxConstants.ESTW_TABLE_PART_ID_PREFIX;
if (jumpEvent.getTableCategory()
.equals(Pt1TableCategory.ETCS.getId())) {
tableIdPrefix = ToolboxConstants.ETCS_TABLE_PART_ID_PREFIX;
}
final String category = jumpEvent.getTableCategory();
final String tableIdPrefix = Pt1TableCategory
.getTablePartPrefix(category);
toolboxPartService.showPart(tableIdPrefix + "." //$NON-NLS-1$
+ tableShortcut.toLowerCase());
ToolboxEvents.send(broker, jumpEvent);
Expand Down
2 changes: 2 additions & 0 deletions java/bundles/org.eclipse.set.feature.table.pt1/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ Service-Component: OSGI-INF/org.eclipse.set.feature.table.pt1.messages.Messages.
OSGI-INF/org.eclipse.set.feature.table.pt1.sskt.SsktTransformationService.xml,
OSGI-INF/org.eclipse.set.feature.table.pt1.sskw.SskwDescriptionService.xml,
OSGI-INF/org.eclipse.set.feature.table.pt1.sskw.SskwTransformationService.xml,
OSGI-INF/org.eclipse.set.feature.table.pt1.sskx.SskxDescriptionService.xml,
OSGI-INF/org.eclipse.set.feature.table.pt1.sskx.SskxTransformationService.xml,
OSGI-INF/org.eclipse.set.feature.table.pt1.sskz.SskzDescriptionService.xml,
OSGI-INF/org.eclipse.set.feature.table.pt1.sskz.SskzTransformationService.xml,
OSGI-INF/org.eclipse.set.feature.table.pt1.ssla.SslaDescriptionService.xml,
Expand Down
6 changes: 6 additions & 0 deletions java/bundles/org.eclipse.set.feature.table.pt1/OSGI-INF/l10n/bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,9 @@ ToolboxTableNameSxxxShort=Sxxx
ToolboxTableNameSxxxLong=Tabelle der Bearbeitungsvermerke
ToolboxTableNameSxxxPlanningNumber=??

SskxTableView_Heading=Tabelle der Tafeln – Sskx
ToolboxTableNameSskxLong=Tabelle der Tafeln
ToolboxTableNameSskxPlanningNumber=???
ToolboxTableNameSskxShort=Sskx
SskxDescriptionService_ViewTooltip=Tabelle der Tafeln
SskxDescriptionService_ViewName=Sskx – Tabelle der Tafeln
1 change: 0 additions & 1 deletion ...e.pt1/src/org/eclipse/set/feature/table/pt1/AbstractPlanPro2TableModelTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,5 +302,4 @@ abstract class AbstractPlanPro2TableModelTransformator extends AbstractTableMode
topologicalCells.put(row, newHashSet(col))
}
}

}
30 changes: 30 additions & 0 deletions ...clipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/messages/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,4 +823,34 @@ private void bindBundleLocalization(
*/
public String SxxxDescriptionService_ViewTooltip;

/**
* Tabelle der Tafeln – Sskx
*/
public String SskxTableView_Heading;

/**
* Tabelle der Tafeln
*/
public String ToolboxTableNameSskxLong;

/**
* ???
*/
public String ToolboxTableNameSskxPlanningNumber;

/**
* Sskx
*/
public String ToolboxTableNameSskxShort;

/**
* Tabelle der Tafeln
*/
public String SskxDescriptionService_ViewTooltip;

/**
* Sskx – Tabelle der Tafeln
*/
public String SskxDescriptionService_ViewName;

}
Loading
Loading