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

lsp: fix an issue when recursing through non-expanded nodes in the micro layout calculation. #188

Merged
merged 2 commits into from
Apr 5, 2024
Merged

lsp: fix an issue when recursing through non-expanded nodes in the micro layout calculation. #188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ab89d5
lsp: fix an issue when recursing through non-expanded nodes in the micro
NiklasRentzCAU Apr 5, 2024
2ba8ab0
fixed same issue when recursing through edges with targets within
NiklasRentzCAU Apr 5, 2024
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
34 changes: 26 additions & 8 deletions ...de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/utils/RenderingPreparer.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* http://rtsys.informatik.uni-kiel.de/kieler
*
* Copyright 2018-2023 by
* Copyright 2018-2024 by
* + Kiel University
* + Department of Computer Science
* + Real-Time and Embedded Systems Group
Expand Down Expand Up @@ -46,6 +46,7 @@ import de.cau.cs.kieler.klighd.microlayout.DecoratorPlacementUtil.Decoration
import de.cau.cs.kieler.klighd.microlayout.GridPlacementUtil
import de.cau.cs.kieler.klighd.microlayout.PlacementUtil
import de.cau.cs.kieler.klighd.util.KlighdProperties
import de.cau.cs.kieler.klighd.util.RenderingContextData
import java.awt.geom.Point2D
import java.util.ArrayList
import java.util.HashMap
Expand Down Expand Up @@ -124,11 +125,27 @@ final class RenderingPreparer {
}
}
if (element instanceof KNode) {
for (node : element.children) {
prepareRendering(node, kGraphToSGraph)
// Do not recurse generating IDs if the element is not expanded, as there won't be any SGraph generated for
// it.
var boolean isExpanded
val renderingContextData = RenderingContextData.get(element)
if (renderingContextData.hasProperty(SprottyProperties.EXPANDED)) {
isExpanded = renderingContextData.getProperty(SprottyProperties.EXPANDED)
} else {
// If the expanded property does not exist yet, use the initial expansion.
isExpanded = element.getProperty(KlighdProperties.EXPAND)
}

if (isExpanded) {
for (node : element.children) {
prepareRendering(node, kGraphToSGraph)
}
}
for (edge : element.outgoingEdges) {
prepareRendering(edge, kGraphToSGraph)
// not expanded => edge must not have the target node inside the non-expanded
if (isExpanded || !KGraphUtil.isDescendant(edge.target, element)) {
prepareRendering(edge, kGraphToSGraph)
}
}
for (port : element.ports) {
prepareRendering(port, kGraphToSGraph)
Expand Down Expand Up @@ -368,10 +385,11 @@ final class RenderingPreparer {
var List<Point2D.Float> pointList = new ArrayList()
if (parent instanceof KEdge) {
val edge = parent as KEdge

pointList.add(new Point2D.Float(edge.sourcePoint.x, edge.sourcePoint.y))
pointList.addAll(edge.bendPoints.map[ new Point2D.Float(it.x, it.y) ])
pointList.add(new Point2D.Float(edge.targetPoint.x, edge.targetPoint.y))
if (edge.sourcePoint !== null && edge.targetPoint !== null) {
pointList.add(new Point2D.Float(edge.sourcePoint.x, edge.sourcePoint.y))
pointList.addAll(edge.bendPoints.map[ new Point2D.Float(it.x, it.y) ])
pointList.add(new Point2D.Float(edge.targetPoint.x, edge.targetPoint.y))
}
} else if (!parentRendering.points.empty) {
pointList.addAll(parentRendering.points.map[position |
PlacementUtil.evaluateKPosition(position, parentBounds, true).toPoint2D])
Expand Down
Loading