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

test 1

Browse source
This commit is contained in:
Mayank Mohapatra 2025-02-21 19:10:29 +00:00
parent 42c2a1f9a4
commit 6722e3f21e
5 changed files with 892 additions and 754 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
d2layouts/d2cycle/layout.go
View file

@ -30,8 +30,20 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e
radius := calculateRadius(objects) radius := calculateRadius(objects)
positionObjects(objects, radius) positionObjects(objects, radius)
// Calculate max projection for all objects to adjust the arc radius
maxProjection := 0.0
for _, obj := range objects {
center := obj.Center()
theta := math.Atan2(center.Y, center.X)
projection := (obj.Width/2)*math.Cos(theta) + (obj.Height/2)*math.Sin(theta)
if projection > maxProjection {
maxProjection = projection
}
}
arcRadius := radius + maxProjection
for _, edge := range g.Edges { for _, edge := range g.Edges {
createCircularArc(edge) createCircularArc(edge, arcRadius)
} }
return nil return nil
@ -64,7 +76,7 @@ func positionObjects(objects []*d2graph.Object, radius float64) {
} }
} }
func createCircularArc(edge *d2graph.Edge) { func createCircularArc(edge *d2graph.Edge, arcRadius float64) {
if edge.Src == nil || edge.Dst == nil { if edge.Src == nil || edge.Dst == nil {
return return
} }
@ -78,8 +90,6 @@ func createCircularArc(edge *d2graph.Edge) {
dstAngle += 2 * math.Pi dstAngle += 2 * math.Pi
} }
arcRadius := math.Hypot(srcCenter.X, srcCenter.Y)
path := make([]*geo.Point, 0, ARC_STEPS+1) path := make([]*geo.Point, 0, ARC_STEPS+1)
for i := 0; i <= ARC_STEPS; i++ { for i := 0; i <= ARC_STEPS; i++ {
t := float64(i) / float64(ARC_STEPS) t := float64(i) / float64(ARC_STEPS)

660
e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json generated vendored
View file

@ -540,100 +540,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 31.285999298095703, "x": 36.44900131225586,
"y": -197.53700256347656 "y": -230.13099670410156
}, },
{ {
"x": 41.582000732421875, "x": 48.44300079345703,
"y": -195.62899780273438 "y": -227.9080047607422
}, },
{ {
"x": 51.76300048828125, "x": 60.30400085449219,
"y": -193.18499755859375 "y": -225.05999755859375
}, },
{ {
"x": 61.803001403808594, "x": 72,
"y": -190.21099853515625 "y": -221.5959930419922
}, },
{ {
"x": 71.6729965209961, "x": 83.4990005493164,
"y": -186.71600341796875 "y": -217.5240020751953
}, },
{ {
"x": 81.34700012207031, "x": 94.76899719238281,
"y": -182.70899963378906 "y": -212.8560028076172
}, },
{ {
"x": 90.7979965209961, "x": 105.77899932861328,
"y": -178.2010040283203 "y": -207.60400390625
}, },
{ {
"x": 99.9990005493164, "x": 116.4990005493164,
"y": -173.2050018310547 "y": -201.7830047607422
}, },
{ {
"x": 108.927001953125, "x": 126.9000015258789,
"y": -167.73399353027344 "y": -195.41000366210938
}, },
{ {
"x": 117.55699920654297, "x": 136.9530029296875,
"y": -161.80299377441406 "y": -188.5
}, },
{ {
"x": 125.86399841308594, "x": 146.63099670410156,
"y": -155.4290008544922 "y": -181.0749969482422
}, },
{ {
"x": 133.8260040283203, "x": 155.90699768066406,
"y": -148.6280059814453 "y": -173.15199279785156
}, },
{ {
"x": 141.42100524902344, "x": 164.7550048828125,
"y": -141.42100524902344 "y": -164.7550048828125
}, },
{ {
"x": 148.6280059814453, "x": 173.15199279785156,
"y": -133.8260040283203 "y": -155.90699768066406
}, },
{ {
"x": 155.4290008544922, "x": 181.0749969482422,
"y": -125.86399841308594 "y": -146.63099670410156
}, },
{ {
"x": 161.80299377441406, "x": 188.5,
"y": -117.55699920654297 "y": -136.9530029296875
}, },
{ {
"x": 167.73399353027344, "x": 195.41000366210938,
"y": -108.927001953125 "y": -126.9000015258789
}, },
{ {
"x": 173.2050018310547, "x": 201.7830047607422,
"y": -100 "y": -116.5
}, },
{ {
"x": 178.2010040283203, "x": 207.60400390625,
"y": -90.7979965209961 "y": -105.77899932861328
}, },
{ {
"x": 182.70899963378906, "x": 212.8560028076172,
"y": -81.34700012207031 "y": -94.76899719238281
}, },
{ {
"x": 186.71600341796875, "x": 217.5240020751953,
"y": -71.6729965209961 "y": -83.4990005493164
}, },
{ {
"x": 190.21099853515625, "x": 221.5959930419922,
"y": -61.803001403808594 "y": -72
}, },
{ {
"x": 193.18499755859375, "x": 225.05999755859375,
"y": -51.76300048828125 "y": -60.30400085449219
}, },
{ {
"x": 195.62899780273438, "x": 227.9080047607422,
"y": -41.582000732421875 "y": -48.44300079345703
},
{
"x": 230.13099670410156,
"y": -36.44900131225586
},
{
"x": 231.72300720214844,
"y": -24.354999542236328
},
{
"x": 232.67999267578125,
"y": -12.194000244140625
} }
], ],
"isCurve": true, "isCurve": true,
@ -668,100 +680,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 195.62899780273438, "x": 232.67999267578125,
"y": 41.582000732421875 "y": 12.194000244140625
}, },
{ {
"x": 193.18499755859375, "x": 231.72300720214844,
"y": 51.76300048828125 "y": 24.354999542236328
}, },
{ {
"x": 190.21099853515625, "x": 230.13099670410156,
"y": 61.803001403808594 "y": 36.44900131225586
}, },
{ {
"x": 186.71600341796875, "x": 227.9080047607422,
"y": 71.6729965209961 "y": 48.44300079345703
}, },
{ {
"x": 182.70899963378906, "x": 225.05999755859375,
"y": 81.34700012207031 "y": 60.30400085449219
}, },
{ {
"x": 178.2010040283203, "x": 221.5959930419922,
"y": 90.7979965209961 "y": 72
}, },
{ {
"x": 173.2050018310547, "x": 217.5240020751953,
"y": 99.9990005493164 "y": 83.4990005493164
}, },
{ {
"x": 167.73399353027344, "x": 212.8560028076172,
"y": 108.927001953125 "y": 94.76899719238281
}, },
{ {
"x": 161.80299377441406, "x": 207.60400390625,
"y": 117.55699920654297 "y": 105.77899932861328
}, },
{ {
"x": 155.4290008544922, "x": 201.7830047607422,
"y": 125.86399841308594 "y": 116.4990005493164
}, },
{ {
"x": 148.6280059814453, "x": 195.41000366210938,
"y": 133.8260040283203 "y": 126.9000015258789
}, },
{ {
"x": 141.42100524902344, "x": 188.5,
"y": 141.42100524902344 "y": 136.9530029296875
}, },
{ {
"x": 133.8260040283203, "x": 181.0749969482422,
"y": 148.6280059814453 "y": 146.63099670410156
}, },
{ {
"x": 125.86399841308594, "x": 173.15199279785156,
"y": 155.4290008544922 "y": 155.90699768066406
}, },
{ {
"x": 117.55699920654297, "x": 164.7550048828125,
"y": 161.80299377441406 "y": 164.7550048828125
}, },
{ {
"x": 108.927001953125, "x": 155.90699768066406,
"y": 167.73399353027344 "y": 173.15199279785156
}, },
{ {
"x": 100, "x": 146.63099670410156,
"y": 173.2050018310547 "y": 181.0749969482422
}, },
{ {
"x": 90.7979965209961, "x": 136.9530029296875,
"y": 178.2010040283203 "y": 188.5
}, },
{ {
"x": 81.34700012207031, "x": 126.9000015258789,
"y": 182.70899963378906 "y": 195.41000366210938
}, },
{ {
"x": 71.6729965209961, "x": 116.5,
"y": 186.71600341796875 "y": 201.7830047607422
}, },
{ {
"x": 61.803001403808594, "x": 105.77899932861328,
"y": 190.21099853515625 "y": 207.60400390625
}, },
{ {
"x": 51.76300048828125, "x": 94.76899719238281,
"y": 193.18499755859375 "y": 212.8560028076172
}, },
{ {
"x": 41.582000732421875, "x": 83.4990005493164,
"y": 195.62899780273438 "y": 217.5240020751953
}, },
{ {
"x": 31.285999298095703, "x": 72,
"y": 197.53700256347656 "y": 221.5959930419922
},
{
"x": 60.30400085449219,
"y": 225.05999755859375
},
{
"x": 48.44300079345703,
"y": 227.9080047607422
},
{
"x": 36.44900131225586,
"y": 230.13099670410156
} }
], ],
"isCurve": true, "isCurve": true,
@ -796,100 +820,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": -31.285999298095703, "x": -36.44900131225586,
"y": 197.53700256347656 "y": 230.13099670410156
}, },
{ {
"x": -41.582000732421875, "x": -48.44300079345703,
"y": 195.62899780273438 "y": 227.9080047607422
}, },
{ {
"x": -51.76300048828125, "x": -60.30400085449219,
"y": 193.18499755859375 "y": 225.05999755859375
}, },
{ {
"x": -61.803001403808594, "x": -72,
"y": 190.21099853515625 "y": 221.5959930419922
}, },
{ {
"x": -71.6729965209961, "x": -83.4990005493164,
"y": 186.71600341796875 "y": 217.5240020751953
}, },
{ {
"x": -81.34700012207031, "x": -94.76899719238281,
"y": 182.70899963378906 "y": 212.8560028076172
}, },
{ {
"x": -90.7979965209961, "x": -105.77899932861328,
"y": 178.2010040283203 "y": 207.60400390625
}, },
{ {
"x": -99.9990005493164, "x": -116.4990005493164,
"y": 173.2050018310547 "y": 201.7830047607422
}, },
{ {
"x": -108.927001953125, "x": -126.9000015258789,
"y": 167.73399353027344 "y": 195.41000366210938
}, },
{ {
"x": -117.55699920654297, "x": -136.9530029296875,
"y": 161.80299377441406 "y": 188.5
}, },
{ {
"x": -125.86399841308594, "x": -146.63099670410156,
"y": 155.4290008544922 "y": 181.0749969482422
}, },
{ {
"x": -133.8260040283203, "x": -155.90699768066406,
"y": 148.6280059814453 "y": 173.15199279785156
}, },
{ {
"x": -141.42100524902344, "x": -164.7550048828125,
"y": 141.42100524902344 "y": 164.7550048828125
}, },
{ {
"x": -148.6280059814453, "x": -173.15199279785156,
"y": 133.8260040283203 "y": 155.90699768066406
}, },
{ {
"x": -155.4290008544922, "x": -181.0749969482422,
"y": 125.86399841308594 "y": 146.63099670410156
}, },
{ {
"x": -161.80299377441406, "x": -188.5,
"y": 117.55699920654297 "y": 136.9530029296875
}, },
{ {
"x": -167.73399353027344, "x": -195.41000366210938,
"y": 108.927001953125 "y": 126.9000015258789
}, },
{ {
"x": -173.2050018310547, "x": -201.7830047607422,
"y": 100 "y": 116.5
}, },
{ {
"x": -178.2010040283203, "x": -207.60400390625,
"y": 90.7979965209961 "y": 105.77899932861328
}, },
{ {
"x": -182.70899963378906, "x": -212.8560028076172,
"y": 81.34700012207031 "y": 94.76899719238281
}, },
{ {
"x": -186.71600341796875, "x": -217.5240020751953,
"y": 71.6729965209961 "y": 83.4990005493164
}, },
{ {
"x": -190.21099853515625, "x": -221.5959930419922,
"y": 61.803001403808594 "y": 72
}, },
{ {
"x": -193.18499755859375, "x": -225.05999755859375,
"y": 51.76300048828125 "y": 60.30400085449219
}, },
{ {
"x": -195.62899780273438, "x": -227.9080047607422,
"y": 41.582000732421875 "y": 48.44300079345703
},
{
"x": -230.13099670410156,
"y": 36.44900131225586
},
{
"x": -231.72300720214844,
"y": 24.354999542236328
},
{
"x": -232.67999267578125,
"y": 12.194000244140625
} }
], ],
"isCurve": true, "isCurve": true,
@ -924,108 +960,120 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 540.833984375, "x": 529.7030029296875,
"y": -148.05299377441406 "y": -188.86599731445312
}, },
{ {
"x": 554.5819702148438, "x": 546.323974609375,
"y": -145.62899780273438 "y": -187.11900329589844
}, },
{ {
"x": 568.1270141601562, "x": 562.7839965820312,
"y": -142.2519989013672 "y": -184.2169952392578
}, },
{ {
"x": 581.4039916992188, "x": 579.0009765625,
"y": -137.93800354003906 "y": -180.17300415039062
}, },
{ {
"x": 594.3469848632812, "x": 594.89599609375,
"y": -132.70899963378906 "y": -175.00900268554688
}, },
{ {
"x": 606.8939819335938, "x": 610.3920288085938,
"y": -126.58899688720703 "y": -168.7480010986328
}, },
{ {
"x": 618.9829711914062, "x": 625.4140014648438,
"y": -119.60900115966797 "y": -161.42100524902344
}, },
{ {
"x": 630.5570068359375, "x": 639.8880004882812,
"y": -111.8030014038086 "y": -153.06399536132812
}, },
{ {
"x": 641.5570068359375, "x": 653.7440185546875,
"y": -103.20800018310547 "y": -143.71800231933594
}, },
{ {
"x": 651.9310302734375, "x": 666.9149780273438,
"y": -93.86699676513672 "y": -133.4290008544922
}, },
{ {
"x": 661.6279907226562, "x": 679.3350219726562,
"y": -83.82599639892578 "y": -122.24500274658203
}, },
{ {
"x": 670.6019897460938, "x": 690.9450073242188,
"y": -73.13200378417969 "y": -110.2229995727539
}, },
{ {
"x": 678.8070068359375, "x": 701.68798828125,
"y": -61.8380012512207 "y": -97.41899871826172
}, },
{ {
"x": 686.2050170898438, "x": 711.5120239257812,
"y": -50 "y": -83.89800262451172
}, },
{ {
"x": 692.7579956054688, "x": 720.3690185546875,
"y": -37.67399978637695 "y": -69.7239990234375
}, },
{ {
"x": 698.4359741210938, "x": 728.2150268554688,
"y": -24.92099952697754 "y": -54.96699905395508
}, },
{ {
"x": 703.2109985351562, "x": 735.0130004882812,
"y": -11.803000450134277 "y": -39.69900131225586
}, },
{ {
"x": 707.0590209960938, "x": 740.72998046875,
"y": 1.6150000095367432 "y": -23.993999481201172
}, },
{ {
"x": 709.9609985351562, "x": 745.3359985351562,
"y": 15.270000457763672 "y": -7.927999973297119
}, },
{ {
"x": 711.9039916992188, "x": 748.8109741210938,
"y": 29.0939998626709 "y": 8.420000076293945
}, },
{ {
"x": 712.8779907226562, "x": 751.1370239257812,
"y": 43.02000045776367 "y": 24.969999313354492
}, },
{ {
"x": 712.8779907226562, "x": 752.302978515625,
"y": 56.979000091552734 "y": 41.643001556396484
}, },
{ {
"x": 711.9039916992188, "x": 752.302978515625,
"y": 70.90499877929688 "y": 58.35599899291992
}, },
{ {
"x": 709.9609985351562, "x": 751.1370239257812,
"y": 84.72899627685547 "y": 75.02899932861328
}, },
{ {
"x": 707.0590209960938, "x": 748.8109741210938,
"y": 98.38400268554688 "y": 91.5790023803711
}, },
{ {
"x": 703.2109985351562, "x": 745.3359985351562,
"y": 111.8030014038086 "y": 107.9280014038086
},
{
"x": 740.72998046875,
"y": 123.99400329589844
},
{
"x": 735.0130004882812,
"y": 139.69900512695312
},
{
"x": 728.2150268554688,
"y": 154.9669952392578
} }
], ],
"isCurve": true, "isCurve": true,
@ -1060,104 +1108,120 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 661.6279907226562, "x": 711.5120239257812,
"y": 183.8260040283203 "y": 183.8979949951172
}, },
{ {
"x": 651.9310302734375, "x": 701.68798828125,
"y": 193.86700439453125 "y": 197.41900634765625
}, },
{ {
"x": 641.5570068359375, "x": 690.9450073242188,
"y": 203.20799255371094 "y": 210.22300720214844
}, },
{ {
"x": 630.5570068359375, "x": 679.3350219726562,
"y": 211.80299377441406 "y": 222.2449951171875
}, },
{ {
"x": 618.9829711914062, "x": 666.9149780273438,
"y": 219.60899353027344 "y": 233.4290008544922
}, },
{ {
"x": 606.8939819335938, "x": 653.7440185546875,
"y": 226.58900451660156 "y": 243.71800231933594
}, },
{ {
"x": 594.3469848632812, "x": 639.8880004882812,
"y": 232.70899963378906 "y": 253.06399536132812
}, },
{ {
"x": 581.4039916992188, "x": 625.4140014648438,
"y": 237.93800354003906 "y": 261.4209899902344
}, },
{ {
"x": 568.1270141601562, "x": 610.3920288085938,
"y": 242.2519989013672 "y": 268.74798583984375
}, },
{ {
"x": 554.5819702148438, "x": 594.89599609375,
"y": 245.62899780273438 "y": 275.0090026855469
}, },
{ {
"x": 540.833984375, "x": 579.0009765625,
"y": 248.05299377441406 "y": 280.1730041503906
}, },
{ {
"x": 526.9509887695312, "x": 562.7839965820312,
"y": 249.51199340820312 "y": 284.2170104980469
},
{
"x": 546.323974609375,
"y": 287.1189880371094
},
{
"x": 529.7030029296875,
"y": 288.8659973144531
}, },
{ {
"x": 513, "x": 513,
"y": 250 "y": 289.4490051269531
}, },
{ {
"x": 499.0480041503906, "x": 496.2959899902344,
"y": 249.51199340820312 "y": 288.8659973144531
}, },
{ {
"x": 485.1650085449219, "x": 479.67498779296875,
"y": 248.05299377441406 "y": 287.1189880371094
}, },
{ {
"x": 471.4169921875, "x": 463.2149963378906,
"y": 245.62899780273438 "y": 284.2170104980469
}, },
{ {
"x": 457.87200927734375, "x": 446.99798583984375,
"y": 242.2519989013672 "y": 280.1730041503906
}, },
{ {
"x": 444.5950012207031, "x": 431.1029968261719,
"y": 237.93800354003906 "y": 275.0090026855469
}, },
{ {
"x": 431.6520080566406, "x": 415.60699462890625,
"y": 232.70899963378906 "y": 268.74798583984375
}, },
{ {
"x": 419.1050109863281, "x": 400.5849914550781,
"y": 226.58900451660156 "y": 261.4209899902344
}, },
{ {
"x": 407.0159912109375, "x": 386.1109924316406,
"y": 219.60899353027344 "y": 253.06399536132812
}, },
{ {
"x": 395.4419860839844, "x": 372.2550048828125,
"y": 211.80299377441406 "y": 243.71800231933594
}, },
{ {
"x": 384.4419860839844, "x": 359.0840148925781,
"y": 203.20799255371094 "y": 233.4290008544922
}, },
{ {
"x": 374.0679931640625, "x": 346.66400146484375,
"y": 193.86700439453125 "y": 222.2449951171875
}, },
{ {
"x": 364.3710021972656, "x": 335.0539855957031,
"y": 183.8260040283203 "y": 210.22300720214844
},
{
"x": 324.3110046386719,
"y": 197.41900634765625
},
{
"x": 314.48699951171875,
"y": 183.8979949951172
} }
], ],
"isCurve": true, "isCurve": true,
@ -1192,112 +1256,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 1013.5819702148438, "x": 1020.4429931640625,
"y": -195.62899780273438 "y": -227.9080047607422
}, },
{ {
"x": 1033.802978515625, "x": 1044,
"y": -190.21099853515625 "y": -221.5959930419922
}, },
{ {
"x": 1053.3470458984375, "x": 1066.76904296875,
"y": -182.70899963378906 "y": -212.8560028076172
}, },
{ {
"x": 1072, "x": 1088.5,
"y": -173.2050018310547 "y": -201.7830047607422
}, },
{ {
"x": 1089.5570068359375, "x": 1108.9530029296875,
"y": -161.80299377441406 "y": -188.5
}, },
{ {
"x": 1105.8260498046875, "x": 1127.906982421875,
"y": -148.6280059814453 "y": -173.15199279785156
}, },
{ {
"x": 1120.6280517578125, "x": 1145.1519775390625,
"y": -133.8260040283203 "y": -155.90699768066406
}, },
{ {
"x": 1133.802978515625, "x": 1160.5,
"y": -117.55699920654297 "y": -136.9530029296875
}, },
{ {
"x": 1145.2049560546875, "x": 1173.782958984375,
"y": -100 "y": -116.5
}, },
{ {
"x": 1154.708984375, "x": 1184.85595703125,
"y": -81.34700012207031 "y": -94.76899719238281
}, },
{ {
"x": 1162.2110595703125, "x": 1193.595947265625,
"y": -61.803001403808594 "y": -72
}, },
{ {
"x": 1167.6290283203125, "x": 1199.907958984375,
"y": -41.582000732421875 "y": -48.44300079345703
}, },
{ {
"x": 1170.904052734375, "x": 1203.7230224609375,
"y": -20.905000686645508 "y": -24.354999542236328
}, },
{ {
"x": 1172, "x": 1205,
"y": 0 "y": 0
}, },
{ {
"x": 1170.904052734375, "x": 1203.7230224609375,
"y": 20.905000686645508 "y": 24.354999542236328
}, },
{ {
"x": 1167.6290283203125, "x": 1199.907958984375,
"y": 41.582000732421875 "y": 48.44300079345703
}, },
{ {
"x": 1162.2110595703125, "x": 1193.595947265625,
"y": 61.803001403808594 "y": 72
}, },
{ {
"x": 1154.708984375, "x": 1184.85595703125,
"y": 81.34700012207031 "y": 94.76899719238281
}, },
{ {
"x": 1145.2049560546875, "x": 1173.782958984375,
"y": 99.9990005493164 "y": 116.4990005493164
}, },
{ {
"x": 1133.802978515625, "x": 1160.5,
"y": 117.55699920654297 "y": 136.9530029296875
}, },
{ {
"x": 1120.6280517578125, "x": 1145.1519775390625,
"y": 133.8260040283203 "y": 155.90699768066406
}, },
{ {
"x": 1105.8260498046875, "x": 1127.906982421875,
"y": 148.6280059814453 "y": 173.15199279785156
}, },
{ {
"x": 1089.5570068359375, "x": 1108.9530029296875,
"y": 161.80299377441406 "y": 188.5
}, },
{ {
"x": 1072, "x": 1088.5,
"y": 173.2050018310547 "y": 201.7830047607422
}, },
{ {
"x": 1053.3470458984375, "x": 1066.76904296875,
"y": 182.70899963378906 "y": 212.8560028076172
}, },
{ {
"x": 1033.802978515625, "x": 1044,
"y": 190.21099853515625 "y": 221.5959930419922
}, },
{ {
"x": 1013.5819702148438, "x": 1020.4429931640625,
"y": 195.62899780273438 "y": 227.9080047607422
} }
], ],
"isCurve": true, "isCurve": true,

154
e2etests/testdata/txtar/cycle-diagram/dagre/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: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

660
e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json generated vendored
View file

@ -540,100 +540,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 43.2859992980957, "x": 48.44900131225586,
"y": -185.53700256347656 "y": -218.13099670410156
}, },
{ {
"x": 53.582000732421875, "x": 60.44300079345703,
"y": -183.62899780273438 "y": -215.9080047607422
}, },
{ {
"x": 63.76300048828125, "x": 72.30400085449219,
"y": -181.18499755859375 "y": -213.05999755859375
}, },
{ {
"x": 73.8030014038086, "x": 84,
"y": -178.21099853515625 "y": -209.5959930419922
}, },
{ {
"x": 83.6729965209961, "x": 95.4990005493164,
"y": -174.71600341796875 "y": -205.5240020751953
}, },
{ {
"x": 93.34700012207031, "x": 106.76899719238281,
"y": -170.70899963378906 "y": -200.8560028076172
}, },
{ {
"x": 102.7979965209961, "x": 117.77899932861328,
"y": -166.2010040283203 "y": -195.60400390625
}, },
{ {
"x": 111.9990005493164, "x": 128.5,
"y": -161.2050018310547 "y": -189.7830047607422
}, },
{ {
"x": 120.927001953125, "x": 138.89999389648438,
"y": -155.73399353027344 "y": -183.41000366210938
}, },
{ {
"x": 129.5570068359375, "x": 148.9530029296875,
"y": -149.80299377441406 "y": -176.5
}, },
{ {
"x": 137.86399841308594, "x": 158.63099670410156,
"y": -143.4290008544922 "y": -169.0749969482422
}, },
{ {
"x": 145.8260040283203, "x": 167.90699768066406,
"y": -136.6280059814453 "y": -161.15199279785156
}, },
{ {
"x": 153.42100524902344, "x": 176.7550048828125,
"y": -129.42100524902344 "y": -152.7550048828125
}, },
{ {
"x": 160.6280059814453, "x": 185.15199279785156,
"y": -121.82599639892578 "y": -143.90699768066406
}, },
{ {
"x": 167.4290008544922, "x": 193.0749969482422,
"y": -113.86399841308594 "y": -134.63099670410156
}, },
{ {
"x": 173.80299377441406, "x": 200.5,
"y": -105.55699920654297 "y": -124.9530029296875
}, },
{ {
"x": 179.73399353027344, "x": 207.41000366210938,
"y": -96.927001953125 "y": -114.9000015258789
}, },
{ {
"x": 185.2050018310547, "x": 213.7830047607422,
"y": -88 "y": -104.5
}, },
{ {
"x": 190.2010040283203, "x": 219.60400390625,
"y": -78.7979965209961 "y": -93.77899932861328
}, },
{ {
"x": 194.70899963378906, "x": 224.8560028076172,
"y": -69.34700012207031 "y": -82.76899719238281
}, },
{ {
"x": 198.71600341796875, "x": 229.5240020751953,
"y": -59.67300033569336 "y": -71.4990005493164
}, },
{ {
"x": 202.21099853515625, "x": 233.5959930419922,
"y": -49.803001403808594 "y": -60
}, },
{ {
"x": 205.18499755859375, "x": 237.05999755859375,
"y": -39.76300048828125 "y": -48.30400085449219
}, },
{ {
"x": 207.62899780273438, "x": 239.9080047607422,
"y": -29.582000732421875 "y": -36.44300079345703
},
{
"x": 242.13099670410156,
"y": -24.448999404907227
},
{
"x": 243.72300720214844,
"y": -12.354999542236328
},
{
"x": 244.67999267578125,
"y": -0.1940000057220459
} }
], ],
"isCurve": true, "isCurve": true,
@ -668,100 +680,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 207.62899780273438, "x": 244.67999267578125,
"y": 53.582000732421875 "y": 24.194000244140625
}, },
{ {
"x": 205.18499755859375, "x": 243.72300720214844,
"y": 63.76300048828125 "y": 36.35499954223633
}, },
{ {
"x": 202.21099853515625, "x": 242.13099670410156,
"y": 73.8030014038086 "y": 48.44900131225586
}, },
{ {
"x": 198.71600341796875, "x": 239.9080047607422,
"y": 83.6729965209961 "y": 60.44300079345703
}, },
{ {
"x": 194.70899963378906, "x": 237.05999755859375,
"y": 93.34700012207031 "y": 72.30400085449219
}, },
{ {
"x": 190.2010040283203, "x": 233.5959930419922,
"y": 102.7979965209961 "y": 84
}, },
{ {
"x": 185.2050018310547, "x": 229.5240020751953,
"y": 111.9990005493164 "y": 95.4990005493164
}, },
{ {
"x": 179.73399353027344, "x": 224.8560028076172,
"y": 120.927001953125 "y": 106.76899719238281
}, },
{ {
"x": 173.80299377441406, "x": 219.60400390625,
"y": 129.5570068359375 "y": 117.77899932861328
}, },
{ {
"x": 167.4290008544922, "x": 213.7830047607422,
"y": 137.86399841308594 "y": 128.5
}, },
{ {
"x": 160.6280059814453, "x": 207.41000366210938,
"y": 145.8260040283203 "y": 138.89999389648438
}, },
{ {
"x": 153.42100524902344, "x": 200.5,
"y": 153.42100524902344 "y": 148.9530029296875
}, },
{ {
"x": 145.8260040283203, "x": 193.0749969482422,
"y": 160.6280059814453 "y": 158.63099670410156
}, },
{ {
"x": 137.86399841308594, "x": 185.15199279785156,
"y": 167.4290008544922 "y": 167.90699768066406
}, },
{ {
"x": 129.5570068359375, "x": 176.7550048828125,
"y": 173.80299377441406 "y": 176.7550048828125
}, },
{ {
"x": 120.927001953125, "x": 167.90699768066406,
"y": 179.73399353027344 "y": 185.15199279785156
}, },
{ {
"x": 112, "x": 158.63099670410156,
"y": 185.2050018310547 "y": 193.0749969482422
}, },
{ {
"x": 102.7979965209961, "x": 148.9530029296875,
"y": 190.2010040283203 "y": 200.5
}, },
{ {
"x": 93.34700012207031, "x": 138.89999389648438,
"y": 194.70899963378906 "y": 207.41000366210938
}, },
{ {
"x": 83.6729965209961, "x": 128.5,
"y": 198.71600341796875 "y": 213.7830047607422
}, },
{ {
"x": 73.8030014038086, "x": 117.77899932861328,
"y": 202.21099853515625 "y": 219.60400390625
}, },
{ {
"x": 63.76300048828125, "x": 106.76899719238281,
"y": 205.18499755859375 "y": 224.8560028076172
}, },
{ {
"x": 53.582000732421875, "x": 95.4990005493164,
"y": 207.62899780273438 "y": 229.5240020751953
}, },
{ {
"x": 43.2859992980957, "x": 84,
"y": 209.53700256347656 "y": 233.5959930419922
},
{
"x": 72.30400085449219,
"y": 237.05999755859375
},
{
"x": 60.44300079345703,
"y": 239.9080047607422
},
{
"x": 48.44900131225586,
"y": 242.13099670410156
} }
], ],
"isCurve": true, "isCurve": true,
@ -796,100 +820,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": -19.285999298095703, "x": -24.448999404907227,
"y": 209.53700256347656 "y": 242.13099670410156
}, },
{ {
"x": -29.582000732421875, "x": -36.44300079345703,
"y": 207.62899780273438 "y": 239.9080047607422
}, },
{ {
"x": -39.76300048828125, "x": -48.30400085449219,
"y": 205.18499755859375 "y": 237.05999755859375
}, },
{ {
"x": -49.803001403808594, "x": -60,
"y": 202.21099853515625 "y": 233.5959930419922
}, },
{ {
"x": -59.67300033569336, "x": -71.4990005493164,
"y": 198.71600341796875 "y": 229.5240020751953
}, },
{ {
"x": -69.34700012207031, "x": -82.76899719238281,
"y": 194.70899963378906 "y": 224.8560028076172
}, },
{ {
"x": -78.7979965209961, "x": -93.77899932861328,
"y": 190.2010040283203 "y": 219.60400390625
}, },
{ {
"x": -87.9990005493164, "x": -104.4990005493164,
"y": 185.2050018310547 "y": 213.7830047607422
}, },
{ {
"x": -96.927001953125, "x": -114.9000015258789,
"y": 179.73399353027344 "y": 207.41000366210938
}, },
{ {
"x": -105.55699920654297, "x": -124.9530029296875,
"y": 173.80299377441406 "y": 200.5
}, },
{ {
"x": -113.86399841308594, "x": -134.63099670410156,
"y": 167.4290008544922 "y": 193.0749969482422
}, },
{ {
"x": -121.82599639892578, "x": -143.90699768066406,
"y": 160.6280059814453 "y": 185.15199279785156
}, },
{ {
"x": -129.42100524902344, "x": -152.7550048828125,
"y": 153.42100524902344 "y": 176.7550048828125
}, },
{ {
"x": -136.6280059814453, "x": -161.15199279785156,
"y": 145.8260040283203 "y": 167.90699768066406
}, },
{ {
"x": -143.4290008544922, "x": -169.0749969482422,
"y": 137.86399841308594 "y": 158.63099670410156
}, },
{ {
"x": -149.80299377441406, "x": -176.5,
"y": 129.5570068359375 "y": 148.9530029296875
}, },
{ {
"x": -155.73399353027344, "x": -183.41000366210938,
"y": 120.927001953125 "y": 138.89999389648438
}, },
{ {
"x": -161.2050018310547, "x": -189.7830047607422,
"y": 112 "y": 128.5
}, },
{ {
"x": -166.2010040283203, "x": -195.60400390625,
"y": 102.7979965209961 "y": 117.77899932861328
}, },
{ {
"x": -170.70899963378906, "x": -200.8560028076172,
"y": 93.34700012207031 "y": 106.76899719238281
}, },
{ {
"x": -174.71600341796875, "x": -205.5240020751953,
"y": 83.6729965209961 "y": 95.4990005493164
}, },
{ {
"x": -178.21099853515625, "x": -209.5959930419922,
"y": 73.8030014038086 "y": 84
}, },
{ {
"x": -181.18499755859375, "x": -213.05999755859375,
"y": 63.76300048828125 "y": 72.30400085449219
}, },
{ {
"x": -183.62899780273438, "x": -215.9080047607422,
"y": 53.582000732421875 "y": 60.44300079345703
},
{
"x": -218.13099670410156,
"y": 48.44900131225586
},
{
"x": -219.72300720214844,
"y": 36.35499954223633
},
{
"x": -220.67999267578125,
"y": 24.194000244140625
} }
], ],
"isCurve": true, "isCurve": true,
@ -924,108 +960,120 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 513.333984375, "x": 502.2030029296875,
"y": -136.05299377441406 "y": -176.86599731445312
}, },
{ {
"x": 527.0819702148438, "x": 518.823974609375,
"y": -133.62899780273438 "y": -175.11900329589844
}, },
{ {
"x": 540.6270141601562, "x": 535.2839965820312,
"y": -130.2519989013672 "y": -172.2169952392578
}, },
{ {
"x": 553.9039916992188, "x": 551.5009765625,
"y": -125.93800354003906 "y": -168.17300415039062
}, },
{ {
"x": 566.8469848632812, "x": 567.39599609375,
"y": -120.70899963378906 "y": -163.00900268554688
}, },
{ {
"x": 579.3939819335938, "x": 582.8920288085938,
"y": -114.58899688720703 "y": -156.7480010986328
}, },
{ {
"x": 591.4829711914062, "x": 597.9140014648438,
"y": -107.60900115966797 "y": -149.42100524902344
}, },
{ {
"x": 603.0570068359375, "x": 612.3880004882812,
"y": -99.8030014038086 "y": -141.06399536132812
}, },
{ {
"x": 614.0570068359375, "x": 626.2440185546875,
"y": -91.20800018310547 "y": -131.71800231933594
}, },
{ {
"x": 624.4310302734375, "x": 639.4149780273438,
"y": -81.86699676513672 "y": -121.42900085449219
}, },
{ {
"x": 634.1279907226562, "x": 651.8350219726562,
"y": -71.82599639892578 "y": -110.24500274658203
}, },
{ {
"x": 643.1019897460938, "x": 663.4450073242188,
"y": -61.13199996948242 "y": -98.2229995727539
}, },
{ {
"x": 651.3070068359375, "x": 674.18798828125,
"y": -49.8380012512207 "y": -85.41899871826172
}, },
{ {
"x": 658.7050170898438, "x": 684.0120239257812,
"y": -38 "y": -71.89800262451172
}, },
{ {
"x": 665.2579956054688, "x": 692.8690185546875,
"y": -25.673999786376953 "y": -57.7239990234375
}, },
{ {
"x": 670.9359741210938, "x": 700.7150268554688,
"y": -12.920999526977539 "y": -42.96699905395508
}, },
{ {
"x": 675.7109985351562, "x": 707.5130004882812,
"y": 0.19599999487400055 "y": -27.698999404907227
}, },
{ {
"x": 679.5590209960938, "x": 713.22998046875,
"y": 13.614999771118164 "y": -11.994000434875488
}, },
{ {
"x": 682.4609985351562, "x": 717.8359985351562,
"y": 27.270000457763672 "y": 4.071000099182129
}, },
{ {
"x": 684.4039916992188, "x": 721.3109741210938,
"y": 41.09400177001953 "y": 20.420000076293945
}, },
{ {
"x": 685.3779907226562, "x": 723.6370239257812,
"y": 55.02000045776367 "y": 36.970001220703125
}, },
{ {
"x": 685.3779907226562, "x": 724.802978515625,
"y": 68.97899627685547 "y": 53.643001556396484
}, },
{ {
"x": 684.4039916992188, "x": 724.802978515625,
"y": 82.90499877929688 "y": 70.35600280761719
}, },
{ {
"x": 682.4609985351562, "x": 723.6370239257812,
"y": 96.72899627685547 "y": 87.02899932861328
}, },
{ {
"x": 679.5590209960938, "x": 721.3109741210938,
"y": 110.38400268554688 "y": 103.5790023803711
}, },
{ {
"x": 675.7109985351562, "x": 717.8359985351562,
"y": 123.8030014038086 "y": 119.9280014038086
},
{
"x": 713.22998046875,
"y": 135.99400329589844
},
{
"x": 707.5130004882812,
"y": 151.69900512695312
},
{
"x": 700.7150268554688,
"y": 166.9669952392578
} }
], ],
"isCurve": true, "isCurve": true,
@ -1060,104 +1108,120 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 634.1279907226562, "x": 684.0120239257812,
"y": 195.8260040283203 "y": 195.8979949951172
}, },
{ {
"x": 624.4310302734375, "x": 674.18798828125,
"y": 205.86700439453125 "y": 209.41900634765625
}, },
{ {
"x": 614.0570068359375, "x": 663.4450073242188,
"y": 215.20799255371094 "y": 222.22300720214844
}, },
{ {
"x": 603.0570068359375, "x": 651.8350219726562,
"y": 223.80299377441406 "y": 234.2449951171875
}, },
{ {
"x": 591.4829711914062, "x": 639.4149780273438,
"y": 231.60899353027344 "y": 245.4290008544922
}, },
{ {
"x": 579.3939819335938, "x": 626.2440185546875,
"y": 238.58900451660156 "y": 255.71800231933594
}, },
{ {
"x": 566.8469848632812, "x": 612.3880004882812,
"y": 244.70899963378906 "y": 265.0639953613281
}, },
{ {
"x": 553.9039916992188, "x": 597.9140014648438,
"y": 249.93800354003906 "y": 273.4209899902344
}, },
{ {
"x": 540.6270141601562, "x": 582.8920288085938,
"y": 254.2519989013672 "y": 280.74798583984375
}, },
{ {
"x": 527.0819702148438, "x": 567.39599609375,
"y": 257.6289978027344 "y": 287.0090026855469
}, },
{ {
"x": 513.333984375, "x": 551.5009765625,
"y": 260.0530090332031 "y": 292.1730041503906
}, },
{ {
"x": 499.45098876953125, "x": 535.2839965820312,
"y": 261.5119934082031 "y": 296.2170104980469
},
{
"x": 518.823974609375,
"y": 299.1189880371094
},
{
"x": 502.2030029296875,
"y": 300.8659973144531
}, },
{ {
"x": 485.5, "x": 485.5,
"y": 262 "y": 301.4490051269531
}, },
{ {
"x": 471.5480041503906, "x": 468.7959899902344,
"y": 261.5119934082031 "y": 300.8659973144531
}, },
{ {
"x": 457.6650085449219, "x": 452.17498779296875,
"y": 260.0530090332031 "y": 299.1189880371094
}, },
{ {
"x": 443.9169921875, "x": 435.7149963378906,
"y": 257.6289978027344 "y": 296.2170104980469
}, },
{ {
"x": 430.37200927734375, "x": 419.49798583984375,
"y": 254.2519989013672 "y": 292.1730041503906
}, },
{ {
"x": 417.0950012207031, "x": 403.6029968261719,
"y": 249.93800354003906 "y": 287.0090026855469
}, },
{ {
"x": 404.1520080566406, "x": 388.10699462890625,
"y": 244.70899963378906 "y": 280.74798583984375
}, },
{ {
"x": 391.6050109863281, "x": 373.0849914550781,
"y": 238.58900451660156 "y": 273.4209899902344
}, },
{ {
"x": 379.5159912109375, "x": 358.6109924316406,
"y": 231.60899353027344 "y": 265.0639953613281
}, },
{ {
"x": 367.9419860839844, "x": 344.7550048828125,
"y": 223.80299377441406 "y": 255.71800231933594
}, },
{ {
"x": 356.9419860839844, "x": 331.5840148925781,
"y": 215.20799255371094 "y": 245.4290008544922
}, },
{ {
"x": 346.5679931640625, "x": 319.16400146484375,
"y": 205.86700439453125 "y": 234.2449951171875
}, },
{ {
"x": 336.8710021972656, "x": 307.5539855957031,
"y": 195.8260040283203 "y": 222.22300720214844
},
{
"x": 296.8110046386719,
"y": 209.41900634765625
},
{
"x": 286.98699951171875,
"y": 195.8979949951172
} }
], ],
"isCurve": true, "isCurve": true,
@ -1192,112 +1256,112 @@
"link": "", "link": "",
"route": [ "route": [
{ {
"x": 946.4920043945312, "x": 953.35302734375,
"y": -183.62899780273438 "y": -215.9080047607422
}, },
{ {
"x": 966.7130126953125, "x": 976.9110107421875,
"y": -178.21099853515625 "y": -209.5959930419922
}, },
{ {
"x": 986.2570190429688, "x": 999.6790161132812,
"y": -170.70899963378906 "y": -200.8560028076172
}, },
{ {
"x": 1004.9099731445312, "x": 1021.4099731445312,
"y": -161.2050018310547 "y": -189.7830047607422
}, },
{ {
"x": 1022.4669799804688, "x": 1041.864013671875,
"y": -149.80299377441406 "y": -176.5
}, },
{ {
"x": 1038.7359619140625, "x": 1060.8170166015625,
"y": -136.6280059814453 "y": -161.15199279785156
}, },
{ {
"x": 1053.5389404296875, "x": 1078.06201171875,
"y": -121.82599639892578 "y": -143.90699768066406
}, },
{ {
"x": 1066.7130126953125, "x": 1093.4110107421875,
"y": -105.55699920654297 "y": -124.9530029296875
}, },
{ {
"x": 1078.114990234375, "x": 1106.6939697265625,
"y": -88 "y": -104.5
}, },
{ {
"x": 1087.6190185546875, "x": 1117.7659912109375,
"y": -69.34700012207031 "y": -82.76899719238281
}, },
{ {
"x": 1095.1209716796875, "x": 1126.5059814453125,
"y": -49.803001403808594 "y": -60
}, },
{ {
"x": 1100.5389404296875, "x": 1132.8179931640625,
"y": -29.582000732421875 "y": -36.44300079345703
}, },
{ {
"x": 1103.81396484375, "x": 1136.633056640625,
"y": -8.904999732971191 "y": -12.354999542236328
}, },
{ {
"x": 1104.9100341796875, "x": 1137.9100341796875,
"y": 12 "y": 12
}, },
{ {
"x": 1103.81396484375, "x": 1136.633056640625,
"y": 32.904998779296875 "y": 36.35499954223633
}, },
{ {
"x": 1100.5389404296875, "x": 1132.8179931640625,
"y": 53.582000732421875 "y": 60.44300079345703
}, },
{ {
"x": 1095.1209716796875, "x": 1126.5059814453125,
"y": 73.8030014038086 "y": 84
}, },
{ {
"x": 1087.6190185546875, "x": 1117.7659912109375,
"y": 93.34700012207031 "y": 106.76899719238281
}, },
{ {
"x": 1078.114990234375, "x": 1106.6939697265625,
"y": 111.9990005493164 "y": 128.49899291992188
}, },
{ {
"x": 1066.7130126953125, "x": 1093.4110107421875,
"y": 129.5570068359375 "y": 148.9530029296875
}, },
{ {
"x": 1053.5389404296875, "x": 1078.06201171875,
"y": 145.8260040283203 "y": 167.90699768066406
}, },
{ {
"x": 1038.7359619140625, "x": 1060.8170166015625,
"y": 160.6280059814453 "y": 185.15199279785156
}, },
{ {
"x": 1022.4669799804688, "x": 1041.864013671875,
"y": 173.80299377441406 "y": 200.5
}, },
{ {
"x": 1004.9099731445312, "x": 1021.4099731445312,
"y": 185.2050018310547 "y": 213.7830047607422
}, },
{ {
"x": 986.2570190429688, "x": 999.6790161132812,
"y": 194.70899963378906 "y": 224.8560028076172
}, },
{ {
"x": 966.7130126953125, "x": 976.9110107421875,
"y": 202.21099853515625 "y": 233.5959930419922
}, },
{ {
"x": 946.4920043945312, "x": 953.35302734375,
"y": 207.62899780273438 "y": 239.9080047607422
} }
], ],
"isCurve": true, "isCurve": true,

154
e2etests/testdata/txtar/cycle-diagram/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: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB