Commit d9a287b
authored
Add support for sticky Manhattan Routing and rounded Edges (#486)
* Add sticky Manhattan edge router
Preserves intermediate bend points when a connected node moves and only
slides the corner adjacent to the moved endpoint, instead of
recomputing the full route like the standard Manhattan router does.
Ported from Ralph Soika's `BPMNManhattanRouter` in Open-BPMN, see
eclipse-glsp/glsp#1642. Opt-in per edge
via `edge.routerKind = 'sticky-manhattan'`. Per-edge state lives in a
`WeakMap` keyed on the edge instance. Dedicated anchor computers are
registered so the router coexists with the standard Manhattan router.
Adds `Point.isVertical` and `Point.isHorizontal` helpers to the
existing `sprotty-geometry-point` augmentation so axis-alignment
checks read as one-liners across the router.
* Add rounded-corner edge view
`RoundedCornerEdgeView` extends `GEdgeView` and overrides
`createPathForSegments` to emit SVG quadratic curves at every
right-angle bend, producing smooth corners on Manhattan-style routes.
The radius is clamped per corner to a fraction of the shorter adjacent
segment to avoid visual artifacts on short segments.
Ported from Ralph Soika's `BPMNEdgeView`, contributed alongside the
sticky Manhattan router via the same discussion. The view works with
any router that emits right-angle corners; combining it with
`GLSPStickyManhattanEdgeRouter` reproduces the look-and-feel of the
original Open-BPMN setup.
* [DO NOT MERGE] Wire workflow example to sticky router and rounded view
Temporary reviewer aid: routes every workflow edge through the
`sticky-manhattan` router and renders it with `RoundedCornerEdgeView`,
so reviewers can drag connected nodes and observe bend-point
preservation and rounded-corner rendering in the standalone example.
Revert before merging to master.
* Address PR #486 review feedback
- Mark `GLSPStickyManhattanEdgeRouter` as `@experimental` in the JSDoc:
API and implementation may change in future releases.
- Drop the trivial `KIND` constant test and the anchor-registration DI
wiring test from the sticky-router spec — the first exercises a string
literal, the second tests `routingModule` hookup rather than router
behavior.
- Trim the noisy historical comment in `applyFollowLogic` down to the
single sentence that actually explains the current behavior.
- Delete `rounded-corner-edge-view.spec.ts`: per review, unit-testing
views on a string-render level is brittle and diverges from the rest
of the repository, which covers views via e2e tests.
- Introduce `axisTolerance` on `StickyManhattanRouterOptions`
(defaulting to `1` px) and thread it through the sticky-router call
sites to `Point.isVertical` / `Point.isHorizontal`. `manhattanify`
now takes the `edge` so it resolves the tolerance via `getOptions`,
consistent with the other protected helpers.
- Change the `Point.isVertical` / `Point.isHorizontal` default
tolerance from `1` to the new `ALMOST_EQUAL_EPSILON` constant
(`1e-3`), matching sprotty's `almostEquals` convention. The 1-pixel
tolerance is a sticky-router concern and now lives in its options,
not as a default on a general-purpose geometry helper.
* Sticky-manhattan router: review feedback
- Make route() side-effect free; refresh baseline in commitRoute
and on persistence cleanup (updateHandles=true)
- Preserve sub-pixel precision (drop Math.round)
- Clear baseline on fresh-default fallback
- Thread DefaultAnchors through follow/cleanup helpers
- Note simpler tier-3 fallback vs sprotty
* Rounded-corner Manhattan edge view: review feedback
- Rename to RoundedCornerManhattanEdgeView; reflect Manhattan-only
contract in JSDoc
- Tighten right-angle check via Point.isHorizontalAligned /
isVerticalAligned
- Promote shortSegmentThreshold / shortSegmentRadiusFactor to fields
- Drop decorative Math.round(radius * 10) / 10
* Rounded-corner Manhattan view: gaps on intersections
- Add GEdgeViewWithGapsOnIntersections: parallel to GEdgeView on top
of sprotty's PolylineEdgeViewWithGapsOnIntersections
- Extend RoundedCornerManhattanEdgeView from it; merge corner
rounding and intersection-path splicing in one builder
- Route via edgeRouterRegistry.route(edge, args) so the postprocessor
pipeline populates intersection data
- Skip gap fragments inside rounded-corner zones to avoid backward
strokes into the curve
* Fix all
* Revert "[DO NOT MERGE] Wire workflow example to sticky router and rounded view"
This reverts commit 2de4253.1 parent 5fbf592 commit d9a287b
13 files changed
Lines changed: 1358 additions & 10 deletions
File tree
- examples/workflow-glsp/src
- packages
- client/src
- features/routing
- views
- protocol/src
- utils
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
114 | 114 | | |
115 | 115 | | |
116 | 116 | | |
117 | | - | |
| 117 | + | |
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
| 36 | + | |
35 | 37 | | |
36 | 38 | | |
37 | 39 | | |
| |||
54 | 56 | | |
55 | 57 | | |
56 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
57 | 64 | | |
58 | 65 | | |
59 | 66 | | |
| |||
Lines changed: 53 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
Lines changed: 212 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
0 commit comments