Skip to content

Topdown node sizes #1097

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

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Topdown node sizes #1097

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
9b31e8f
Nodes define their own width and height even in case no approximator is
Eddykasp Dec 11, 2024
a699946
merge upstream
Eddykasp Dec 11, 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
7 changes: 4 additions & 3 deletions plugins/org.eclipse.elk.core/src/org/eclipse/elk/core/RecursiveGraphLayoutEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,10 @@ protected List<ElkEdge> layoutRecursively(final ElkNode layoutNode, final TestCo
// that have been set for nodes containing further children
if (childNode.getChildren().size() != 0) {
childNode.setDimensions(
layoutNode.getProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH),
layoutNode.getProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH) /
layoutNode.getProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO));
childNode.getProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH),
childNode.getProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH) /
childNode.getProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO)
);
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions ....eclipse.elk.alg.topdown.test/src/org/eclipse/elk/alg/topdown/test/TopdownLayoutTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public void testTwoLevelLayoutHorizontalScaling() {
toplevel.setProperty(CoreOptions.PADDING, new ElkPadding());
toplevel.setProperty(CoreOptions.SPACING_NODE_NODE, 0.0);
// set size of node so that children will be scaled down
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 20.0);
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 0.4);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 20.0);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 0.4);

ElkNode child1 = ElkGraphUtil.createNode(toplevel);
child1.setProperty(CoreOptions.TOPDOWN_LAYOUT, true);
Expand Down Expand Up @@ -106,8 +106,8 @@ public void testTwoLevelLayoutVerticalScaling() {
toplevel.setProperty(CoreOptions.PADDING, new ElkPadding());
toplevel.setProperty(CoreOptions.SPACING_NODE_NODE, 0.0);
// set size of node so that children will be scaled down
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 40.0);
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 1.33333);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 40.0);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 1.33333);

ElkNode child1 = ElkGraphUtil.createNode(toplevel);
child1.setProperty(CoreOptions.TOPDOWN_LAYOUT, true);
Expand Down Expand Up @@ -161,8 +161,8 @@ public void testScaleCap() {
toplevel.setProperty(CoreOptions.PADDING, new ElkPadding());
toplevel.setProperty(CoreOptions.SPACING_NODE_NODE, 0.0);
// set size of node so that children will be scaled down
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 300.0);
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 1.0);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 300.0);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 1.0);

ElkNode child1 = ElkGraphUtil.createNode(toplevel);
child1.setProperty(CoreOptions.TOPDOWN_LAYOUT, true);
Expand Down Expand Up @@ -215,8 +215,8 @@ public void testScaleCapBounded() {
toplevel.setProperty(CoreOptions.PADDING, new ElkPadding());
toplevel.setProperty(CoreOptions.SPACING_NODE_NODE, 0.0);
// set size of node so that children will be scaled down
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 300.0);
graph.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 1.0);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_WIDTH, 300.0);
toplevel.setProperty(CoreOptions.TOPDOWN_HIERARCHICAL_NODE_ASPECT_RATIO, 1.0);

ElkNode child1 = ElkGraphUtil.createNode(toplevel);
child1.setProperty(CoreOptions.TOPDOWN_LAYOUT, true);
Expand Down
Loading