Diagram improvements #866

alexanderpann · 2024-06-19T12:54:28Z

More features are mentioned in the commit messages.

implements Diagram Editor: Improve support for cross-navigation #112
implements Should be able to adjust spacing/padding of box contents. #78 + fixes Diagram: Add padding for boxes on auto-size #89 through the new style sheet item diagram-layout-node-size-minimum-padding
implements Enable masking/unmasking of edges in diagrams based on generic box/edge queries #56
implements Automatically fit to size all new boxes placed on diagrams #57
has a prototype for Diagram Editor: provide option to display the diagram pane in a separate window #113 but it is deactivated because it is not working properly.
fixes Diagram: Changes are not synchronized when invoked from some plugin actions #506
implements Diagram Editor: Improve support for cross-navigation #112 partly
implements Diagram Editor: API to customize diagram buttons #103
implements Diagram Editor: add option for autolayout-on-changes #95
fixes Subdiagrams not supported in box query #867

…tions

…ons in own group

…of boxes (#78)

…MPS cells (#112)

…utton + complete custom configuration

…osed

…x/diagram_improvements # Conflicts: # CHANGELOG.md # code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps # code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps # code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps

slisson

DiagramModel.myAutoRouteEdges, DiagramModel.autoRouteEdges(), DiagramModel.setAutoRouteEdges() and everything else related to edge routing can probably just be removed as it is dead code.

slisson · 2024-06-24T10:31:26Z

.../de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps

+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="YGA9S4WPr9" role="3cqZAp">


All statements after .beginUpdate() in DiagramActionsUtil.fitSizeAll should be moved into the try block. Otherwise, it's not guaranteed that .endUpdate() is called if one of them throws an exception.

…overlap the buttons

…he model2graph

…dy disposed

…tion demo

HeikoBecker

I have performed smoke tests and reported some bugs to @alexanderpann. The code seems good enough for now. All issues that arise once this is merged should be solved in follow-up tickets.

alexanderpann added 5 commits June 7, 2024 12:26

editor.diagram: refactor code

14305a6

editor.diagram: fix fit size all action model sync (#506)

ba27d91

editor.diagram: drop edge only layouting code from old libavoid layouter

eece332

editor.diagram: provide a button to delete layout algorithm configura…

d130518

…tions

editor.diagram: fix an issue in the migration of the configs

c2cb596

alexanderpann force-pushed the bugfix/diagram_improvements branch 2 times, most recently from 228c9c6 to 46e6a73 Compare June 20, 2024 08:08

alexanderpann added 23 commits June 23, 2024 23:10

editor.diagram: refactor autolayout and other diagram actions

9a0cd94

editor.diagram: make port rotation naming clearer + put diagrams acti…

12ba2bd

…ons in own group

editor.diagram: add an option to fit to size all boxes on init (#57)

6e6c506

editor.diagram: add the ability to show/hide edges (#56)

4c7bb76

editor.diagram: add the ability to add a padding to the minimum size …

d9ae1ba

…of boxes (#78)

editor.diagram: add support for showing diagrams in a separate tool

7758464

editor.diagram: remove debug message

c9d09a6

fix resolve infos

f087dc3

editor.diagram: support setting the edge style

59f5de4

editor.diagram: run the auto layouter for port side actions

d7f1bca

editor.diagram: add the ability to disable node editing

55e6b54

editor.diagram: don't duplicate EditorComponent#isUnderSelection

7c7218c

editor.diagram: forward not only ctrl events to the MPS cells

6596263

editor.diagram: add an extension point for adding click listeners to …

e895783

…MPS cells (#112)

editor.diagram: add an option to hide all edges of a box

0bf3498

richtext.runtime: add a missing null check

e2aaa48

editor.diagram: remove not working port switch actions

8418d79

editor.diagram: add support for exporting diagrams as PNGs and SVGs

f046457

editor.diagram: add missing style attribute for translate to origin b…

86e8509

…utton + complete custom configuration

editor.diagram: add the ability to customize the buttons #103

650a3ae

editor.diagram: fix button scaling

35ed05c

editor.diagram: resolve infos

d39e98d

editor.diagram: add a button to delete the stored layout information

82df2b0

alexanderpann added 6 commits June 24, 2024 10:13

editor.celllayout: add a new style sheet item 'full-width-root'

9d50119

force save all

3e7fa1d

editor.diagram: fix the hide and show buttons visibility

da14c5e

editor.diagram: fix a broken comment

0da6ba2

editor.diagram: remove a debug message

6923c35

editor.diagram: only synchronize write when the component is not disp…

c5ef64f

…osed

alexanderpann force-pushed the bugfix/diagram_improvements branch from 3e4a071 to c5ef64f Compare June 24, 2024 08:13

alexanderpann added 2 commits June 24, 2024 10:15

force save all

3bffd19

slisson reviewed Jun 24, 2024

View reviewed changes

alexanderpann added 15 commits June 24, 2024 20:43

editor.diagram: remove some more dead code

2b9b3cd

editor.diagram: fix try catch in DiagramActionsUtil#fitSizeAll

986a52a

editor.diagram: remove the offending commented out code all together

a0894a6

editor.diagram: consider the default translation when zooming to not …

42b2df0

…overlap the buttons

editor.diagram: limit the minimum scaling

f88cff6

editor.diagram: fix the CustomDiagramButtonConfig initialization

d970ab4

editor.diagram: enable the custom edge handler for standard edge styles

54e564d

editor.diagram: make subdiagrams work in box queries

3967edc

editor.diagram: also run the auto layouter on change for changes in t…

cb86485

…he model2graph

editor.diagram: fix a wrong generator

5fa2b04

editor.diagram: change the edge style to orthogonal for the elk demos

999d321

editor.diagram: improve the call graph annotation editor

69edbe0

editor.diagram: fix the wrong reference in the typesystem rule

a0bd2c4

editor.diagram: do not run the auto layouter when the editor is alrea…

196ff6c

…dy disposed

editor.diagram: remove autolayout on change for the call graph annota…

1a9ffe8

…tion demo

HeikoBecker self-requested a review June 27, 2024 06:36

HeikoBecker approved these changes Jun 27, 2024

View reviewed changes

alexanderpann merged commit c35f1b0 into maintenance/mps20222 Jun 27, 2024
1 check passed

alexanderpann deleted the bugfix/diagram_improvements branch June 27, 2024 06:53

alexanderpann mentioned this pull request Jun 28, 2024

Think about more uses cases for the diagram auto layouter #857

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Diagram improvements #866

Diagram improvements #866

alexanderpann commented Jun 19, 2024 •

edited

Loading

slisson left a comment

slisson Jun 24, 2024

HeikoBecker left a comment

Diagram improvements #866

Diagram improvements #866

Conversation

alexanderpann commented Jun 19, 2024 • edited Loading

slisson left a comment

Choose a reason for hiding this comment

slisson Jun 24, 2024

Choose a reason for hiding this comment

HeikoBecker left a comment

Choose a reason for hiding this comment

alexanderpann commented Jun 19, 2024 •

edited

Loading