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

radial: Correctly use half of the node node spacing as padding. #957

Merged
merged 2 commits into from
Oct 6, 2023
Merged

radial: Correctly use half of the node node spacing as padding. #957

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
c2c49e4
radial: Correctly use half of the node node spacing as padding.
soerendomroes Sep 21, 2023
7e0e1a7
radial: Correct recursive remvoe overlap.
soerendomroes Sep 21, 2023
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
8 changes: 4 additions & 4 deletions ...org/eclipse/elk/alg/radial/intermediate/compaction/AbstractRadiusExtensionCompaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ public boolean overlap(final ElkNode node1, final ElkNode node2) {
double y1 = node1.getY() - spacing / 2;
double y2 = node2.getY() - spacing / 2;

double width1 = node1.getWidth() + spacing / 2;
double width2 = node2.getWidth() + spacing / 2;
double height1 = node1.getHeight() + spacing / 2;
double height2 = node2.getHeight() + spacing / 2;
double width1 = node1.getWidth() + spacing;
double width2 = node2.getWidth() + spacing;
double height1 = node1.getHeight() + spacing;
double height2 = node2.getHeight() + spacing;

if ((x1 < x2 + width2 && x2 < x1) && (y1 < y2 + height2 && y2 < y1)) {
// left upper and right lower corner overlap
Expand Down
4 changes: 1 addition & 3 deletions ...l/src/org/eclipse/elk/alg/radial/intermediate/overlaps/RadiusExtensionOverlapRemoval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,17 @@ public void extend(final ElkNode graph, final List<ElkNode> nodes, IElkProgressM
Set<ElkNode> nextLevelNodes = RadialUtil.getNextLevelNodeSet(nodes);
// Calculate the moved distance which is the amount all children and grandchildren have to be moved.
int index = 1;
while (!nextLevelNodes.isEmpty()) {
if (!nextLevelNodes.isEmpty()) {
for(ElkNode nextLevelNode : nextLevelNodes) {
moveNode(nextLevelNode, movedDistance);
}
progressMonitor.logGraph(graph, "Child movement " + index);
nextLevelNodes = RadialUtil.getNextLevelNodeSet(new ArrayList<>(nextLevelNodes));
index++;
}

if (sorter != null) {
sorter.sort(new ArrayList<>(nextLevelNodes));
}
progressMonitor.logGraph(graph, "After ancestor movement");
extend(graph, new ArrayList<>(nextLevelNodes), progressMonitor);
}
}
Expand Down
Loading