From f35be526c6a0fa2778fd58f9469a8479d5a90a87 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 14 Mar 2023 15:29:50 -0700 Subject: [PATCH] remove ladders --- d2layouts/d2elklayout/layout.go | 92 +++++++++ .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 81564 -> 81564 bytes .../elk/board.exp.json | 10 +- .../elk/sketch.exp.svg | 158 ++++++++-------- .../testdata/stable/chaos2/elk/board.exp.json | 8 - .../testdata/stable/chaos2/elk/sketch.exp.svg | 176 +++++++++--------- .../stable/elk_shim/elk/board.exp.json | 8 - .../stable/elk_shim/elk/sketch.exp.svg | 166 ++++++++--------- .../elk/board.exp.json | 8 - .../elk/sketch.exp.svg | 158 ++++++++-------- 10 files changed, 422 insertions(+), 362 deletions(-) diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 1f17b9621..f0293e693 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -452,6 +452,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err // see https://github.com/terrastruct/d2/issues/1030 func deleteBends(g *d2graph.Graph) { // Get rid of S-shapes at the source and the target + // TODO there might be value in repeating this. removal of an S shape introducing another S shape that can still be removed for _, isSource := range []bool{true, false} { for ei, e := range g.Edges { if len(e.Route) < 4 { @@ -546,6 +547,97 @@ func deleteBends(g *d2graph.Graph) { } } } + // Get rid of ladders + // ELK likes to do these for some reason + // . ┌─ + // . ┌─┘ + // . │ + // We want to transform these into L-shapes + for ei, e := range g.Edges { + if len(e.Route) < 6 { + continue + } + if e.Src == e.Dst { + continue + } + + for i := 1; i < len(e.Route)-3; i++ { + before := e.Route[i-1] + start := e.Route[i] + corner := e.Route[i+1] + end := e.Route[i+2] + after := e.Route[i+3] + + // S-shape on sources only concerned one segment, since the other was just along the bound of endpoint + // These concern two segments + + var newCorner *geo.Point + if start.X == corner.X { + newCorner = geo.NewPoint(end.X, start.Y) + // not ladder + if (end.Y > start.Y) != (before.Y > start.Y) { + continue + } + if (end.Y > start.Y) != (end.Y > start.Y) { + continue + } + } else { + newCorner = geo.NewPoint(start.X, end.Y) + if (end.X > start.X) != (before.X > start.X) { + continue + } + if (end.X > start.X) != (after.X > start.X) { + continue + } + } + + oldS1 := geo.NewSegment(start, corner) + oldS2 := geo.NewSegment(corner, end) + + newS1 := geo.NewSegment(start, newCorner) + newS2 := geo.NewSegment(newCorner, end) + + // Check that the new segments doesn't collide with anything new + oldIntersects := countObjectIntersects(g, *oldS1) + countObjectIntersects(g, *oldS2) + newIntersects := countObjectIntersects(g, *newS1) + countObjectIntersects(g, *newS2) + + if newIntersects > oldIntersects { + continue + } + + oldCrossingsCount1, oldOverlapsCount1, oldCloseOverlapsCount1 := countEdgeIntersects(g, g.Edges[ei], *oldS1) + oldCrossingsCount2, oldOverlapsCount2, oldCloseOverlapsCount2 := countEdgeIntersects(g, g.Edges[ei], *oldS2) + oldCrossingsCount := oldCrossingsCount1 + oldCrossingsCount2 + oldOverlapsCount := oldOverlapsCount1 + oldOverlapsCount2 + oldCloseOverlapsCount := oldCloseOverlapsCount1 + oldCloseOverlapsCount2 + + newCrossingsCount1, newOverlapsCount1, newCloseOverlapsCount1 := countEdgeIntersects(g, g.Edges[ei], *newS1) + newCrossingsCount2, newOverlapsCount2, newCloseOverlapsCount2 := countEdgeIntersects(g, g.Edges[ei], *newS1) + newCrossingsCount := newCrossingsCount1 + newCrossingsCount2 + newOverlapsCount := newOverlapsCount1 + newOverlapsCount2 + newCloseOverlapsCount := newCloseOverlapsCount1 + newCloseOverlapsCount2 + + if newCrossingsCount > oldCrossingsCount { + continue + } + if newOverlapsCount > oldOverlapsCount { + continue + } + + if newCloseOverlapsCount > oldCloseOverlapsCount { + continue + } + + // commit + g.Edges[ei].Route = append(append( + e.Route[:i], + newCorner, + ), + e.Route[i+3:]..., + ) + break + } + } } func countObjectIntersects(g *d2graph.Graph, s geo.Segment) int { diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 8ce7baba159daa647ffcee594dbbbf8e2b6d7d0b..2a82b33521366d623accebd4ab22d1dafabd8e81 100644 GIT binary patch delta 188 zcmbR9mu1dhmJOxy(`)z`l_yv4sGlsMz`vPur*r6Jsb+)iK+%=jlQni2O!jJ40ZJE6 ze$dQ5`ST93&FTuDlcxLdF&b?4YQASOUDb+l>vSG#MlDuj1p|ek>DR3ob*GzIGiE88 z8d(~eXmaWM=BKzMmZU0ZxL6q(7#SNF8=4q`<+dNRW;A2cF)%PSQ!oGlg**i=FvG;q T$ifg!%*@Qf*kZb}9b+W`N+mdz delta 193 zcmbR9mu1dhmJOxy)7@DaRVL4nFPwgtm63fi-y-(O;tKqmRTh0tnw(i`upKCU&t$UG zLW9XOOO=7@>L-gX;@_;M;2b(#oR!gF^UTtf+S6677`IO6v1Zg_HC8ZC2%3J~icxpE znKfgUqKT=oiLoY^zHfetOJYf?f`*Hgk%5u1fw7^9Ay{tvL2E`cCLLo_GeZRf5Kzcd a-~uyD%neO|#-WIrSsGfJPFJ>LtONiMW;cKU diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json index 7cf00d5b6..6a7d604a8 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json @@ -1180,17 +1180,9 @@ "x": 243, "y": 300 }, - { - "x": 283, - "y": 300 - }, - { - "x": 283, - "y": 252 - }, { "x": 468, - "y": 252 + "y": 300 }, { "x": 468, diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg index 4acba330a..dfd240c40 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-3075545407 .fill-N1{fill:#0A0F25;} + .d2-3075545407 .fill-N2{fill:#676C7E;} + .d2-3075545407 .fill-N3{fill:#9499AB;} + .d2-3075545407 .fill-N4{fill:#CFD2DD;} + .d2-3075545407 .fill-N5{fill:#DEE1EB;} + .d2-3075545407 .fill-N6{fill:#EEF1F8;} + .d2-3075545407 .fill-N7{fill:#FFFFFF;} + .d2-3075545407 .fill-B1{fill:#0D32B2;} + .d2-3075545407 .fill-B2{fill:#0D32B2;} + .d2-3075545407 .fill-B3{fill:#E3E9FD;} + .d2-3075545407 .fill-B4{fill:#E3E9FD;} + .d2-3075545407 .fill-B5{fill:#EDF0FD;} + .d2-3075545407 .fill-B6{fill:#F7F8FE;} + .d2-3075545407 .fill-AA2{fill:#4A6FF3;} + .d2-3075545407 .fill-AA4{fill:#EDF0FD;} + .d2-3075545407 .fill-AA5{fill:#F7F8FE;} + .d2-3075545407 .fill-AB4{fill:#EDF0FD;} + .d2-3075545407 .fill-AB5{fill:#F7F8FE;} + .d2-3075545407 .stroke-N1{stroke:#0A0F25;} + .d2-3075545407 .stroke-N2{stroke:#676C7E;} + .d2-3075545407 .stroke-N3{stroke:#9499AB;} + .d2-3075545407 .stroke-N4{stroke:#CFD2DD;} + .d2-3075545407 .stroke-N5{stroke:#DEE1EB;} + .d2-3075545407 .stroke-N6{stroke:#EEF1F8;} + .d2-3075545407 .stroke-N7{stroke:#FFFFFF;} + .d2-3075545407 .stroke-B1{stroke:#0D32B2;} + .d2-3075545407 .stroke-B2{stroke:#0D32B2;} + .d2-3075545407 .stroke-B3{stroke:#E3E9FD;} + .d2-3075545407 .stroke-B4{stroke:#E3E9FD;} + .d2-3075545407 .stroke-B5{stroke:#EDF0FD;} + .d2-3075545407 .stroke-B6{stroke:#F7F8FE;} + .d2-3075545407 .stroke-AA2{stroke:#4A6FF3;} + .d2-3075545407 .stroke-AA4{stroke:#EDF0FD;} + .d2-3075545407 .stroke-AA5{stroke:#F7F8FE;} + .d2-3075545407 .stroke-AB4{stroke:#EDF0FD;} + .d2-3075545407 .stroke-AB5{stroke:#F7F8FE;} + .d2-3075545407 .background-color-N1{background-color:#0A0F25;} + .d2-3075545407 .background-color-N2{background-color:#676C7E;} + .d2-3075545407 .background-color-N3{background-color:#9499AB;} + .d2-3075545407 .background-color-N4{background-color:#CFD2DD;} + .d2-3075545407 .background-color-N5{background-color:#DEE1EB;} + .d2-3075545407 .background-color-N6{background-color:#EEF1F8;} + .d2-3075545407 .background-color-N7{background-color:#FFFFFF;} + .d2-3075545407 .background-color-B1{background-color:#0D32B2;} + .d2-3075545407 .background-color-B2{background-color:#0D32B2;} + .d2-3075545407 .background-color-B3{background-color:#E3E9FD;} + .d2-3075545407 .background-color-B4{background-color:#E3E9FD;} + .d2-3075545407 .background-color-B5{background-color:#EDF0FD;} + .d2-3075545407 .background-color-B6{background-color:#F7F8FE;} + .d2-3075545407 .background-color-AA2{background-color:#4A6FF3;} + .d2-3075545407 .background-color-AA4{background-color:#EDF0FD;} + .d2-3075545407 .background-color-AA5{background-color:#F7F8FE;} + .d2-3075545407 .background-color-AB4{background-color:#EDF0FD;} + .d2-3075545407 .background-color-AB5{background-color:#F7F8FE;} + .d2-3075545407 .color-N1{color:#0A0F25;} + .d2-3075545407 .color-N2{color:#676C7E;} + .d2-3075545407 .color-N3{color:#9499AB;} + .d2-3075545407 .color-N4{color:#CFD2DD;} + .d2-3075545407 .color-N5{color:#DEE1EB;} + .d2-3075545407 .color-N6{color:#EEF1F8;} + .d2-3075545407 .color-N7{color:#FFFFFF;} + .d2-3075545407 .color-B1{color:#0D32B2;} + .d2-3075545407 .color-B2{color:#0D32B2;} + .d2-3075545407 .color-B3{color:#E3E9FD;} + .d2-3075545407 .color-B4{color:#E3E9FD;} + .d2-3075545407 .color-B5{color:#EDF0FD;} + .d2-3075545407 .color-B6{color:#F7F8FE;} + .d2-3075545407 .color-AA2{color:#4A6FF3;} + .d2-3075545407 .color-AA4{color:#EDF0FD;} + .d2-3075545407 .color-AA5{color:#F7F8FE;} + .d2-3075545407 .color-AB4{color:#EDF0FD;} + .d2-3075545407 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index 77fcdb0c7..fa5d66588 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -969,14 +969,6 @@ }, { "x": 507.25, - "y": 466 - }, - { - "x": 494.25, - "y": 466 - }, - { - "x": 494.25, "y": 567 }, { diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 7c479b482..8ae645ac4 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 diff --git a/e2etests/testdata/stable/elk_shim/elk/board.exp.json b/e2etests/testdata/stable/elk_shim/elk/board.exp.json index 67e7418a6..831a7997f 100644 --- a/e2etests/testdata/stable/elk_shim/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/elk/board.exp.json @@ -736,14 +736,6 @@ }, { "x": 563, - "y": 165 - }, - { - "x": 462.5, - "y": 165 - }, - { - "x": 462.5, "y": 266 }, { diff --git a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg index 896dba4eb..c3810254b 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell toweronline portaldata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-2275158527 .fill-N1{fill:#0A0F25;} + .d2-2275158527 .fill-N2{fill:#676C7E;} + .d2-2275158527 .fill-N3{fill:#9499AB;} + .d2-2275158527 .fill-N4{fill:#CFD2DD;} + .d2-2275158527 .fill-N5{fill:#DEE1EB;} + .d2-2275158527 .fill-N6{fill:#EEF1F8;} + .d2-2275158527 .fill-N7{fill:#FFFFFF;} + .d2-2275158527 .fill-B1{fill:#0D32B2;} + .d2-2275158527 .fill-B2{fill:#0D32B2;} + .d2-2275158527 .fill-B3{fill:#E3E9FD;} + .d2-2275158527 .fill-B4{fill:#E3E9FD;} + .d2-2275158527 .fill-B5{fill:#EDF0FD;} + .d2-2275158527 .fill-B6{fill:#F7F8FE;} + .d2-2275158527 .fill-AA2{fill:#4A6FF3;} + .d2-2275158527 .fill-AA4{fill:#EDF0FD;} + .d2-2275158527 .fill-AA5{fill:#F7F8FE;} + .d2-2275158527 .fill-AB4{fill:#EDF0FD;} + .d2-2275158527 .fill-AB5{fill:#F7F8FE;} + .d2-2275158527 .stroke-N1{stroke:#0A0F25;} + .d2-2275158527 .stroke-N2{stroke:#676C7E;} + .d2-2275158527 .stroke-N3{stroke:#9499AB;} + .d2-2275158527 .stroke-N4{stroke:#CFD2DD;} + .d2-2275158527 .stroke-N5{stroke:#DEE1EB;} + .d2-2275158527 .stroke-N6{stroke:#EEF1F8;} + .d2-2275158527 .stroke-N7{stroke:#FFFFFF;} + .d2-2275158527 .stroke-B1{stroke:#0D32B2;} + .d2-2275158527 .stroke-B2{stroke:#0D32B2;} + .d2-2275158527 .stroke-B3{stroke:#E3E9FD;} + .d2-2275158527 .stroke-B4{stroke:#E3E9FD;} + .d2-2275158527 .stroke-B5{stroke:#EDF0FD;} + .d2-2275158527 .stroke-B6{stroke:#F7F8FE;} + .d2-2275158527 .stroke-AA2{stroke:#4A6FF3;} + .d2-2275158527 .stroke-AA4{stroke:#EDF0FD;} + .d2-2275158527 .stroke-AA5{stroke:#F7F8FE;} + .d2-2275158527 .stroke-AB4{stroke:#EDF0FD;} + .d2-2275158527 .stroke-AB5{stroke:#F7F8FE;} + .d2-2275158527 .background-color-N1{background-color:#0A0F25;} + .d2-2275158527 .background-color-N2{background-color:#676C7E;} + .d2-2275158527 .background-color-N3{background-color:#9499AB;} + .d2-2275158527 .background-color-N4{background-color:#CFD2DD;} + .d2-2275158527 .background-color-N5{background-color:#DEE1EB;} + .d2-2275158527 .background-color-N6{background-color:#EEF1F8;} + .d2-2275158527 .background-color-N7{background-color:#FFFFFF;} + .d2-2275158527 .background-color-B1{background-color:#0D32B2;} + .d2-2275158527 .background-color-B2{background-color:#0D32B2;} + .d2-2275158527 .background-color-B3{background-color:#E3E9FD;} + .d2-2275158527 .background-color-B4{background-color:#E3E9FD;} + .d2-2275158527 .background-color-B5{background-color:#EDF0FD;} + .d2-2275158527 .background-color-B6{background-color:#F7F8FE;} + .d2-2275158527 .background-color-AA2{background-color:#4A6FF3;} + .d2-2275158527 .background-color-AA4{background-color:#EDF0FD;} + .d2-2275158527 .background-color-AA5{background-color:#F7F8FE;} + .d2-2275158527 .background-color-AB4{background-color:#EDF0FD;} + .d2-2275158527 .background-color-AB5{background-color:#F7F8FE;} + .d2-2275158527 .color-N1{color:#0A0F25;} + .d2-2275158527 .color-N2{color:#676C7E;} + .d2-2275158527 .color-N3{color:#9499AB;} + .d2-2275158527 .color-N4{color:#CFD2DD;} + .d2-2275158527 .color-N5{color:#DEE1EB;} + .d2-2275158527 .color-N6{color:#EEF1F8;} + .d2-2275158527 .color-N7{color:#FFFFFF;} + .d2-2275158527 .color-B1{color:#0D32B2;} + .d2-2275158527 .color-B2{color:#0D32B2;} + .d2-2275158527 .color-B3{color:#E3E9FD;} + .d2-2275158527 .color-B4{color:#E3E9FD;} + .d2-2275158527 .color-B5{color:#EDF0FD;} + .d2-2275158527 .color-B6{color:#F7F8FE;} + .d2-2275158527 .color-AA2{color:#4A6FF3;} + .d2-2275158527 .color-AA4{color:#EDF0FD;} + .d2-2275158527 .color-AA5{color:#F7F8FE;} + .d2-2275158527 .color-AB4{color:#EDF0FD;} + .d2-2275158527 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>networkuserapi serverlogscell toweronline portaldata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist @@ -111,6 +111,6 @@ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index 18c1ade81..30e0ff768 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -1182,14 +1182,6 @@ }, { "x": 277.25, - "y": 309 - }, - { - "x": 235.75, - "y": 309 - }, - { - "x": 235.75, "y": 494 }, { diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg index 111f38968..916059dd7 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-795172828 .fill-N1{fill:#0A0F25;} + .d2-795172828 .fill-N2{fill:#676C7E;} + .d2-795172828 .fill-N3{fill:#9499AB;} + .d2-795172828 .fill-N4{fill:#CFD2DD;} + .d2-795172828 .fill-N5{fill:#DEE1EB;} + .d2-795172828 .fill-N6{fill:#EEF1F8;} + .d2-795172828 .fill-N7{fill:#FFFFFF;} + .d2-795172828 .fill-B1{fill:#0D32B2;} + .d2-795172828 .fill-B2{fill:#0D32B2;} + .d2-795172828 .fill-B3{fill:#E3E9FD;} + .d2-795172828 .fill-B4{fill:#E3E9FD;} + .d2-795172828 .fill-B5{fill:#EDF0FD;} + .d2-795172828 .fill-B6{fill:#F7F8FE;} + .d2-795172828 .fill-AA2{fill:#4A6FF3;} + .d2-795172828 .fill-AA4{fill:#EDF0FD;} + .d2-795172828 .fill-AA5{fill:#F7F8FE;} + .d2-795172828 .fill-AB4{fill:#EDF0FD;} + .d2-795172828 .fill-AB5{fill:#F7F8FE;} + .d2-795172828 .stroke-N1{stroke:#0A0F25;} + .d2-795172828 .stroke-N2{stroke:#676C7E;} + .d2-795172828 .stroke-N3{stroke:#9499AB;} + .d2-795172828 .stroke-N4{stroke:#CFD2DD;} + .d2-795172828 .stroke-N5{stroke:#DEE1EB;} + .d2-795172828 .stroke-N6{stroke:#EEF1F8;} + .d2-795172828 .stroke-N7{stroke:#FFFFFF;} + .d2-795172828 .stroke-B1{stroke:#0D32B2;} + .d2-795172828 .stroke-B2{stroke:#0D32B2;} + .d2-795172828 .stroke-B3{stroke:#E3E9FD;} + .d2-795172828 .stroke-B4{stroke:#E3E9FD;} + .d2-795172828 .stroke-B5{stroke:#EDF0FD;} + .d2-795172828 .stroke-B6{stroke:#F7F8FE;} + .d2-795172828 .stroke-AA2{stroke:#4A6FF3;} + .d2-795172828 .stroke-AA4{stroke:#EDF0FD;} + .d2-795172828 .stroke-AA5{stroke:#F7F8FE;} + .d2-795172828 .stroke-AB4{stroke:#EDF0FD;} + .d2-795172828 .stroke-AB5{stroke:#F7F8FE;} + .d2-795172828 .background-color-N1{background-color:#0A0F25;} + .d2-795172828 .background-color-N2{background-color:#676C7E;} + .d2-795172828 .background-color-N3{background-color:#9499AB;} + .d2-795172828 .background-color-N4{background-color:#CFD2DD;} + .d2-795172828 .background-color-N5{background-color:#DEE1EB;} + .d2-795172828 .background-color-N6{background-color:#EEF1F8;} + .d2-795172828 .background-color-N7{background-color:#FFFFFF;} + .d2-795172828 .background-color-B1{background-color:#0D32B2;} + .d2-795172828 .background-color-B2{background-color:#0D32B2;} + .d2-795172828 .background-color-B3{background-color:#E3E9FD;} + .d2-795172828 .background-color-B4{background-color:#E3E9FD;} + .d2-795172828 .background-color-B5{background-color:#EDF0FD;} + .d2-795172828 .background-color-B6{background-color:#F7F8FE;} + .d2-795172828 .background-color-AA2{background-color:#4A6FF3;} + .d2-795172828 .background-color-AA4{background-color:#EDF0FD;} + .d2-795172828 .background-color-AA5{background-color:#F7F8FE;} + .d2-795172828 .background-color-AB4{background-color:#EDF0FD;} + .d2-795172828 .background-color-AB5{background-color:#F7F8FE;} + .d2-795172828 .color-N1{color:#0A0F25;} + .d2-795172828 .color-N2{color:#676C7E;} + .d2-795172828 .color-N3{color:#9499AB;} + .d2-795172828 .color-N4{color:#CFD2DD;} + .d2-795172828 .color-N5{color:#DEE1EB;} + .d2-795172828 .color-N6{color:#EEF1F8;} + .d2-795172828 .color-N7{color:#FFFFFF;} + .d2-795172828 .color-B1{color:#0D32B2;} + .d2-795172828 .color-B2{color:#0D32B2;} + .d2-795172828 .color-B3{color:#E3E9FD;} + .d2-795172828 .color-B4{color:#E3E9FD;} + .d2-795172828 .color-B5{color:#EDF0FD;} + .d2-795172828 .color-B6{color:#F7F8FE;} + .d2-795172828 .color-AA2{color:#4A6FF3;} + .d2-795172828 .color-AA4{color:#EDF0FD;} + .d2-795172828 .color-AA5{color:#F7F8FE;} + .d2-795172828 .color-AB4{color:#EDF0FD;} + .d2-795172828 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc \ No newline at end of file