luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s-shape

Browse source
This commit is contained in:
Alexander Wang 2023-03-14 14:54:30 -07:00
parent 73c35bb14b
commit 05938bdef2
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
51 changed files with 2117 additions and 2800 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
d2layouts/d2elklayout/layout.go
View file

@ -457,6 +457,9 @@ func deleteBends(g *d2graph.Graph) {
if len(e.Route) < 4 {
continue
}
if e.Src == e.Dst {
continue
}
var endpoint *d2graph.Object
var start *geo.Point
var corner *geo.Point
@ -500,6 +503,9 @@ func deleteBends(g *d2graph.Graph) {
newStart = geo.NewPoint(end.X, start.Y)
}
endpointShape := shape.NewShape(d2target.DSL_SHAPE_TO_SHAPE_TYPE[strings.ToLower(endpoint.Attributes.Shape.Value)], endpoint.Box)
newStart = shape.TraceToShapeBorder(endpointShape, newStart, end)
// Check that the new segment doesn't collide with anything new
oldSegment := geo.NewSegment(start, corner)
@ -512,10 +518,17 @@ func deleteBends(g *d2graph.Graph) {
continue
}
oldIntersects = countEdgeIntersects(g, g.Edges[ei], *oldSegment)
newIntersects = countEdgeIntersects(g, g.Edges[ei], *newSegment)
oldCrossingsCount, oldOverlapsCount, oldCloseOverlapsCount := countEdgeIntersects(g, g.Edges[ei], *oldSegment)
newCrossingsCount, newOverlapsCount, newCloseOverlapsCount := countEdgeIntersects(g, g.Edges[ei], *newSegment)
if newIntersects > oldIntersects {
if newCrossingsCount > oldCrossingsCount {
continue
}
if newOverlapsCount > oldOverlapsCount {
continue
}
if newCloseOverlapsCount > oldCloseOverlapsCount {
continue
}
@ -546,9 +559,11 @@ func countObjectIntersects(g *d2graph.Graph, s geo.Segment) int {
}
// countEdgeIntersects counts both crossings AND getting too close to a parallel segment
func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) int {
func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) (int, int, int) {
isHorizontal := s.Start.Y == s.End.Y
count := 0
crossingsCount := 0
overlapsCount := 0
closeOverlapsCount := 0
for _, e := range g.Edges {
if e == sEdge {
continue
@ -558,16 +573,30 @@ func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) i
otherS := geo.NewSegment(e.Route[i], e.Route[i+1])
otherIsHorizontal := otherS.Start.Y == otherS.End.Y
if isHorizontal == otherIsHorizontal {
if s.Overlaps(*otherS, isHorizontal, float64(edge_node_spacing)) {
count++
if s.Overlaps(*otherS, !isHorizontal, 0.) {
if isHorizontal {
if math.Abs(s.Start.Y-otherS.Start.Y) < float64(edge_node_spacing)/2. {
overlapsCount++
if math.Abs(s.Start.Y-otherS.Start.Y) < float64(edge_node_spacing)/4. {
closeOverlapsCount++
}
}
} else {
if math.Abs(s.Start.X-otherS.Start.X) < float64(edge_node_spacing)/2. {
overlapsCount++
if math.Abs(s.Start.X-otherS.Start.X) < float64(edge_node_spacing)/4. {
closeOverlapsCount++
}
}
}
}
} else {
if s.Intersects(*otherS) {
count++
crossingsCount++
}
}
}
}
return count
return crossingsCount, overlapsCount, closeOverlapsCount
}

154
d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 235 KiB

BIN
e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf vendored
View file

Binary file not shown.

8
e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json generated vendored
View file

@ -1343,14 +1343,6 @@
},
{
"x": 596.5,
"y": 1356
},
{
"x": 585.75,
"y": 1356
},
{
"x": 585.75,
"y": 1506
}
],

164
e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 806 KiB

After

Width:  |  Height:  |  Size: 806 KiB

8
e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json generated vendored
View file

@ -283,14 +283,6 @@
},
{
"x": 88.5,
"y": 307
},
{
"x": 115,
"y": 307
},
{
"x": 115,
"y": 347
}
],

166
e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 799 KiB

After

Width:  |  Height:  |  Size: 799 KiB

20
e2etests/testdata/regression/elk_order/elk/board.exp.json generated vendored
View file

@ -598,17 +598,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 501.75,
"y": 60
},
{
"x": 501.75,
"y": 100
},
{
"x": 520.5,
"y": 100
"y": 60
},
{
"x": 520.5,
@ -646,17 +638,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 636.75,
"y": 60
},
{
"x": 636.75,
"y": 100
},
{
"x": 605.5,
"y": 100
"y": 60
},
{
"x": 605.5,

170
e2etests/testdata/regression/elk_order/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 668 KiB

After

Width:  |  Height:  |  Size: 668 KiB

40
e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json generated vendored
View file

@ -441,17 +441,9 @@
"labelPosition": "INSIDE_MIDDLE_CENTER",
"labelPercentage": 0,
"route": [
{
"x": 211,
"y": 178
},
{
"x": 211,
"y": 218
},
{
"x": 274,
"y": 218
"y": 178
},
{
"x": 274,
@ -497,17 +489,9 @@
"labelPosition": "INSIDE_MIDDLE_CENTER",
"labelPercentage": 0,
"route": [
{
"x": 410,
"y": 178
},
{
"x": 410,
"y": 319
},
{
"x": 482.3,
"y": 319
"y": 178
},
{
"x": 482.3,
@ -545,17 +529,9 @@
"labelPosition": "INSIDE_MIDDLE_CENTER",
"labelPercentage": 0,
"route": [
{
"x": 609,
"y": 178
},
{
"x": 609,
"y": 319
},
{
"x": 536.7,
"y": 319
"y": 178
},
{
"x": 536.7,
@ -593,17 +569,9 @@
"labelPosition": "INSIDE_MIDDLE_CENTER",
"labelPercentage": 0,
"route": [
{
"x": 808,
"y": 178
},
{
"x": 808,
"y": 218
},
{
"x": 735.7,
"y": 218
"y": 178
},
{
"x": 735.7,

172
e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 801 KiB

After

Width:  |  Height:  |  Size: 800 KiB

10
e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json generated vendored
View file

@ -1292,17 +1292,9 @@
"x": 333,
"y": 262
},
{
"x": 468,
"y": 262
},
{
"x": 468,
"y": 281
},
{
"x": 563,
"y": 281
"y": 262
}
],
"animated": false,

158
e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 KiB

After

Width:  |  Height:  |  Size: 663 KiB

28
e2etests/testdata/regression/unconnected/elk/board.exp.json generated vendored
View file

@ -671,17 +671,9 @@
"x": 278,
"y": 288.1875
},
{
"x": 612,
"y": 288.1875
},
{
"x": 612,
"y": 299.625
},
{
"x": 652,
"y": 299.625
"y": 288.1875
}
],
"animated": false,
@ -719,17 +711,9 @@
"x": 840,
"y": 127.5
},
{
"x": 880,
"y": 127.5
},
{
"x": 880,
"y": 102
},
{
"x": 970,
"y": 102
"y": 127.5
}
],
"animated": false,
@ -917,14 +901,6 @@
"route": [
{
"x": 1290,
"y": 169.66666666666669
},
{
"x": 1330,
"y": 169.66666666666669
},
{
"x": 1330,
"y": 164.66666666666669
},
{

170
e2etests/testdata/regression/unconnected/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 671 KiB

After

Width:  |  Height:  |  Size: 671 KiB

20
e2etests/testdata/stable/animated/elk/board.exp.json generated vendored
View file

@ -564,17 +564,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 83.83333333333337,
"y": 78
},
{
"x": 83.83333333333337,
"y": 118
},
{
"x": 56.5,
"y": 118
"y": 78
},
{
"x": 56.5,
@ -612,17 +604,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 146.16666666666663,
"y": 78
},
{
"x": 146.16666666666663,
"y": 118
},
{
"x": 186,
"y": 118
"y": 78
},
{
"x": 186,

158
e2etests/testdata/stable/animated/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 480 KiB

After

Width:  |  Height:  |  Size: 480 KiB

12
e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json generated vendored
View file

@ -395,16 +395,8 @@
"labelPercentage": 0,
"route": [
{
"x": 103,
"y": 258
},
{
"x": 103,
"y": 298
},
{
"x": 134.66666666666669,
"y": 298
"x": 135,
"y": 247
},
{
"x": 135,

158
e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 477 KiB

After

Width:  |  Height:  |  Size: 477 KiB

16
e2etests/testdata/stable/chaos2/elk/board.exp.json generated vendored
View file

@ -793,14 +793,6 @@
},
{
"x": 443.75,
"y": 567
},
{
"x": 413.5,
"y": 567
},
{
"x": 413.5,
"y": 612
}
],
@ -937,14 +929,6 @@
},
{
"x": 351.75,
"y": 270
},
{
"x": 295.25,
"y": 270
},
{
"x": 295.25,
"y": 612
}
],

180
e2etests/testdata/stable/chaos2/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 817 KiB

After

Width:  |  Height:  |  Size: 817 KiB

40
e2etests/testdata/stable/circular_dependency/elk/board.exp.json generated vendored
View file

@ -154,17 +154,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 43.16666666666667,
"y": 78
},
{
"x": 43.16666666666667,
"y": 168
},
{
"x": 38.66666666666667,
"y": 168
"y": 78
},
{
"x": 38.66666666666667,
@ -202,17 +194,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 38.66666666666667,
"y": 274
},
{
"x": 38.66666666666667,
"y": 364
},
{
"x": 43.16666666666667,
"y": 364
"y": 274
},
{
"x": 43.16666666666667,
@ -250,17 +234,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 60.833333333333336,
"y": 404
},
{
"x": 60.833333333333336,
"y": 314
},
{
"x": 65.33333333333334,
"y": 314
"y": 404
},
{
"x": 65.33333333333334,
@ -298,17 +274,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 65.33333333333334,
"y": 208
},
{
"x": 65.33333333333334,
"y": 118
},
{
"x": 60.833333333333336,
"y": 118
"y": 208
},
{
"x": 60.833333333333336,

152
e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 KiB

After

Width:  |  Height:  |  Size: 331 KiB

10
e2etests/testdata/stable/container_edges/elk/board.exp.json generated vendored
View file

@ -599,17 +599,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 157.25,
"y": 379
},
{
"x": 157.25,
"y": 424
},
{
"x": 148.5,
"y": 424
"y": 379
},
{
"x": 148.5,

158
e2etests/testdata/stable/container_edges/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 KiB

After

Width:  |  Height:  |  Size: 657 KiB

68
e2etests/testdata/stable/dense/elk/board.exp.json generated vendored
View file

@ -728,17 +728,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 181.5,
"y": 224
},
{
"x": 181.5,
"y": 264
},
{
"x": 180,
"y": 264
"y": 224
},
{
"x": 180,
@ -776,17 +768,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 108.5,
"y": 224
},
{
"x": 108.5,
"y": 264
},
{
"x": 110,
"y": 264
"y": 224
},
{
"x": 110,
@ -825,27 +809,11 @@
"labelPercentage": 0,
"route": [
{
"x": 422.75,
"x": 421,
"y": 566
},
{
"x": 422.75,
"y": 606
},
{
"x": 421,
"y": 606
},
{
"x": 421,
"y": 802
},
{
"x": 444.3333333333333,
"y": 802
},
{
"x": 444.3333333333333,
"y": 942
}
],
@ -928,17 +896,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 160,
"y": 370
},
{
"x": 160,
"y": 410
},
{
"x": 146,
"y": 410
"y": 370
},
{
"x": 146,
@ -984,17 +944,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 200,
"y": 370
},
{
"x": 200,
"y": 410
},
{
"x": 214,
"y": 410
"y": 370
},
{
"x": 214,
@ -1800,17 +1752,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 603.25,
"y": 566
},
{
"x": 603.25,
"y": 606
},
{
"x": 601.5,
"y": 606
"y": 566
},
{
"x": 601.5,

152
e2etests/testdata/stable/dense/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 KiB

After

Width:  |  Height:  |  Size: 341 KiB

10
e2etests/testdata/stable/elk_shim/elk/board.exp.json generated vendored
View file

@ -691,17 +691,9 @@
"labelPercentage": 0,
"route": [
{
"x": 373,
"x": 399,
"y": 99
},
{
"x": 372.6666666666667,
"y": 165
},
{
"x": 398.6666666666667,
"y": 165
},
{
"x": 399,
"y": 416

166
e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 806 KiB

After

Width:  |  Height:  |  Size: 805 KiB

42
e2etests/testdata/stable/investigate/elk/board.exp.json generated vendored
View file

@ -1331,15 +1331,7 @@
"y": 111
},
{
"x": 263.08333333333337,
"y": 153
},
{
"x": 297.16666666666663,
"y": 153
},
{
"x": 297,
"x": 263,
"y": 193
}
],
@ -1771,16 +1763,8 @@
"y": 2322
},
{
"x": 351.66666666666663,
"y": 2423
},
{
"x": 341.66666666666663,
"y": 2423
},
{
"x": 342,
"y": 2518
"x": 352,
"y": 2519
}
],
"animated": false,
@ -2099,15 +2083,7 @@
"y": 1567.6666666666667
},
{
"x": 221.66666666666669,
"y": 1646
},
{
"x": 202.66666666666669,
"y": 1646
},
{
"x": 203,
"x": 222,
"y": 1686
}
],
@ -2286,17 +2262,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 434.16666666666663,
"y": 2735
},
{
"x": 434.16666666666663,
"y": 2830
},
{
"x": 451.8333333333333,
"y": 2830
"y": 2735
},
{
"x": 452,

166
e2etests/testdata/stable/investigate/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 815 KiB

After

Width:  |  Height:  |  Size: 815 KiB

28
e2etests/testdata/stable/large_arch/elk/board.exp.json generated vendored
View file

@ -1768,17 +1768,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 586.4166666666665,
"y": 1443.625
},
{
"x": 586.4166666666665,
"y": 1578
},
{
"x": 589.9166666666666,
"y": 1578
"y": 1443.625
},
{
"x": 589.9166666666666,
@ -2078,14 +2070,6 @@
},
{
"x": 528,
"y": 966
},
{
"x": 503.08333333333326,
"y": 966
},
{
"x": 503.08333333333326,
"y": 1377.625
}
],
@ -2120,17 +2104,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 225,
"y": 617
},
{
"x": 225,
"y": 966
},
{
"x": 197.5,
"y": 966
"y": 617
},
{
"x": 197.4999999999999,

158
e2etests/testdata/stable/large_arch/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 668 KiB

After

Width:  |  Height:  |  Size: 667 KiB

8
e2etests/testdata/stable/latex/elk/board.exp.json generated vendored
View file

@ -280,14 +280,6 @@
},
{
"x": 294.9166666666667,
"y": 103
},
{
"x": 203,
"y": 103
},
{
"x": 203,
"y": 143
}
],

170
e2etests/testdata/stable/latex/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 511 KiB

After

Width:  |  Height:  |  Size: 511 KiB

36
e2etests/testdata/stable/mono-font/elk/board.exp.json generated vendored
View file

@ -114,27 +114,11 @@
"labelPercentage": 0,
"route": [
{
"x": 52,
"x": 44,
"y": 78
},
{
"x": 52.25,
"y": 118
},
{
"x": 44.5,
"y": 118
},
{
"x": 44.5,
"y": 219
},
{
"x": 54.75,
"y": 219
},
{
"x": 54.75,
"y": 259
}
],
@ -210,27 +194,11 @@
"labelPercentage": 0,
"route": [
{
"x": 133,
"x": 140,
"y": 78
},
{
"x": 132.75,
"y": 118
},
{
"x": 140.5,
"y": 118
},
{
"x": 140.5,
"y": 219
},
{
"x": 130.25,
"y": 219
},
{
"x": 130.25,
"y": 259
}
],

162
e2etests/testdata/stable/mono-font/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 266 KiB

After

Width:  |  Height:  |  Size: 265 KiB

16
e2etests/testdata/stable/multiple_trees/elk/board.exp.json generated vendored
View file

@ -1308,14 +1308,6 @@
},
{
"x": 106.5,
"y": 400
},
{
"x": 89.25,
"y": 400
},
{
"x": 89.25,
"y": 590
}
],
@ -1924,14 +1916,6 @@
},
{
"x": 744.5,
"y": 400
},
{
"x": 767,
"y": 400
},
{
"x": 767,
"y": 590
}
],

152
e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 342 KiB

After

Width:  |  Height:  |  Size: 342 KiB

64
e2etests/testdata/stable/n22_e32/elk/board.exp.json generated vendored
View file

@ -1628,17 +1628,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 55.33333333333337,
"y": 752
},
{
"x": 55.33333333333337,
"y": 792
},
{
"x": 38.66666666666663,
"y": 792
"y": 752
},
{
"x": 38.66666666666663,
@ -1676,17 +1668,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 88.66666666666663,
"y": 752
},
{
"x": 88.66666666666663,
"y": 842
},
{
"x": 65.33333333333337,
"y": 842
"y": 752
},
{
"x": 65.33333333333337,
@ -1738,14 +1722,6 @@
},
{
"x": 132,
"y": 1134
},
{
"x": 135.33333333333326,
"y": 1134
},
{
"x": 135.33333333333326,
"y": 1174
}
],
@ -1828,17 +1804,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 236.33333333333326,
"y": 948
},
{
"x": 236.33333333333326,
"y": 988
},
{
"x": 233,
"y": 988
"y": 948
},
{
"x": 233,
@ -1924,17 +1892,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 155.33333333333326,
"y": 752
},
{
"x": 155.33333333333326,
"y": 792
},
{
"x": 150.83333333333326,
"y": 792
"y": 752
},
{
"x": 150.83333333333326,
@ -2122,14 +2082,6 @@
},
{
"x": 366.6666666666667,
"y": 400
},
{
"x": 341.8333333333333,
"y": 400
},
{
"x": 341.8333333333333,
"y": 540
}
],
@ -2170,14 +2122,6 @@
},
{
"x": 368.49999999999994,
"y": 646
},
{
"x": 397.33333333333326,
"y": 646
},
{
"x": 397.33333333333326,
"y": 686
}
],

152
e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 KiB

After

Width:  |  Height:  |  Size: 345 KiB

38
e2etests/testdata/stable/one_container_loop/elk/board.exp.json generated vendored
View file

@ -359,17 +359,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 88.5,
"y": 128
},
{
"x": 88.5,
"y": 223
},
{
"x": 78.25,
"y": 223
"y": 128
},
{
"x": 78.25,
@ -415,17 +407,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 148.75,
"y": 651
},
{
"x": 148.75,
"y": 691
},
{
"x": 142.5,
"y": 691
"y": 651
},
{
"x": 142.5,
@ -551,17 +535,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 171.5,
"y": 178
},
{
"x": 171.5,
"y": 223
},
{
"x": 220.75,
"y": 223
"y": 178
},
{
"x": 220.75,
@ -645,14 +621,6 @@
},
{
"x": 161.5,
"y": 273
},
{
"x": 148.75,
"y": 273
},
{
"x": 148.75,
"y": 313
}
],

158
e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 KiB

After

Width:  |  Height:  |  Size: 657 KiB

18
e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json generated vendored
View file

@ -3784,17 +3784,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1513,
"y": 1396
},
{
"x": 1513,
"y": 1491
},
{
"x": 1791.5,
"y": 1491
"y": 1396
},
{
"x": 1791.5,
@ -3846,14 +3838,6 @@
},
{
"x": 2080,
"y": 1491
},
{
"x": 1801.5,
"y": 1491
},
{
"x": 1802,
"y": 1536
}
],

164
e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 830 KiB

After

Width:  |  Height:  |  Size: 829 KiB

8
e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json generated vendored
View file

@ -1294,14 +1294,6 @@
},
{
"x": 245.75,
"y": 494
},
{
"x": 261.5,
"y": 494
},
{
"x": 261.5,
"y": 589
}
],

158
e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 KiB

After

Width:  |  Height:  |  Size: 663 KiB

266
e2etests/testdata/stable/us_map/elk/board.exp.json generated vendored
View file

@ -2297,17 +2297,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1743.3333333333333,
"y": 1298
},
{
"x": 1743.3333333333333,
"y": 1338
},
{
"x": 1736.6666666666665,
"y": 1338
"y": 1298
},
{
"x": 1736.6666666666665,
@ -2583,14 +2575,6 @@
},
{
"x": 774.8333333333334,
"y": 2080
},
{
"x": 752.5000000000001,
"y": 2080
},
{
"x": 752.5000000000001,
"y": 2520
}
],
@ -2721,17 +2705,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1770,
"y": 1298
},
{
"x": 1770,
"y": 1338
},
{
"x": 1776.6666666666665,
"y": 1338
"y": 1298
},
{
"x": 1776.6666666666665,
@ -2769,17 +2745,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1720.6666666666665,
"y": 1694
},
{
"x": 1720.6666666666665,
"y": 1734
},
{
"x": 1722.6666666666665,
"y": 1734
"y": 1694
},
{
"x": 1722.6666666666665,
@ -3050,27 +3018,11 @@
"labelPercentage": 0,
"route": [
{
"x": 1562.4166666666667,
"x": 1559.1666666666667,
"y": 3182
},
{
"x": 1562.4166666666667,
"y": 3222
},
{
"x": 1559.1666666666667,
"y": 3222
},
{
"x": 1559.1666666666667,
"y": 3518
},
{
"x": 1583.7142857142858,
"y": 3518
},
{
"x": 1583.7142857142858,
"y": 3708
}
],
@ -3186,27 +3138,11 @@
"labelPercentage": 0,
"route": [
{
"x": 117.5,
"x": 116.5,
"y": 2586
},
{
"x": 117.5,
"y": 2626
},
{
"x": 116.5,
"y": 2626
},
{
"x": 116.5,
"y": 3222
},
{
"x": 117.5,
"y": 3222
},
{
"x": 117.5,
"y": 3362
}
],
@ -4055,14 +3991,6 @@
},
{
"x": 1301.1666666666667,
"y": 2280
},
{
"x": 1313.4166666666667,
"y": 2280
},
{
"x": 1313.4166666666667,
"y": 2520
}
],
@ -4103,14 +4031,6 @@
},
{
"x": 1104.3690476190477,
"y": 254
},
{
"x": 1057.702380952381,
"y": 254
},
{
"x": 1057.702380952381,
"y": 294
}
],
@ -4255,14 +4175,6 @@
},
{
"x": 1479,
"y": 550
},
{
"x": 1465.3333333333333,
"y": 550
},
{
"x": 1465.3333333333333,
"y": 836
}
],
@ -4599,14 +4511,6 @@
},
{
"x": 797,
"y": 2130
},
{
"x": 785.8333333333334,
"y": 2130
},
{
"x": 785.8333333333334,
"y": 2520
}
],
@ -4889,17 +4793,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 471.83333333333326,
"y": 656
},
{
"x": 471.83333333333326,
"y": 696
},
{
"x": 485.1666666666665,
"y": 696
"y": 656
},
{
"x": 485.1666666666665,
@ -4938,27 +4834,11 @@
"labelPercentage": 0,
"route": [
{
"x": 437.1666666666665,
"x": 430.5,
"y": 902
},
{
"x": 437.1666666666665,
"y": 942
},
{
"x": 430.5,
"y": 942
},
{
"x": 430.5,
"y": 3222
},
{
"x": 419.3690476190475,
"y": 3222
},
{
"x": 419.3690476190475,
"y": 3362
}
],
@ -5281,17 +5161,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 149.5,
"y": 2586
},
{
"x": 149.5,
"y": 3222
},
{
"x": 147.5,
"y": 3222
"y": 2586
},
{
"x": 147.5,
@ -5329,17 +5201,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 127.5,
"y": 3428
},
{
"x": 127.5,
"y": 3468
},
{
"x": 102,
"y": 3468
"y": 3428
},
{
"x": 102,
@ -5543,14 +5407,6 @@
},
{
"x": 1585.5833333333333,
"y": 1388
},
{
"x": 1558.9166666666667,
"y": 1388
},
{
"x": 1558.9166666666667,
"y": 1628
}
],
@ -5585,17 +5441,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1508.9166666666667,
"y": 1694
},
{
"x": 1508.9166666666667,
"y": 1884
},
{
"x": 1505.5833333333333,
"y": 1884
"y": 1694
},
{
"x": 1505.5833333333333,
@ -5879,14 +5727,6 @@
},
{
"x": 1492.25,
"y": 1388
},
{
"x": 1518.9166666666667,
"y": 1388
},
{
"x": 1518.9166666666667,
"y": 1628
}
],
@ -6121,17 +5961,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1784.6666666666665,
"y": 1694
},
{
"x": 1784.6666666666665,
"y": 1734
},
{
"x": 1782.6666666666665,
"y": 1734
"y": 1694
},
{
"x": 1782.6666666666665,
@ -6423,14 +6255,6 @@
},
{
"x": 452,
"y": 3272
},
{
"x": 451.3690476190475,
"y": 3272
},
{
"x": 451.3690476190475,
"y": 3362
}
],
@ -6561,17 +6385,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 167.5,
"y": 3428
},
{
"x": 167.5,
"y": 3518
},
{
"x": 132,
"y": 3518
"y": 3428
},
{
"x": 132,
@ -6697,17 +6513,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 692.3690476190477,
"y": 3182
},
{
"x": 692.3690476190477,
"y": 3222
},
{
"x": 716.3690476190476,
"y": 3222
"y": 3182
},
{
"x": 716.3690476190476,
@ -6745,17 +6553,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1568.9166666666667,
"y": 1694
},
{
"x": 1568.9166666666667,
"y": 1884
},
{
"x": 1572.25,
"y": 1884
"y": 1694
},
{
"x": 1572.25,
@ -6807,14 +6607,6 @@
},
{
"x": 368.1666666666665,
"y": 2676
},
{
"x": 357.1666666666665,
"y": 2676
},
{
"x": 357.1666666666665,
"y": 3116
}
],
@ -6945,17 +6737,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1782.6666666666665,
"y": 2040
},
{
"x": 1782.6666666666665,
"y": 2080
},
{
"x": 1777.8333333333333,
"y": 2080
"y": 2040
},
{
"x": 1777.8333333333333,
@ -6993,17 +6777,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 310.5,
"y": 3182
},
{
"x": 310.5,
"y": 3222
},
{
"x": 307.16666666666674,
"y": 3222
"y": 3182
},
{
"x": 307.16666666666674,
@ -7145,17 +6921,9 @@
"labelPosition": "",
"labelPercentage": 0,
"route": [
{
"x": 1602.4166666666667,
"y": 3182
},
{
"x": 1602.4166666666667,
"y": 3468
},
{
"x": 1618,
"y": 3468
"y": 3182
},
{
"x": 1618,

152
e2etests/testdata/stable/us_map/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 376 KiB

After

Width:  |  Height:  |  Size: 372 KiB

16
e2etests/testdata/unicode/mixed-language/elk/board.exp.json generated vendored
View file

@ -159,14 +159,6 @@
},
{
"x": 409.66666666666674,
"y": 150
},
{
"x": 236,
"y": 150
},
{
"x": 236,
"y": 190
}
],
@ -207,14 +199,6 @@
},
{
"x": 552.3333333333334,
"y": 150
},
{
"x": 726,
"y": 150
},
{
"x": 726,
"y": 190
}
],

170
e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg vendored
View file

File diff suppressed because one or more lines are too long
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 666 KiB

After

Width:  |  Height:  |  Size: 665 KiB