Skip to content

Add object designation to PlazModel and ValidationTable #2581

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

Add object designation to PlazModel and ValidationTable #2581

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
2b175b5
Add object designation column
TruongQuangSB Jul 24, 2026
00386f4
Update ValidationTable
TruongQuangSB Jul 24, 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
1 change: 1 addition & 0 deletions java/bundles/org.eclipse.set.feature.plazmodel/OSGI-INF/l10n/bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ PlazReportColumns_Severity = Schweregrad
PlazReportColumns_ProblemType = Problemart
PlazReportColumns_LineNumber = Zeilennummer
PlazReportColumns_ObjectType = Objektart
PlazReportColumns_ObjectDesignation=Objektbezeichnung
PlazReportColumns_AttributeGroup = Attribut/-Gruppe
PlazReportColumns_ObjectScope = Bereich
PlazReportColumns_ObjectState = Zustand
Expand Down
6 changes: 6 additions & 0 deletions ...les/org.eclipse.set.feature.plazmodel/src/org/eclipse/set/feature/plazmodel/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ public class Messages {
*/
public String PlazReportColumns_ObjectType;

/**
* Objectbezeichnung
*/
public String PlazReportColumns_ObjectDesignation;

/**
* Lfd.
*/
Expand All @@ -103,4 +108,5 @@ public class Messages {
* Die topologischen Koordinaten können nicht exportieren werden
*/
public String PlazExport_ExportProcess_ErrorDialog_Message;

}
2 changes: 2 additions & 0 deletions ...rg.eclipse.set.feature.plazmodel/src/org/eclipse/set/feature/plazmodel/PlazModelPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.eclipse.set.utils.events.ContainerDataChanged;
import org.eclipse.set.utils.events.ProjectDataChanged;
import org.eclipse.set.utils.table.menu.TableMenuService;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Expand Down Expand Up @@ -139,6 +140,7 @@ protected void createFormsView(final Composite parent)
if (getModelSession().isDirty()) {
setOutdated(true);
}
parent.addListener(SWT.RESIZE, e -> parent.layout(true));

// export action
getBanderole().setEnableExport(true);
Expand Down
3 changes: 3 additions & 0 deletions ...eature.plazmodel/src/org/eclipse/set/feature/plazmodel/service/PlazModelServiceImpl.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import org.osgi.service.component.annotations.ReferencePolicy
import org.slf4j.Logger
import org.slf4j.LoggerFactory

import static extension org.eclipse.set.ppmodel.extensions.utils.LSTObjectDesignationExtensions.getLSTObjectDesignation

@Component
class PlazModelServiceImpl implements PlazModelService {
@Reference(cardinality=ReferenceCardinality.
Expand Down Expand Up @@ -106,6 +108,7 @@ class PlazModelServiceImpl implements PlazModelService {
entry.type = error.type
entry.severity = error.severity
entry.generalMsg = generalErroMsg
entry.objectDesignation = error.object.getLSTObjectDesignation
if (node !== null) {
var line = 0
try {
Expand Down
3 changes: 2 additions & 1 deletion ...e.plazmodel/src/org/eclipse/set/feature/plazmodel/table/PlazModelTableTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class PlazModelTableTransformator extends AbstractValidationProblemTransformator
this.columns = columns
this.enumTranslationService = enumTranslationService
excludeColumns = newArrayList(columns.RowIndex, columns.Message,
columns.LineNumber)
columns.LineNumber, columns.ObjectDesignation)
}

override fillProblem(TableRow instance, ValidationProblem problem) {
Expand All @@ -46,6 +46,7 @@ class PlazModelTableTransformator extends AbstractValidationProblemTransformator
fillNumeric(instance, columns.LineNumber, problem, [lineNumber])
}
fill(instance, columns.ObjectType, problem, [objectArt])
fill(instance, columns.ObjectDesignation, problem, [objectDesignation])
fill(instance, columns.AttributeGroup, problem, [attributeName])
fill(instance, columns.ObjectScope, problem, [objectScope?.literal])
fill(instance, columns.ObjectState, problem, [objectState?.literal])
Expand Down
3 changes: 1 addition & 2 deletions ...set.feature.plazmodel/src/org/eclipse/set/feature/plazmodel/table/PlazModelTableView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class PlazModelTableView extends AbstractTreeLayerTable {
Werkzeugkofferversion: %s


"Lfd. Nr.";"Schweregrad";"Problemart";"Zeilennummer";"Objektart";"Attribut/-gruppe";"Bereich";"Zustand";"Meldung"
"Lfd. Nr.";"Schweregrad";"Problemart";"Zeilennummer";"Objektart";"Objekbezeichnung";"Attribut/-gruppe";"Bereich";"Zustand";"Meldung"
""";

private final Messages messages;
Expand Down Expand Up @@ -95,7 +95,6 @@ public Control create(final Composite parent,
tableMenuService.addMenuItem(createJumpToTextViewMenuItem(part));
tableMenuService.addMenuItem(createJumpToSiteplanMenuItem());
natTable = createTable(parent, table);

return natTable;
}

Expand Down
21 changes: 12 additions & 9 deletions ...set.feature.plazmodel/src/org/eclipse/set/feature/plazmodel/table/PlazReportColumns.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class PlazReportColumns extends AbstractColumns {
public final ColumnDescriptor ObjectScope;
public final ColumnDescriptor ObjectState;
public final ColumnDescriptor Message;
public final ColumnDescriptor ObjectDesignation;

/**
* @param messages the messages
Expand All @@ -40,6 +41,7 @@ class PlazReportColumns extends AbstractColumns {
ProblemType = createNew(messages.PlazReportColumns_ProblemType)
LineNumber = createNew(messages.PlazReportColumns_LineNumber)
ObjectType = createNew(messages.PlazReportColumns_ObjectType)
ObjectDesignation = createNew(messages.PlazReportColumns_ObjectDesignation)
AttributeGroup = createNew(messages.PlazReportColumns_AttributeGroup)
ObjectScope = createNew(messages.PlazReportColumns_ObjectScope)
ObjectState = createNew(messages.PlazReportColumns_ObjectState)
Expand All @@ -49,15 +51,16 @@ class PlazReportColumns extends AbstractColumns {
def ColumnDescriptor fillHeaderDescriptions(
ColumnDescriptorModelBuilder builder) {
val GroupBuilder root = builder.createRootColumn()
root.add(RowIndex).width(1.25f)
root.add(Severity).width(2.1f)
root.add(ProblemType).width(3.5f)
root.add(LineNumber).width(2.2f)
root.add(ObjectType).width(3)
root.add(AttributeGroup).width(3)
root.add(ObjectScope).width(2)
root.add(ObjectState).width(1.5f)
root.add(Message).width(8.5f)
root.add(RowIndex).widthPercent(5)
root.add(Severity).widthPercent(5)
root.add(ProblemType).widthPercent(8)
root.add(LineNumber).widthPercent(5)
root.add(ObjectType).widthPercent(8)
root.add(ObjectDesignation).widthPercent(10)
root.add(AttributeGroup).widthPercent(8)
root.add(ObjectScope).widthPercent(5)
root.add(ObjectState).widthPercent(4)
root.add(Message).widthPercent(20)
return root.getGroupRoot()
}
}
17 changes: 1 addition & 16 deletions ....set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sskp/SskpTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class SskpTransformator extends AbstractPlanPro2TableModelTransformator {
instance,
cols.getColumn(Bezugselement),
pzb,
[PZBElementBezugspunkt.filterNull.map[fillBezugsElement]],
[bezugsElementBezeichnungen],
MIXED_STRING_COMPARATOR
)

Expand Down Expand Up @@ -615,21 +615,6 @@ class SskpTransformator extends AbstractPlanPro2TableModelTransformator {

}

static dispatch def String fillBezugsElement(Basis_Objekt object) {
throw new IllegalArgumentException(object.class.simpleName)
}

static dispatch def String fillBezugsElement(W_Kr_Gsp_Element object) {
return object?.bezeichnung?.bezeichnungTabelle?.wert
}

static dispatch def String fillBezugsElement(Signal object) {
return object?.signalReal?.signalFunktion?.wert ===
ENUMSignalFunktion.ENUM_SIGNAL_FUNKTION_BUE_UEBERWACHUNGSSIGNAL
? '''BÜ-K «object?.bezeichnung?.bezeichnungTabelle?.wert»'''
: object?.bezeichnung?.bezeichnungTabelle?.wert
}

private dispatch def String getDistanceSignalTrackSwitch(PZB_Element pzb,
Basis_Objekt object, int scaleValue) {
throw new IllegalArgumentException(object.class.simpleName)
Expand Down
23 changes: 6 additions & 17 deletions ...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,19 +10,7 @@
*/
package org.eclipse.set.feature.table.pt1.sskx;

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 static org.eclipse.set.model.planpro.Signale.ENUMBefestigungArt.*;

import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -60,12 +48,12 @@
import org.eclipse.set.model.planpro.Verweise.ID_Regelzeichnung_TypeClass;
import org.eclipse.set.model.tablemodel.ColumnDescriptor;
import org.eclipse.set.model.tablemodel.TableRow;
import org.eclipse.set.model.tablemodel.extensions.FootnoteExtensions;
import org.eclipse.set.ppmodel.extensions.BasisAttributExtensions;
import org.eclipse.set.ppmodel.extensions.BereichObjektExtensions;
import org.eclipse.set.ppmodel.extensions.EObjectExtensions;
import org.eclipse.set.ppmodel.extensions.SignalExtensions;
import org.eclipse.set.ppmodel.extensions.SignalRahmenExtensions;
import org.eclipse.set.ppmodel.extensions.SignalbegriffExtensions;
import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGroup;
import org.eclipse.set.utils.table.TMFactory;
import org.osgi.service.event.EventAdmin;
Expand Down Expand Up @@ -357,7 +345,8 @@ private static List<Function<Signalbegriff_ID_TypeClass, String>> signalbegriffB

selectBezeichnungFuncs
.add(Signalbegriff_ID_TypeClass::getLangbezeichnung);
selectBezeichnungFuncs.add(FootnoteExtensions::getSignalBregiffIDName);
selectBezeichnungFuncs
.add(SignalbegriffExtensions::getSignalBegriffIDName);
return selectBezeichnungFuncs;
}

Expand All @@ -370,8 +359,8 @@ private static List<String> getSignalbegriffeBezeichnung(
.map(signalBegriffe -> {
if (SPEICAL_BEZEICHNUNG_HANDLE_BEGRIFFE.stream()
.anyMatch(c -> c.isInstance(signalBegriffe))) {
return FootnoteExtensions
.getSignalBregiffIDName(signalBegriffe);
return SignalbegriffExtensions
.getSignalBegriffIDName(signalBegriffe);
}
for (final Function<Signalbegriff_ID_TypeClass, String> function : selectBezeichnungFunc) {
final String bezeichnung = function
Expand Down
9 changes: 5 additions & 4 deletions ....set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/ssza/SszaTransformator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import org.eclipse.set.utils.table.RowFactory
import org.eclipse.set.utils.table.TMFactory
import org.osgi.service.event.EventAdmin

import static org.eclipse.set.feature.table.pt1.sskp.SskpTransformator.*
import static org.eclipse.set.feature.table.pt1.ssza.SszaColumns.*

import static extension org.eclipse.set.ppmodel.extensions.BasisAttributExtensions.*
Expand All @@ -54,6 +53,7 @@ import static extension org.eclipse.set.ppmodel.extensions.DatenpunktExtensions.
import static extension org.eclipse.set.ppmodel.extensions.FmaAnlageExtensions.*
import static extension org.eclipse.set.ppmodel.extensions.PunktObjektExtensions.*
import static extension org.eclipse.set.ppmodel.extensions.PunktObjektTopKanteExtensions.*
import static extension org.eclipse.set.ppmodel.extensions.PZBElementExtensions.*
import static extension org.eclipse.set.ppmodel.extensions.TopKanteExtensions.*
import static extension org.eclipse.set.ppmodel.extensions.utils.IterableExtensions.*
import static extension org.eclipse.set.utils.math.BigDecimalExtensions.*
Expand Down Expand Up @@ -173,7 +173,7 @@ class SszaTransformator extends AbstractPlanPro2TableModelTransformator {
bezugspunktCase(
PZB_Element,
[
'''GM «PZBArt?.translate» «IDPZBElementZuordnung?.value?.PZBElementZuordnungBP?.map[fillBezugsElement(IDPZBElementBezugspunkt?.value)].join»'''
'''GM «PZBArt?.translate» «IDPZBElementZuordnung?.value?.PZBElementZuordnungBP?.map[getBezugElementBezeichnung(IDPZBElementBezugspunkt?.value)].join»'''
]
),
bezugspunktCase(
Expand Down Expand Up @@ -578,7 +578,8 @@ class SszaTransformator extends AbstractPlanPro2TableModelTransformator {
topKante.isInRouteDirection(IDStrecke.value)
]
return isTopKanteRouteSameDirection ===
(direction === ENUMAusrichtung.ENUM_AUSRICHTUNG_IN) ? lange : "-" +
lange
(direction === ENUMAusrichtung.ENUM_AUSRICHTUNG_IN)
? lange
: "-" + lange
}
}
49 changes: 2 additions & 47 deletions ...e.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/sxxx/SxxxTransformator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,21 @@
package org.eclipse.set.feature.table.pt1.sxxx;

import static org.eclipse.set.feature.table.pt1.sxxx.SxxxColumns.*;
import static org.eclipse.set.ppmodel.extensions.EObjectExtensions.getNullableObject;
import static org.eclipse.set.ppmodel.extensions.utils.LSTObjectDesignationExtensions.getLSTObjectDesignation;

import java.util.List;
import java.util.Set;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.set.core.services.enumtranslation.EnumTranslationService;
import org.eclipse.set.feature.table.pt1.AbstractPlanPro2TableModelTransformator;
import org.eclipse.set.model.planpro.Ansteuerung_Element.Aussenelementansteuerung;
import org.eclipse.set.model.planpro.Ansteuerung_Element.ESTW_Zentraleinheit;
import org.eclipse.set.model.planpro.BasisTypen.BasisAttribut_AttributeGroup;
import org.eclipse.set.model.planpro.BasisTypen.ID_Bearbeitungsvermerk_TypeClass;
import org.eclipse.set.model.planpro.Basisobjekte.Bearbeitungsvermerk;
import org.eclipse.set.model.planpro.Bedienung.Bedien_Einrichtung_Oertlich;
import org.eclipse.set.model.planpro.Ortung.FMA_Anlage;
import org.eclipse.set.model.planpro.Ortung.FMA_Komponente;
import org.eclipse.set.model.planpro.Ortung.Zugeinwirkung;
import org.eclipse.set.model.planpro.Signale.Signal;
import org.eclipse.set.model.tablemodel.ColumnDescriptor;
import org.eclipse.set.model.tablemodel.Table;
import org.eclipse.set.model.tablemodel.TableRow;
import org.eclipse.set.ppmodel.extensions.AussenelementansteuerungExtensions;
import org.eclipse.set.ppmodel.extensions.EObjectExtensions;
import org.eclipse.set.ppmodel.extensions.UrObjectExtensions;
import org.eclipse.set.ppmodel.extensions.container.MultiContainer_AttributeGroup;
import org.eclipse.set.utils.EnumeratorExtensions;
import org.eclipse.set.utils.table.RowFactory;
Expand Down Expand Up @@ -119,7 +110,7 @@ public Table transformTableContent(

// C: Referenziert von Objects
fill(row, getColumn(cols, Reference_Object), bv,
note -> getReferenceObjDesignation(referencedBy));
note -> getLSTObjectDesignation(referencedBy));

// D: Ausgabe in Plan
// Will fill later in TableService
Expand Down Expand Up @@ -151,40 +142,4 @@ private void fillBearbeitungsvermerkContent(final TableRow row,
.getWert())
.orElse("")); //$NON-NLS-1$
}

@SuppressWarnings("nls")
private static String getReferenceObjDesignation(final EObject refObj) {
final String typeName = UrObjectExtensions.getTypeName(refObj)
.replace("_TypeClass", "");
final String objDesignation = switch (refObj) {
case final Aussenelementansteuerung aussenelement -> AussenelementansteuerungExtensions
.getElementBezeichnung(aussenelement);
case final Bedien_Einrichtung_Oertlich beo -> getNullableObject(beo,
e -> e.getBezeichnung()
.getBedienEinrichtOertlBez()
.getWert()).orElse("");
case final ESTW_Zentraleinheit estwZentral -> AussenelementansteuerungExtensions
.getElementBezeichnung(estwZentral);
case final FMA_Anlage fmaAnlage -> getNullableObject(fmaAnlage,
fma -> fma.getFMAAnlageKaskade()
.getFMAKaskadeBezeichnung()
.getWert()).orElse("");
case final FMA_Komponente fmaKomponent -> getNullableObject(
fmaKomponent,
fma -> fma.getBezeichnung()
.getBezeichnungTabelle()
.getWert()).orElse("");
case final Signal signal -> getNullableObject(signal,
s -> s.getBezeichnung().getBezeichnungTabelle().getWert())
.orElse("");
case final Zugeinwirkung ein -> getNullableObject(ein,
e -> e.getBezeichnung().getBezeichnungTabelle().getWert())
.orElse("");
default -> "";
};
if (objDesignation != null && !objDesignation.isEmpty()) {
return typeName + " " + objDesignation;
}
return typeName;
}
}
1 change: 1 addition & 0 deletions java/bundles/org.eclipse.set.feature.validation/OSGI-INF/l10n/bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ValidationTableColumns_Severity=Schweregrad
ValidationTableColumns_ProblemType=Problemart
ValidationTableColumns_LineNumber=Zeilennummer
ValidationTableColumns_ObjectType=Objektart
ValidationTableColumns_ObjectDesignation=Objectbezeichnung
ValidationTableColumns_AttributeGroup=Attribut/-gruppe
ValidationTableColumns_ObjectScope=Bereich
ValidationTableColumns_ObjectState=Zustand
Expand Down
5 changes: 5 additions & 0 deletions ...s/org.eclipse.set.feature.validation/src/org/eclipse/set/feature/validation/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ public class Messages {
*/
public String ValidationTableColumns_ObjectType;

/**
* Objectbezeichnung
*/
public String ValidationTableColumns_ObjectDesignation;

/**
* Attribut/-gruppe
*/
Expand Down
Loading
Loading