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

Jet cos/constraints #2

Merged
merged 107 commits into from
Mar 27, 2020
Merged

Jet cos/constraints #2

merged 107 commits into from
Mar 27, 2020

Conversation

soerendomroes
Copy link
Member

@soerendomroes soerendomroes commented Mar 26, 2020 •
edited
Loading

Add interactive mode to language server.

ConnorObrian and others added 30 commits May 16, 2019 15:23
@ConnorObrian
language server extension basic files
b8d4fd8
@ConnorObrian
hello reaction changed
655543a
@ConnorObrian
Language Server Extension Test Works
ba7978d
@Drakae
setLayerConstraint-method added
f90ac48
@Drakae
Merge branch 'keith' into jet_cos/constraints
73f6328
@Drakae
merge problems fixed
4fc5d3b
@Drakae
setLayerConstraint sets the property for a node
61c6d3e
@Drakae
setLayerConstraint sets the property of an elknode
e1ef95c
@Drakae
setting position constraints is possible
f8e98e4
@ConnorObrian
Constraints: KGraph Layout Method created
a8ae8ad
@ConnorObrian
Merge remote-tracking branch 'origin/jet_cos/constraints' into jet_co…
1865022 
…s/constraints
@Drakae
own layout method for layout with constraints
fe0d149
@Drakae
first implementation of respecting layer constraints
450b18b
@Drakae
respecting layer constraints work partly
a29e10a 
works for nodes without edges and if all nodes have the same width
@Drakae
respecting layout constraints works for nodes without edges
10439e6
@Drakae
layout respects position constraints
7b8f679
@ConnorObrian
Constraints: Interface erweitert, Reevaluation Klasse erstellt
36d971b
@ConnorObrian
Merge remote-tracking branch 'origin/jet_cos/constraints' into jet_co…
5a16bb8 
…s/constraints
@ConnorObrian
Constraints: Superfluos imports deleted
3791288
@Drakae
calculating the layer of the nodes improved
38dbe6e
@Drakae
setting y coordinates fixed and improved
61af19b
@ConnorObrian
Constraints: Model is serialized back to the file
bff3ed3
@ConnorObrian
Merge remote-tracking branch 'origin/jet_cos/constraints' into jet_co…
4981102 
…s/constraints
@Drakae
reversed edges and width of nodes dont make problems anymore
9fb5bbb
@ConnorObrian
Merge branch 'keith' into jet_cos/constraints
485ef75
@ConnorObrian
Constraints: Layout for constraints is now called in doUpdateLayout
f024080
@Drakae
Layout for Constraints is called in createModel
2063ec7
@Drakae
added comments
5839b7b
@Drakae
checking the interactiveLayout property
ec2d0bd
@ConnorObrian
Constraints: Added layerID and positionID to KlighD for KGraphs
c88c686
@soerendomroes
klighd.lsp: Added year to copyright.
8cc95e3
@soerendomroes
klighd.lsp: Added brackets to fix mvn build.
55e605a
@soerendomroes
Merge remote-tracking branch 'origin/keith' into jet_cos/constraints
a33b543 
Conflicts:
	build/de.cau.cs.kieler.pragmatics.targetplatform/de.cau.cs.kieler.pragmatics.targetplatform.target
	plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphLayoutEngine.xtend
@soerendomroes
klighd.lsp: Removed ternary operator.
b8e890b
@soerendomroes
Merge remote-tracking branch 'origin/keith' into jet_cos/constraints
cf5afcf
@soerendomroes
Merge remote-tracking branch 'origin/keith' into jet_cos/constraints
bc704b2
@soerendomroes
klighd.lsp.constraints: Refactored contraints to data classes.
f173888
@soerendomroes
klighd.lsp.constraints: Refactored lsp messages for constraints to
b7fa393 
actions.
@soerendomroes
Layer and Position constraints work for all fixed directions.
07b6606
@soerendomroes
Handle undefined same as right.
cd37baf
@soerendomroes
klighd.lsp: Reworked setting of constraints.
7df2182
@soerendomroes
klighd.lsp: Added delete constraint actions.
27df047
@soerendomroes
klighd lsp: Fixed delete constraint actions.
9d51ddc
@soerendomroes
klighd.lsp.interactive: Initial layout should be done without
d5ca87a 
interactive strategies.
@soerendomroes
Migrated changes in pragmatic to klighd.
365b532
@soerendomroes
Merge remote-tracking branch 'origin/keith' into jet_cos/constraints
a1774ff 
Conflicts:
	plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend
	plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramUpdater.xtend
	plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/model/KGraphModel.xtend
@soerendomroes
language.server: Added interactive LSExtensions.
469916a
@soerendomroes
klighd.lsp: Fixed rect packing id change.
0a12fb1 
Signed-off-by: Soeren Domroes <sdo@informatik.uni-kiel.de>
@soerendomroes
klighd.lsp: RectPacking id change.
f62b083
NiklasRentzCAU
NiklasRentzCAU requested changes Mar 27, 2020
View reviewed changes
Copy link
Member

@NiklasRentzCAU NiklasRentzCAU left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine in general, some cleaning has to be done before a merge though.

...cs.kieler.kgraph.language.server/src/de/cau/cs/kieler/kgraph/language/server/LSCreator.xtend Outdated Show resolved Hide resolved
plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/AbstractActionHandler.xtend Outdated Show resolved Hide resolved
plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/IActionHandler.xtend Outdated Show resolved Hide resolved
...ins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend Outdated Show resolved Hide resolved
...ins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramGenerator.xtend Outdated Show resolved Hide resolved
...au/cs/kieler/klighd/lsp/interactive/rectpack/RectPackInterativeLanguageServerExtension.xtend Show resolved Hide resolved
...au/cs/kieler/klighd/lsp/interactive/rectpack/RectPackInterativeLanguageServerExtension.xtend Outdated Show resolved Hide resolved
...lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpack/RectPackSetPositionConstraint.xtend Show resolved Hide resolved
....kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/interactive/rectpack/SetAspectRatio.xtend Show resolved Hide resolved
plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/model/KGraphModel.xtend Outdated Show resolved Hide resolved
NiklasRentzCAU
NiklasRentzCAU approved these changes Mar 27, 2020
View reviewed changes
Copy link
Member

@NiklasRentzCAU NiklasRentzCAU left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@NiklasRentzCAU NiklasRentzCAU merged commit 151191a into keith Mar 27, 2020
NiklasRentzCAU added a commit that referenced this pull request Mar 30, 2020
@NiklasRentzCAU
published build artifacts of release 1.1.0 #2
48090a8
sailingKieler added a commit that referenced this pull request Mar 30, 2020
@sailingKieler
published build artifacts of release 1.1.0
9b297aa 
published build artifacts of release 1.1.0 #2
@soerendomroes soerendomroes deleted the jet_cos/constraints branch July 10, 2020 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NiklasRentzCAU NiklasRentzCAU NiklasRentzCAU approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@soerendomroes @NiklasRentzCAU @ConnorObrian @Drakae