Skip to content
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

Jump to bottom

Only visible Varinout pins are now added to the model #669

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Only visible Varinout pins are now added to the model #669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions ...ication/src/org/eclipse/fordiac/ide/application/editparts/AbstractFBNElementEditPart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,12 @@ private static int getInterfaceInputElementIndex(final InterfaceEditPart interfa
return interfaceList.getSockets().indexOf(interfaceEditPart.getModel());
}
if (interfaceEditPart.isVariable()) {
if (((VarDeclaration) interfaceEditPart.getModel()).isInOutVar()) {
return interfaceList.getInOutVars().indexOf(interfaceEditPart.getModel());
final VarDeclaration varDecl = (VarDeclaration) interfaceEditPart.getModel();
if (varDecl.isInOutVar()) {
return interfaceList.getInOutVars().stream().filter(VarDeclaration::isVisible).toList()
.indexOf(varDecl);
}
return interfaceList.getVisibleInputVars().indexOf(interfaceEditPart.getModel());
return interfaceList.getVisibleInputVars().indexOf(varDecl);
}
if (interfaceEditPart instanceof ErrorMarkerInterfaceEditPart) {
return calcErrorMarkerINdex(interfaceEditPart, interfaceList);
Expand All @@ -408,10 +410,12 @@ private static int getInterfaceOutputElementIndex(final InterfaceEditPart interf
return interfaceList.getPlugs().indexOf(interfaceEditPart.getModel());
}
if (interfaceEditPart.isVariable()) {
if (((VarDeclaration) interfaceEditPart.getModel()).isInOutVar()) {
return interfaceList.getOutMappedInOutVars().indexOf(interfaceEditPart.getModel());
final VarDeclaration varDecl = (VarDeclaration) interfaceEditPart.getModel();
if (varDecl.isInOutVar()) {
return interfaceList.getOutMappedInOutVars().stream().filter(VarDeclaration::isVisible).toList()
.indexOf(varDecl);
}
return interfaceList.getVisibleOutputVars().indexOf(interfaceEditPart.getModel());
return interfaceList.getVisibleOutputVars().indexOf(varDecl);
}
if (interfaceEditPart instanceof ErrorMarkerInterfaceEditPart) {
return calcErrorMarkerINdex(interfaceEditPart, interfaceList);
Expand Down Expand Up @@ -456,6 +460,14 @@ protected List<Object> getModelChildren() {
final List<Object> elements = new ArrayList<>();
elements.add(getInstanceName());
elements.addAll(getModel().getInterface().getAllInterfaceElements());

final List<VarDeclaration> inoutInRemovalList = getModel().getInterface().getInOutVars().stream()
.filter(it -> !it.isVisible()).toList();
final List<VarDeclaration> inoutOutRemovalList = getModel().getInterface().getOutMappedInOutVars().stream()
.filter(it -> !it.isVisible()).toList();
elements.removeAll(inoutInRemovalList);
elements.removeAll(inoutOutRemovalList);

final List<VarDeclaration> inputRemovalList = getModel().getInterface().getInputVars().stream()
.filter(it -> !it.isVisible()).toList();
final List<VarDeclaration> outputRemovalList = getModel().getInterface().getOutputVars().stream()
Expand Down
Loading