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

Interactive Mrtree #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Interactive Mrtree #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
971cf58
graphs.klighd: Added interactive graph visitor to elkgraph synthesis.
soerendomroes Nov 8, 2022
5a8c7ff
Added MrTree to supported ls extensions.
soerendomroes Nov 11, 2022
99a296f
Merge branch 'master' into sdo/interactiveMrTree
soerendomroes Apr 10, 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
3 changes: 2 additions & 1 deletion plugins/de.cau.cs.kieler.graphs.klighd/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0",
org.eclipse.elk.core,
org.eclipse.elk.core.service,
org.eclipse.elk.alg.layered,
org.eclipse.elk.alg.rectpacking
org.eclipse.elk.alg.rectpacking,
org.eclipse.elk.alg.mrtree
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Export-Package: de.cau.cs.kieler.graphs.klighd.syntheses
Expand Down
4 changes: 3 additions & 1 deletion ...graphs.klighd/src/de/cau/cs/kieler/graphs/klighd/syntheses/ElkGraphDiagramSynthesis.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import de.cau.cs.kieler.klighd.labels.decoration.RectangleDecorator
import java.awt.Color
import java.util.List
import org.eclipse.elk.alg.layered.InteractiveLayeredGraphVisitor
import org.eclipse.elk.alg.mrtree.InteractiveMrTreeGraphVisitor
import org.eclipse.elk.alg.rectpacking.InteractiveRectPackingGraphVisitor
import org.eclipse.elk.core.options.CoreOptions
import org.eclipse.elk.core.service.util.CompoundGraphElementVisitor
Expand Down Expand Up @@ -303,7 +304,8 @@ class ElkGraphDiagramSynthesis extends AbstractStyledDiagramSynthesis<ElkNode> {
if (viewModel.getProperty(CoreOptions.INTERACTIVE_LAYOUT)) {
additionalLayoutRuns.add(new CompoundGraphElementVisitor(
new InteractiveRectPackingGraphVisitor(),
new InteractiveLayeredGraphVisitor()));
new InteractiveLayeredGraphVisitor(),
new InteractiveMrTreeGraphVisitor()));
}
return additionalLayoutRuns;
}
Expand Down
6 changes: 5 additions & 1 deletion ...language.server/src/de/cau/cs/kieler/pragmatics/language/server/PragmaticsLsCreator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ package de.cau.cs.kieler.pragmatics.language.server

import de.cau.cs.kieler.klighd.lsp.KGraphLanguageClient
import de.cau.cs.kieler.klighd.lsp.interactive.layered.LayeredInteractiveLanguageServerExtension
import de.cau.cs.kieler.klighd.lsp.interactive.mrtree.MrTreeInteractiveLanguageServerExtension
import de.cau.cs.kieler.klighd.lsp.interactive.rectpacking.RectpackingInteractiveLanguageServerExtension
import de.cau.cs.kieler.klighd.lsp.launch.AbstractLsCreator

Expand All @@ -29,11 +30,14 @@ class PragmaticsLsCreator extends AbstractLsCreator {

RectpackingInteractiveLanguageServerExtension rectPack

MrTreeInteractiveLanguageServerExtension mrTree

override getLanguageServerExtensions() {
constraints = injector.getInstance(LayeredInteractiveLanguageServerExtension)
rectPack = injector.getInstance(RectpackingInteractiveLanguageServerExtension)
mrTree = injector.getInstance(MrTreeInteractiveLanguageServerExtension)
val iLanguageServerExtensions = newArrayList(
injector.getInstance(PragmaticsRegistrationLanguageServerExtension), constraints, rectPack
injector.getInstance(PragmaticsRegistrationLanguageServerExtension), constraints, rectPack, mrTree
)
return iLanguageServerExtensions
}
Expand Down
Loading