[333] Keep routing style with ELK #337
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as duplicate.
This comment was marked as duplicate.
scosta-obeo
requested changes
Jun 18, 2024
...eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java
Outdated
Show resolved
Hide resolved
...se/sirius/diagram/elk/migration/EmptyJunctionPointsStringValueStyleMigrationParticipant.java
Outdated
Show resolved
Hide resolved
...sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/layout/SimpleELKLayoutTest.java
Outdated
Show resolved
Hide resolved
This commit just migrates the data used by SimpleELKLayoutTest without any change. It also seems that some diagrams have not been refreshed according to previous modifications done on VSM file. All diagrams have been opened (and so refreshed) for this commit. Bug: #333
- 5 new representations have been added in tests data:
- one with oblique edges,
- one with rectilinear edges,
- one with a mix of them and same number of oblique and rectilinear
edges,
- one with a mix of them and more oblique edges,
- and one with a mix of them more rectilinear edges.
- 5 tests corresponding to these representations have been added to
check the routing style before and after the arrange all with ELK.
Bug: #333
During the conversion from DDiagram to ELK Graph, the routing styles of original Sirius DEdge is now stored on the common parent of edges in ELK Graph. This property can be overridden by defining the routing style directly in the VSM. The tests have also been adapted. Indeed, before this commit the routing applied was always Rectilinear. Now, it is not the case. The existing tests have been "duplicated", to have the previous behavior (by forcing the "Rectilinear routing" in the VSM) and the new behavior for all existing tests by considering the initial used routing style. Bug: #333
Currently, a strange StringValueStyle is created on edge after a layout with ELK, like this <styles xmi:type="notation:StringValueStyle" xmi:id="_b5DYgOqeEe6GK951-Ozudg" name="junctionPoints" stringValue="()"/> As consequence, the edge appears as customized (tabbar button "Reset style properties to default", and same button in tab Appearance Properties view, is enabled).
Before this commit a StringValueStyle was created due to a bug in ELK that creates an empty list of junction points. This also causes, as side effect, an edge that seems to be "customized". Bug: #333
The representations created before the previous commit, that fixes the unexpected creation of StringValueStyle, can contain some kind of "empty StringValueStyle". The goal of this commit is to remove them. This commit also adds tests to check migration effect. Bug: #333
lredor
force-pushed
the
lre/enh/333-keepRoutingStyleWithELK
branch
from
a4d177b
to
6ce7bb4
Compare
lredor
commented
Jun 20, 2024
There was a problem hiding this comment.
I have added explicit comment "as review" instead of the comment of the 27th march, ie:
Warning: Before merging, the release notes and the migration participant version must be reviewed. Indeed, these commits have been done too late fore Sirius 7.4.1 (even if the release notes and the migration participant version refere to it).
|
|
||
| h4. Migrations | ||
|
|
||
| * <span class="label label-success">Added</span> A migration participant, EmptyJunctionPointsStringValueStyleMigrationParticipant, has been added to fix the GMF edges that contain an empty "junctionPoints" StringValueStyle. These empty "junctionPoints" StringValueStyle were created due to a bug in ELK./Sirius integration. This migration participant simply removes the empty "junctionPoints" StringValueStyle. As reminder, this migration participant has been introduced in Sirius 7.4.3. The corresponding version, stored in attribute version of viewpoint:DAnalysis of the aird file, is _15.4.3.202406211100_. |
There was a problem hiding this comment.
The version will be to review just before merge.
| /** | ||
| * Migration version. | ||
| */ | ||
| public static final Version MIGRATION_VERSION = new Version("15.4.3.202406211100"); //$NON-NLS-1$ |
There was a problem hiding this comment.
The version will be to review just before merge.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.