From 399b96ca0e13c8ac7de25801dee61a51e1ba2ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 29 Nov 2022 21:43:01 -0800 Subject: [PATCH] Update tests --- .../testdata/stable/chaos1/elk/board.exp.json | 40 +- .../testdata/stable/chaos2/elk/board.exp.json | 288 ++++++------ .../child_parent_edges/elk/board.exp.json | 40 +- .../connected_container/elk/board.exp.json | 48 +- .../stable/container_edges/elk/board.exp.json | 120 ++--- .../different_subgraphs/elk/board.exp.json | 284 ++++++------ .../stable/direction/dagre/board.exp.json | 96 ++-- .../stable/direction/elk/board.exp.json | 96 ++-- .../stable/investigate/elk/board.exp.json | 434 +++++++++--------- .../stable/large_arch/elk/board.exp.json | 396 ++++++++-------- .../one_container_loop/elk/board.exp.json | 116 ++--- .../elk/board.exp.json | 240 +++++----- .../transparent_3d/dagre/board.exp.json | 4 +- .../stable/transparent_3d/elk/board.exp.json | 4 +- .../container_child_edge/elk/board.exp.json | 36 +- 15 files changed, 1133 insertions(+), 1109 deletions(-) diff --git a/e2etests/testdata/stable/chaos1/elk/board.exp.json b/e2etests/testdata/stable/chaos1/elk/board.exp.json index 195cfe680..9b4a92ab8 100644 --- a/e2etests/testdata/stable/chaos1/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos1/elk/board.exp.json @@ -5,11 +5,11 @@ "id": "aaa", "type": "", "pos": { - "x": 375, - "y": 12 + "x": 12, + "y": 364 }, - "width": 325, - "height": 422, + "width": 430, + "height": 317, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "aaa.bbb", "type": "callout", "pos": { - "x": 450, - "y": 87 + "x": 87, + "y": 439 }, "width": 132, "height": 126, @@ -81,8 +81,8 @@ "id": "ddd", "type": "cylinder", "pos": { - "x": 12, - "y": 87 + "x": 85, + "y": 12 }, "width": 133, "height": 126, @@ -119,8 +119,8 @@ "id": "eee", "type": "document", "pos": { - "x": 15, - "y": 233 + "x": 238, + "y": 12 }, "width": 130, "height": 126, @@ -157,8 +157,8 @@ "id": "aaa.ccc", "type": "", "pos": { - "x": 452, - "y": 233 + "x": 239, + "y": 439 }, "width": 128, "height": 126, @@ -219,12 +219,12 @@ "labelPercentage": 0, "route": [ { - "x": 580, - "y": 296 + "x": 303, + "y": 565 }, { - "x": 700, - "y": 296 + "x": 303, + "y": 681 } ], "animated": false, @@ -258,12 +258,12 @@ "labelPercentage": 0, "route": [ { - "x": 145, - "y": 296 + "x": 303, + "y": 138 }, { - "x": 452, - "y": 296 + "x": 303, + "y": 439 } ], "animated": false, diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index a4c77f842..f001ad2b1 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 1656, - "height": 897, + "width": 892, + "height": 1707, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,11 +43,11 @@ "id": "aa.bb", "type": "", "pos": { - "x": 434, - "y": 132 + "x": 144, + "y": 445 }, - "width": 1134, - "height": 702, + "width": 685, + "height": 1174, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -81,11 +81,11 @@ "id": "aa.bb.cc", "type": "", "pos": { - "x": 819, - "y": 278 + "x": 290, + "y": 841 }, - "width": 674, - "height": 481, + "width": 464, + "height": 703, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -119,11 +119,11 @@ "id": "aa.bb.cc.dd", "type": "rectangle", "pos": { - "x": 894, - "y": 364 + "x": 376, + "y": 916 }, - "width": 267, - "height": 320, + "width": 303, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "aa.bb.cc.dd.ee", "type": "text", "pos": { - "x": 1070, - "y": 585 + "x": 588, + "y": 1093 }, "width": 16, "height": 24, @@ -194,8 +194,8 @@ "id": "aa.bb.cc.dd.ff", "type": "", "pos": { - "x": 969, - "y": 439 + "x": 451, + "y": 991 }, "width": 117, "height": 126, @@ -232,8 +232,8 @@ "id": "aa.bb.cc.gg", "type": "text", "pos": { - "x": 1221, - "y": 581 + "x": 585, + "y": 1258 }, "width": 17, "height": 24, @@ -269,8 +269,8 @@ "id": "aa.bb.cc.hh", "type": "", "pos": { - "x": 1295, - "y": 530 + "x": 532, + "y": 1343 }, "width": 123, "height": 126, @@ -307,8 +307,8 @@ "id": "aa.bb.ii", "type": "package", "pos": { - "x": 509, - "y": 364 + "x": 376, + "y": 520 }, "width": 265, "height": 276, @@ -345,8 +345,8 @@ "id": "aa.bb.ii.jj", "type": "diamond", "pos": { - "x": 584, - "y": 439 + "x": 451, + "y": 595 }, "width": 115, "height": 126, @@ -383,8 +383,8 @@ "id": "aa.bb.kk", "type": "oval", "pos": { - "x": 579, - "y": 207 + "x": 219, + "y": 595 }, "width": 126, "height": 126, @@ -421,8 +421,8 @@ "id": "aa.ll", "type": "", "pos": { - "x": 238, - "y": 356 + "x": 357, + "y": 233 }, "width": 114, "height": 126, @@ -459,8 +459,8 @@ "id": "aa.mm", "type": "cylinder", "pos": { - "x": 87, - "y": 471 + "x": 462, + "y": 87 }, "width": 131, "height": 126, @@ -497,8 +497,8 @@ "id": "aa.nn", "type": "text", "pos": { - "x": 144, - "y": 427 + "x": 424, + "y": 138 }, "width": 18, "height": 24, @@ -534,8 +534,8 @@ "id": "aa.oo", "type": "", "pos": { - "x": 91, - "y": 617 + "x": 613, + "y": 87 }, "width": 123, "height": 126, @@ -596,12 +596,12 @@ "labelPercentage": 0, "route": [ { - "x": 1086, - "y": 597 + "x": 596, + "y": 1117 }, { - "x": 1221, - "y": 597 + "x": 596, + "y": 1258 } ], "animated": false, @@ -635,12 +635,12 @@ "labelPercentage": 0, "route": [ { - "x": 1238, - "y": 593 + "x": 593.1666666666666, + "y": 1282 }, { - "x": 1295, - "y": 593 + "x": 593.1666666666666, + "y": 1343 } ], "animated": false, @@ -674,20 +674,20 @@ "labelPercentage": 0, "route": [ { - "x": 774, - "y": 548 + "x": 552.6666666666666, + "y": 796 }, { - "x": 794, - "y": 548 + "x": 552.6666666666666, + "y": 816 }, { - "x": 794, - "y": 439 + "x": 451, + "y": 816 }, { - "x": 894, - "y": 439 + "x": 451, + "y": 916 } ], "animated": false, @@ -721,28 +721,20 @@ "labelPercentage": 0, "route": [ { - "x": 352, - "y": 431.6 + "x": 424.9000000000001, + "y": 359 }, { - "x": 362, - "y": 431.6 + "x": 424.9000000000001, + "y": 420 }, { - "x": 362, - "y": 421.80000000000007 + "x": 345.00000000000006, + "y": 420 }, { - "x": 409, - "y": 421.80000000000007 - }, - { - "x": 409, - "y": 333.00000000000006 - }, - { - "x": 434, - "y": 333.00000000000006 + "x": 345.00000000000006, + "y": 445 } ], "animated": false, @@ -776,28 +768,28 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 572 + "x": 566.5, + "y": 213 }, { - "x": 409, - "y": 572 + "x": 566.5, + "y": 420 }, { - "x": 409, - "y": 650 + "x": 651, + "y": 420 }, { - "x": 804, - "y": 650 + "x": 651, + "y": 826 }, { - "x": 804, - "y": 449.00000000000006 + "x": 461.00000000000006, + "y": 826 }, { - "x": 819, - "y": 449.00000000000006 + "x": 461.00000000000006, + "y": 841 } ], "animated": false, @@ -831,20 +823,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 496.40000000000003 + "x": 487.90000000000003, + "y": 213 }, { - "x": 228, - "y": 496.40000000000003 + "x": 487.90000000000003, + "y": 223 }, { - "x": 228, - "y": 419.00000000000006 + "x": 413.50000000000006, + "y": 223 }, { - "x": 238, - "y": 419.00000000000006 + "x": 413.50000000000006, + "y": 233 } ], "animated": false, @@ -878,28 +870,28 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 546.8000000000001 + "x": 540.3000000000001, + "y": 213 }, { - "x": 228, - "y": 546.8000000000001 + "x": 540.3000000000001, + "y": 223 }, { - "x": 228, - "y": 537 + "x": 537.5, + "y": 223 }, { - "x": 409, - "y": 537 + "x": 537.5, + "y": 420 }, { - "x": 409, - "y": 512 + "x": 518.5, + "y": 420 }, { - "x": 434, - "y": 512 + "x": 518.5, + "y": 445 } ], "animated": false, @@ -933,28 +925,28 @@ "labelPercentage": 0, "route": [ { - "x": 352, - "y": 456.80000000000007 + "x": 447.70000000000005, + "y": 359 }, { - "x": 419, - "y": 456.80000000000007 + "x": 447.70000000000005, + "y": 430 }, { - "x": 419, - "y": 353.00000000000006 + "x": 365.00000000000006, + "y": 430 }, { - "x": 1211, - "y": 353.00000000000006 + "x": 365.00000000000006, + "y": 1248 }, { - "x": 1211, - "y": 589 + "x": 590.3333333333334, + "y": 1248 }, { - "x": 1221, - "y": 589 + "x": 590.3333333333334, + "y": 1258 } ], "animated": false, @@ -988,20 +980,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 521.6 + "x": 514.1, + "y": 213 }, { - "x": 228, - "y": 521.6 + "x": 514.1, + "y": 223 }, { - "x": 228, - "y": 502.00000000000006 + "x": 508.50000000000006, + "y": 223 }, { - "x": 509, - "y": 502.00000000000006 + "x": 508.50000000000006, + "y": 520 } ], "animated": false, @@ -1035,28 +1027,28 @@ "labelPercentage": 0, "route": [ { - "x": 1493, - "y": 449.00000000000006 + "x": 461.00000000000006, + "y": 1544 }, { - "x": 1593, - "y": 449.0000000000001 + "x": 461.0000000000001, + "y": 1644 }, { - "x": 1593, - "y": 87.00000000000006 + "x": 105.00000000000006, + "y": 1644 }, { - "x": 362, - "y": 87.00000000000006 + "x": 105.00000000000006, + "y": 369 }, { - "x": 362, - "y": 381.2000000000001 + "x": 379.3000000000001, + "y": 369 }, { - "x": 352, - "y": 381.2000000000001 + "x": 379.3000000000001, + "y": 359 } ], "animated": false, @@ -1090,36 +1082,36 @@ "labelPercentage": 0, "route": [ { - "x": 774, - "y": 456.00000000000006 + "x": 464.33333333333337, + "y": 796 }, { - "x": 784, - "y": 456.00000000000006 + "x": 464.33333333333337, + "y": 806 }, { - "x": 784, - "y": 267.00000000000006 + "x": 279.00000000000006, + "y": 806 }, { - "x": 1583, - "y": 267.0000000000001 + "x": 279.0000000000001, + "y": 1634 }, { - "x": 1583, - "y": 122.00000000000011 + "x": 134.0000000000001, + "y": 1634 }, { - "x": 372, - "y": 122.00000000000011 + "x": 134.0000000000001, + "y": 379 }, { - "x": 372, - "y": 406.4000000000001 + "x": 402.10000000000014, + "y": 379 }, { - "x": 352, - "y": 406.4000000000001 + "x": 402.10000000000014, + "y": 359 } ], "animated": false, diff --git a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json index a85c30982..af4faba6a 100644 --- a/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/child_parent_edges/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 589, - "height": 586, + "width": 574, + "height": 601, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -46,8 +46,8 @@ "x": 87, "y": 87 }, - "width": 439, - "height": 436, + "width": 424, + "height": 451, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -181,12 +181,12 @@ "labelPercentage": 0, "route": [ { - "x": 526, - "y": 162 + "x": 162, + "y": 538 }, { - "x": 601, - "y": 162 + "x": 162, + "y": 613 } ], "animated": false, @@ -220,12 +220,12 @@ "labelPercentage": 0, "route": [ { - "x": 87, - "y": 237 + "x": 237, + "y": 87 }, { - "x": 162, - "y": 237 + "x": 237, + "y": 162 } ], "animated": false, @@ -259,20 +259,20 @@ "labelPercentage": 0, "route": [ { - "x": 351, - "y": 300 + "x": 294, + "y": 363 }, { - "x": 441, - "y": 300 + "x": 294, + "y": 453 }, { - "x": 441, - "y": 448 + "x": 436, + "y": 453 }, { - "x": 87, - "y": 448 + "x": 436, + "y": 87 } ], "animated": false, diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json index a2270ad4a..a59e14196 100644 --- a/e2etests/testdata/stable/connected_container/elk/board.exp.json +++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 12, - "y": 87 + "x": 88, + "y": 12 }, "width": 263, "height": 276, @@ -43,8 +43,8 @@ "id": "a.b", "type": "", "pos": { - "x": 87, - "y": 162 + "x": 163, + "y": 87 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "c", "type": "", "pos": { - "x": 385, - "y": 87 + "x": 87, + "y": 398 }, "width": 264, "height": 276, @@ -119,8 +119,8 @@ "id": "c.d", "type": "", "pos": { - "x": 460, - "y": 162 + "x": 162, + "y": 473 }, "width": 114, "height": 126, @@ -157,11 +157,11 @@ "id": "f", "type": "", "pos": { - "x": 759, - "y": 12 + "x": 12, + "y": 784 }, - "width": 419, - "height": 426, + "width": 414, + "height": 431, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -195,8 +195,8 @@ "id": "f.h", "type": "", "pos": { - "x": 839, - "y": 87 + "x": 87, + "y": 864 }, "width": 264, "height": 276, @@ -233,8 +233,8 @@ "id": "f.h.g", "type": "", "pos": { - "x": 914, - "y": 162 + "x": 162, + "y": 939 }, "width": 114, "height": 126, @@ -295,12 +295,12 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 225 + "x": 219, + "y": 213 }, { - "x": 460, - "y": 225 + "x": 219, + "y": 473 } ], "animated": false, @@ -334,12 +334,12 @@ "labelPercentage": 0, "route": [ { - "x": 574, - "y": 225 + "x": 219, + "y": 599 }, { - "x": 914, - "y": 225 + "x": 219, + "y": 939 } ], "animated": false, diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index 396818f4d..6e9dba901 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 12, - "y": 162 + "x": 162, + "y": 12 }, "width": 113, "height": 126, @@ -43,11 +43,11 @@ "id": "g", "type": "", "pos": { - "x": 240, - "y": 87 + "x": 87, + "y": 253 }, - "width": 263, - "height": 422, + "width": 396, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -81,8 +81,8 @@ "id": "g.b", "type": "", "pos": { - "x": 315, - "y": 162 + "x": 162, + "y": 328 }, "width": 113, "height": 126, @@ -119,11 +119,11 @@ "id": "d", "type": "", "pos": { - "x": 613, - "y": 12 + "x": 12, + "y": 639 }, - "width": 418, - "height": 426, + "width": 413, + "height": 431, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "d.h", "type": "", "pos": { - "x": 693, - "y": 87 + "x": 87, + "y": 719 }, "width": 263, "height": 276, @@ -195,8 +195,8 @@ "id": "d.h.c", "type": "", "pos": { - "x": 768, - "y": 162 + "x": 162, + "y": 794 }, "width": 113, "height": 126, @@ -233,8 +233,8 @@ "id": "g.e", "type": "", "pos": { - "x": 315, - "y": 308 + "x": 295, + "y": 328 }, "width": 113, "height": 126, @@ -271,8 +271,8 @@ "id": "f", "type": "", "pos": { - "x": 613, - "y": 458 + "x": 445, + "y": 639 }, "width": 111, "height": 126, @@ -333,12 +333,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 225 + "x": 218.5, + "y": 138 }, { - "x": 315, - "y": 225 + "x": 218.5, + "y": 328 } ], "animated": false, @@ -372,12 +372,12 @@ "labelPercentage": 0, "route": [ { - "x": 428, - "y": 225 + "x": 218.5, + "y": 454 }, { - "x": 768, - "y": 225 + "x": 218.5, + "y": 794 } ], "animated": false, @@ -411,28 +411,28 @@ "labelPercentage": 0, "route": [ { - "x": 1031, - "y": 87 + "x": 87, + "y": 1070 }, { - "x": 1081, - "y": 87 + "x": 87, + "y": 1120 }, { - "x": 1081, - "y": 594 + "x": 566, + "y": 1120 }, { - "x": 175, - "y": 594 + "x": 566, + "y": 188 }, { - "x": 175, - "y": 371 + "x": 351.5, + "y": 188 }, { - "x": 315, - "y": 371 + "x": 351.5, + "y": 328 } ], "animated": false, @@ -466,20 +466,20 @@ "labelPercentage": 0, "route": [ { - "x": 428, - "y": 371 + "x": 351.5, + "y": 454 }, { - "x": 558, - "y": 371 + "x": 351.5, + "y": 584 }, { - "x": 558, - "y": 500 + "x": 482, + "y": 584 }, { - "x": 613, - "y": 500 + "x": 482, + "y": 639 } ], "animated": false, @@ -513,20 +513,20 @@ "labelPercentage": 0, "route": [ { - "x": 613, - "y": 542 + "x": 519, + "y": 639 }, { - "x": 185, - "y": 542 + "x": 519, + "y": 198 }, { - "x": 185, - "y": 381 + "x": 361.5, + "y": 198 }, { - "x": 240, - "y": 381 + "x": 361.5, + "y": 253 } ], "animated": false, @@ -560,12 +560,12 @@ "labelPercentage": 0, "route": [ { - "x": 503, - "y": 235 + "x": 228.5, + "y": 529 }, { - "x": 693, - "y": 235 + "x": 228.5, + "y": 719 } ], "animated": false, diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index ea6501360..595dbd557 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -5,11 +5,11 @@ "id": "finally", "type": "", "pos": { - "x": 12, - "y": 742 + "x": 843, + "y": 12 }, - "width": 779, - "height": 422, + "width": 458, + "height": 714, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "a", "type": "", "pos": { - "x": 678, - "y": 44 + "x": 57, + "y": 600 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "tree", "type": "", "pos": { - "x": 927, - "y": 325 + "x": 362, + "y": 836 }, "width": 134, "height": 126, @@ -119,8 +119,8 @@ "id": "and", "type": "", "pos": { - "x": 922, - "y": 158 + "x": 179, + "y": 836 }, "width": 132, "height": 126, @@ -157,8 +157,8 @@ "id": "nodes", "type": "", "pos": { - "x": 901, - "y": 12 + "x": 12, + "y": 836 }, "width": 147, "height": 126, @@ -195,8 +195,8 @@ "id": "some", "type": "", "pos": { - "x": 1174, - "y": 158 + "x": 174, + "y": 1062 }, "width": 143, "height": 126, @@ -233,8 +233,8 @@ "id": "more", "type": "", "pos": { - "x": 1174, - "y": 304 + "x": 337, + "y": 1062 }, "width": 141, "height": 126, @@ -271,8 +271,8 @@ "id": "many", "type": "", "pos": { - "x": 1174, - "y": 450 + "x": 498, + "y": 1062 }, "width": 145, "height": 126, @@ -309,8 +309,8 @@ "id": "then", "type": "", "pos": { - "x": 653, - "y": 596 + "x": 685, + "y": 600 }, "width": 138, "height": 126, @@ -347,8 +347,8 @@ "id": "here", "type": "", "pos": { - "x": 920, - "y": 617 + "x": 709, + "y": 836 }, "width": 136, "height": 126, @@ -385,8 +385,8 @@ "id": "you", "type": "", "pos": { - "x": 1174, - "y": 617 + "x": 711, + "y": 1062 }, "width": 132, "height": 126, @@ -423,8 +423,8 @@ "id": "have", "type": "", "pos": { - "x": 653, - "y": 450 + "x": 505, + "y": 600 }, "width": 138, "height": 126, @@ -461,8 +461,8 @@ "id": "hierarchy", "type": "", "pos": { - "x": 901, - "y": 471 + "x": 516, + "y": 836 }, "width": 173, "height": 126, @@ -499,8 +499,8 @@ "id": "another", "type": "", "pos": { - "x": 906, - "y": 820 + "x": 915, + "y": 836 }, "width": 163, "height": 126, @@ -537,8 +537,8 @@ "id": "of", "type": "", "pos": { - "x": 1174, - "y": 820 + "x": 936, + "y": 1062 }, "width": 120, "height": 126, @@ -575,8 +575,8 @@ "id": "nesting", "type": "", "pos": { - "x": 633, - "y": 1184 + "x": 1322, + "y": 600 }, "width": 158, "height": 126, @@ -613,8 +613,8 @@ "id": "trees", "type": "", "pos": { - "x": 901, - "y": 1163 + "x": 1306, + "y": 836 }, "width": 142, "height": 126, @@ -651,8 +651,8 @@ "id": "finally.a", "type": "", "pos": { - "x": 255, - "y": 838 + "x": 948, + "y": 233 }, "width": 113, "height": 126, @@ -689,8 +689,8 @@ "id": "finally.tree", "type": "", "pos": { - "x": 389, - "y": 963 + "x": 1073, + "y": 379 }, "width": 134, "height": 126, @@ -727,8 +727,8 @@ "id": "finally.inside", "type": "", "pos": { - "x": 87, - "y": 838 + "x": 930, + "y": 87 }, "width": 148, "height": 126, @@ -765,8 +765,8 @@ "id": "finally.hierarchy", "type": "", "pos": { - "x": 543, - "y": 963 + "x": 1054, + "y": 525 }, "width": 173, "height": 126, @@ -803,8 +803,8 @@ "id": "finally.root", "type": "", "pos": { - "x": 388, - "y": 817 + "x": 918, + "y": 379 }, "width": 135, "height": 126, @@ -865,20 +865,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 138 + "x": 142, + "y": 726 }, { - "x": 841, - "y": 138 + "x": 142, + "y": 776 }, { - "x": 841, - "y": 388 + "x": 429.3333333333333, + "y": 776 }, { - "x": 927, - "y": 388 + "x": 429.3333333333333, + "y": 836 } ], "animated": false, @@ -912,20 +912,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 106.5 + "x": 113.75, + "y": 726 }, { - "x": 851, - "y": 106.5 + "x": 113.75, + "y": 786 }, { - "x": 851, - "y": 221 + "x": 245, + "y": 786 }, { - "x": 921.5, - "y": 221 + "x": 245, + "y": 836 } ], "animated": false, @@ -959,12 +959,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 75 + "x": 85.5, + "y": 726 }, { - "x": 901, - "y": 75 + "x": 85.5, + "y": 836 } ], "animated": false, @@ -998,12 +998,12 @@ "labelPercentage": 0, "route": [ { - "x": 1053.5, - "y": 221 + "x": 245, + "y": 962 }, { - "x": 1174, - "y": 221 + "x": 245, + "y": 1062 } ], "animated": false, @@ -1037,12 +1037,12 @@ "labelPercentage": 0, "route": [ { - "x": 1061, - "y": 367 + "x": 407, + "y": 962 }, { - "x": 1174, - "y": 367 + "x": 407, + "y": 1062 } ], "animated": false, @@ -1076,20 +1076,20 @@ "labelPercentage": 0, "route": [ { - "x": 1061, - "y": 409 + "x": 451.66666666666663, + "y": 962 }, { - "x": 1124, - "y": 409 + "x": 451.66666666666663, + "y": 1012 }, { - "x": 1124, - "y": 513 + "x": 570, + "y": 1012 }, { - "x": 1174, - "y": 513 + "x": 570, + "y": 1062 } ], "animated": false, @@ -1123,12 +1123,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 680 + "x": 777.3333333333333, + "y": 726 }, { - "x": 919.5, - "y": 680 + "x": 777.3333333333333, + "y": 836 } ], "animated": false, @@ -1162,12 +1162,12 @@ "labelPercentage": 0, "route": [ { - "x": 1055.5, - "y": 680 + "x": 777.3333333333333, + "y": 962 }, { - "x": 1174, - "y": 680 + "x": 777.3333333333333, + "y": 1062 } ], "animated": false, @@ -1201,12 +1201,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 513 + "x": 574, + "y": 726 }, { - "x": 901, - "y": 513 + "x": 574, + "y": 836 } ], "animated": false, @@ -1240,20 +1240,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 638 + "x": 731.3333333333333, + "y": 726 }, { - "x": 841, - "y": 638 + "x": 731.3333333333333, + "y": 776 }, { - "x": 841, - "y": 555 + "x": 631.6666666666666, + "y": 776 }, { - "x": 901, - "y": 555 + "x": 631.6666666666666, + "y": 836 } ], "animated": false, @@ -1287,12 +1287,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 726 }, { - "x": 906, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 836 } ], "animated": false, @@ -1326,12 +1326,12 @@ "labelPercentage": 0, "route": [ { - "x": 1069, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 962 }, { - "x": 1174, - "y": 882.6666666666666 + "x": 996.1666666666666, + "y": 1062 } ], "animated": false, @@ -1365,12 +1365,12 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 1247 + "x": 1400.8333333333333, + "y": 726 }, { - "x": 901, - "y": 1247 + "x": 1400.8333333333333, + "y": 836 } ], "animated": false, @@ -1404,20 +1404,20 @@ "labelPercentage": 0, "route": [ { - "x": 791, - "y": 1023.3333333333333 + "x": 1149, + "y": 726 }, { - "x": 841, - "y": 1023.3333333333333 + "x": 1149, + "y": 776 }, { - "x": 841, - "y": 1205 + "x": 1353.4999999999998, + "y": 776 }, { - "x": 901, - "y": 1205 + "x": 1353.4999999999998, + "y": 836 } ], "animated": false, @@ -1451,20 +1451,20 @@ "labelPercentage": 0, "route": [ { - "x": 368, - "y": 922 + "x": 1023.1666666666667, + "y": 359 }, { - "x": 378, - "y": 922 + "x": 1023.1666666666667, + "y": 369 }, { - "x": 378, - "y": 1026 + "x": 1140, + "y": 369 }, { - "x": 388.5, - "y": 1026 + "x": 1140, + "y": 379 } ], "animated": false, @@ -1498,12 +1498,12 @@ "labelPercentage": 0, "route": [ { - "x": 235, - "y": 901 + "x": 1004.3333333333333, + "y": 213 }, { - "x": 255, - "y": 901 + "x": 1004.3333333333333, + "y": 233 } ], "animated": false, @@ -1537,12 +1537,12 @@ "labelPercentage": 0, "route": [ { - "x": 522.5, - "y": 1026 + "x": 1140, + "y": 505 }, { - "x": 543, - "y": 1026 + "x": 1140, + "y": 525 } ], "animated": false, @@ -1576,12 +1576,12 @@ "labelPercentage": 0, "route": [ { - "x": 368, - "y": 880 + "x": 985.5, + "y": 359 }, { - "x": 388, - "y": 880 + "x": 985.5, + "y": 379 } ], "animated": false, diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json index cc01c3fae..821680267 100644 --- a/e2etests/testdata/stable/direction/dagre/board.exp.json +++ b/e2etests/testdata/stable/direction/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 494, "height": 1456, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 1 }, { "id": "b.2", @@ -48,7 +48,6 @@ }, "width": 240, "height": 1130, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 2 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "c", @@ -124,7 +124,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "d", @@ -162,7 +162,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "e", @@ -200,7 +200,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "b.1", @@ -238,7 +238,6 @@ }, "width": 112, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.3", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.4", @@ -314,7 +314,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.5", @@ -352,7 +352,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.2.a", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.b", @@ -428,7 +428,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.c", @@ -466,7 +466,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.d", @@ -504,7 +504,6 @@ }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.e", @@ -542,7 +542,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 } ], "connections": [ @@ -618,7 +618,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -665,7 +666,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(c -> d)[0]", @@ -712,7 +714,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(d -> e)[0]", @@ -759,7 +762,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(1 -> 2)[0]", @@ -806,7 +810,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(2 -> 3)[0]", @@ -853,7 +858,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(3 -> 4)[0]", @@ -900,7 +906,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(4 -> 5)[0]", @@ -947,7 +954,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(a -> b)[0]", @@ -994,7 +1002,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(b -> c)[0]", @@ -1041,7 +1050,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(c -> d)[0]", @@ -1088,7 +1098,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(d -> e)[0]", @@ -1135,7 +1146,8 @@ "isCurve": true, "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json index 37051403b..c6a1c80a1 100644 --- a/e2etests/testdata/stable/direction/elk/board.exp.json +++ b/e2etests/testdata/stable/direction/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 414, "height": 1594, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 18, "labelHeight": 41, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 1 }, { "id": "b.2", @@ -48,7 +48,6 @@ }, "width": 264, "height": 860, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -75,7 +74,8 @@ "underline": false, "labelWidth": 16, "labelHeight": 36, - "labelPosition": "INSIDE_TOP_CENTER" + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 2 }, { "id": "a", @@ -86,7 +86,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -113,7 +112,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "c", @@ -124,7 +124,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -151,7 +150,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "d", @@ -162,7 +162,6 @@ }, "width": 114, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -189,7 +188,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "e", @@ -200,7 +200,6 @@ }, "width": 113, "height": 126, - "level": 1, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -227,7 +226,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 }, { "id": "b.1", @@ -238,7 +238,6 @@ }, "width": 112, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -265,7 +264,8 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.3", @@ -276,7 +276,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -303,7 +302,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.4", @@ -314,7 +314,6 @@ }, "width": 114, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -341,7 +340,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.5", @@ -352,7 +352,6 @@ }, "width": 113, "height": 126, - "level": 2, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -379,7 +378,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2 }, { "id": "b.2.a", @@ -390,7 +390,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -417,7 +416,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.b", @@ -428,7 +428,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -455,7 +454,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.c", @@ -466,7 +466,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -493,7 +492,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.d", @@ -504,7 +504,6 @@ }, "width": 114, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -531,7 +530,8 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 }, { "id": "b.2.e", @@ -542,7 +542,6 @@ }, "width": 113, "height": 126, - "level": 3, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -569,7 +568,8 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 3 } ], "connections": [ @@ -609,7 +609,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -647,7 +648,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(c -> d)[0]", @@ -685,7 +687,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "(d -> e)[0]", @@ -723,7 +726,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(1 -> 2)[0]", @@ -761,7 +765,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(2 -> 3)[0]", @@ -799,7 +804,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(3 -> 4)[0]", @@ -837,7 +843,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.(4 -> 5)[0]", @@ -875,7 +882,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(a -> b)[0]", @@ -913,7 +921,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(b -> c)[0]", @@ -951,7 +960,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(c -> d)[0]", @@ -989,7 +999,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 }, { "id": "b.2.(d -> e)[0]", @@ -1027,7 +1038,8 @@ ], "animated": false, "tooltip": "", - "icon": null + "icon": null, + "zIndex": 4 } ] } diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 45f42987e..24f934439 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "aa", "type": "step", "pos": { - "x": 12, - "y": 450 + "x": 435, + "y": 12 }, "width": 122, "height": 126, @@ -43,8 +43,8 @@ "id": "bb", "type": "step", "pos": { - "x": 234, - "y": 304 + "x": 292, + "y": 238 }, "width": 123, "height": 126, @@ -81,8 +81,8 @@ "id": "cc", "type": "step", "pos": { - "x": 457, - "y": 325 + "x": 314, + "y": 464 }, "width": 121, "height": 126, @@ -119,11 +119,11 @@ "id": "dd", "type": "", "pos": { - "x": 792, - "y": 250 + "x": 238, + "y": 816 }, - "width": 273, - "height": 422, + "width": 415, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "dd.ee", "type": "diamond", "pos": { - "x": 868, - "y": 471 + "x": 456, + "y": 891 }, "width": 122, "height": 126, @@ -195,10 +195,10 @@ "id": "ll", "type": "", "pos": { - "x": 3033, - "y": 268 + "x": 253, + "y": 3094 }, - "width": 419, + "width": 425, "height": 427, "opacity": 1, "strokeDash": 0, @@ -233,8 +233,8 @@ "id": "ll.mm", "type": "oval", "pos": { - "x": 3108, - "y": 489 + "x": 472, + "y": 3169 }, "width": 131, "height": 131, @@ -271,8 +271,8 @@ "id": "ff", "type": "", "pos": { - "x": 2391, - "y": 268 + "x": 254, + "y": 2436 }, "width": 424, "height": 427, @@ -309,8 +309,8 @@ "id": "ff.mm", "type": "oval", "pos": { - "x": 2466, - "y": 489 + "x": 472, + "y": 2511 }, "width": 131, "height": 131, @@ -347,8 +347,8 @@ "id": "ff.gg", "type": "diamond", "pos": { - "x": 2469, - "y": 343 + "x": 329, + "y": 2513 }, "width": 123, "height": 126, @@ -385,8 +385,8 @@ "id": "dd.hh", "type": "diamond", "pos": { - "x": 867, - "y": 325 + "x": 313, + "y": 891 }, "width": 123, "height": 126, @@ -423,8 +423,8 @@ "id": "ww", "type": "queue", "pos": { - "x": 2145, - "y": 143 + "x": 127, + "y": 2195 }, "width": 131, "height": 126, @@ -472,11 +472,11 @@ "id": "yy", "type": "", "pos": { - "x": 3562, - "y": 89 + "x": 75, + "y": 3631 }, - "width": 413, - "height": 276, + "width": 273, + "height": 422, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -510,8 +510,8 @@ "id": "yy.zz", "type": "queue", "pos": { - "x": 3637, - "y": 164 + "x": 152, + "y": 3706 }, "width": 120, "height": 126, @@ -559,8 +559,8 @@ "id": "ad", "type": "parallelogram", "pos": { - "x": 4473, - "y": 346 + "x": 333, + "y": 4554 }, "width": 123, "height": 126, @@ -597,11 +597,11 @@ "id": "nn", "type": "cylinder", "pos": { - "x": 4095, - "y": 125 + "x": 117, + "y": 4173 }, - "width": 273, - "height": 568, + "width": 557, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -635,8 +635,8 @@ "id": "ii", "type": "", "pos": { - "x": 1170, - "y": 471 + "x": 460, + "y": 1197 }, "width": 114, "height": 126, @@ -673,8 +673,8 @@ "id": "jj", "type": "", "pos": { - "x": 1466, - "y": 471 + "x": 459, + "y": 1503 }, "width": 115, "height": 126, @@ -711,8 +711,8 @@ "id": "kk", "type": "", "pos": { - "x": 1868, - "y": 471 + "x": 456, + "y": 1914 }, "width": 122, "height": 126, @@ -749,8 +749,8 @@ "id": "nn.oo", "type": "", "pos": { - "x": 4170, - "y": 492 + "x": 476, + "y": 4248 }, "width": 123, "height": 126, @@ -787,8 +787,8 @@ "id": "ff.pp", "type": "", "pos": { - "x": 2617, - "y": 343 + "x": 329, + "y": 2662 }, "width": 123, "height": 126, @@ -825,8 +825,8 @@ "id": "ll.qq", "type": "", "pos": { - "x": 3112, - "y": 343 + "x": 328, + "y": 3172 }, "width": 124, "height": 126, @@ -863,8 +863,8 @@ "id": "ll.rr", "type": "", "pos": { - "x": 3259, - "y": 343 + "x": 331, + "y": 3320 }, "width": 118, "height": 126, @@ -901,8 +901,8 @@ "id": "ss", "type": "", "pos": { - "x": 1389, - "y": 47 + "x": 37, + "y": 1428 }, "width": 268, "height": 276, @@ -939,8 +939,8 @@ "id": "ss.tt", "type": "", "pos": { - "x": 1464, - "y": 122 + "x": 112, + "y": 1503 }, "width": 118, "height": 126, @@ -977,8 +977,8 @@ "id": "uu", "type": "", "pos": { - "x": 1767, - "y": 47 + "x": 34, + "y": 1814 }, "width": 273, "height": 276, @@ -1015,8 +1015,8 @@ "id": "uu.vv", "type": "", "pos": { - "x": 1842, - "y": 122 + "x": 109, + "y": 1889 }, "width": 123, "height": 126, @@ -1053,8 +1053,8 @@ "id": "rm", "type": "", "pos": { - "x": 3230, - "y": 122 + "x": 109, + "y": 3295 }, "width": 124, "height": 126, @@ -1091,8 +1091,8 @@ "id": "nn.xx", "type": "", "pos": { - "x": 4170, - "y": 200 + "x": 192, + "y": 4248 }, "width": 122, "height": 126, @@ -1129,8 +1129,8 @@ "id": "yy.ab", "type": "", "pos": { - "x": 3777, - "y": 164 + "x": 150, + "y": 3852 }, "width": 123, "height": 126, @@ -1167,8 +1167,8 @@ "id": "nn.ac", "type": "", "pos": { - "x": 4171, - "y": 346 + "x": 334, + "y": 4248 }, "width": 122, "height": 126, @@ -1229,20 +1229,20 @@ "labelPercentage": 0, "route": [ { - "x": 134, - "y": 491.5 + "x": 476, + "y": 138 }, { - "x": 184, - "y": 491.5 + "x": 476, + "y": 188 }, { - "x": 184, - "y": 366.5 + "x": 353.66666666666663, + "y": 188 }, { - "x": 234, - "y": 366.5 + "x": 353.66666666666663, + "y": 238 } ], "animated": false, @@ -1276,12 +1276,12 @@ "labelPercentage": 0, "route": [ { - "x": 357, - "y": 387.5 + "x": 374.16666666666663, + "y": 364 }, { - "x": 457, - "y": 387.5 + "x": 374.16666666666663, + "y": 464 } ], "animated": false, @@ -1315,12 +1315,12 @@ "labelPercentage": 0, "route": [ { - "x": 134, - "y": 533.5 + "x": 516.6666666666666, + "y": 138 }, { - "x": 867.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 891 } ], "animated": false, @@ -1354,28 +1354,28 @@ "labelPercentage": 0, "route": [ { - "x": 357, - "y": 345.5 + "x": 333.16666666666663, + "y": 364 }, { - "x": 407, - "y": 345.5 + "x": 333.16666666666663, + "y": 414 }, { - "x": 407, - "y": 36 + "x": 23, + "y": 414 }, { - "x": 2336, - "y": 36 + "x": 23, + "y": 2381 }, { - "x": 2336, - "y": 385 + "x": 369.5, + "y": 2381 }, { - "x": 2468.6666666666665, - "y": 385 + "x": 369.5, + "y": 2512.6666666666665 } ], "animated": false, @@ -1409,12 +1409,12 @@ "labelPercentage": 0, "route": [ { - "x": 578, - "y": 387.5 + "x": 374.16666666666663, + "y": 590 }, { - "x": 867, - "y": 387.5 + "x": 374.16666666666663, + "y": 891 } ], "animated": false, @@ -1448,12 +1448,12 @@ "labelPercentage": 0, "route": [ { - "x": 989.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 1017 }, { - "x": 1170, - "y": 533.5 + "x": 516.6666666666666, + "y": 1197 } ], "animated": false, @@ -1487,12 +1487,12 @@ "labelPercentage": 0, "route": [ { - "x": 1284, - "y": 533.5 + "x": 516.6666666666666, + "y": 1323 }, { - "x": 1465.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 1503 } ], "animated": false, @@ -1526,12 +1526,12 @@ "labelPercentage": 0, "route": [ { - "x": 1580.5, - "y": 533.5 + "x": 516.6666666666666, + "y": 1629 }, { - "x": 1867.6666666666667, - "y": 533.5 + "x": 516.6666666666666, + "y": 1914 } ], "animated": false, @@ -1565,12 +1565,12 @@ "labelPercentage": 0, "route": [ { - "x": 1989.6666666666667, - "y": 554.5 + "x": 537, + "y": 2040 }, { - "x": 2466, - "y": 554.5 + "x": 537, + "y": 2511 } ], "animated": false, @@ -1604,12 +1604,12 @@ "labelPercentage": 0, "route": [ { - "x": 2597, - "y": 554.5 + "x": 537, + "y": 2642 }, { - "x": 3108, - "y": 554.5 + "x": 537, + "y": 3169 } ], "animated": false, @@ -1643,12 +1643,12 @@ "labelPercentage": 0, "route": [ { - "x": 3239, - "y": 554.5 + "x": 537, + "y": 3300 }, { - "x": 4170, - "y": 554.5 + "x": 537, + "y": 4248 } ], "animated": false, @@ -1682,12 +1682,12 @@ "labelPercentage": 0, "route": [ { - "x": 2591.6666666666665, - "y": 406 + "x": 390.5, + "y": 2638.6666666666665 }, { - "x": 2617, - "y": 406 + "x": 390.5, + "y": 2662 } ], "animated": false, @@ -1721,12 +1721,20 @@ "labelPercentage": 0, "route": [ { - "x": 2740, - "y": 406 + "x": 390, + "y": 2788 }, { - "x": 3111.5, - "y": 406 + "x": 390, + "y": 2918 + }, + { + "x": 389.5, + "y": 2918 + }, + { + "x": 389.5, + "y": 3171.5 } ], "animated": false, @@ -1760,12 +1768,12 @@ "labelPercentage": 0, "route": [ { - "x": 3235.5, - "y": 406 + "x": 390, + "y": 3297.5 }, { - "x": 3259, - "y": 406 + "x": 390, + "y": 3320 } ], "animated": false, @@ -1799,20 +1807,20 @@ "labelPercentage": 0, "route": [ { - "x": 990, - "y": 387.5 + "x": 374.16666666666663, + "y": 1017 }, { - "x": 1120, - "y": 387.5 + "x": 374.16666666666663, + "y": 1147 }, { - "x": 1120, - "y": 185 + "x": 170.49999999999997, + "y": 1147 }, { - "x": 1464, - "y": 185 + "x": 170.49999999999997, + "y": 1503 } ], "animated": false, @@ -1846,12 +1854,12 @@ "labelPercentage": 0, "route": [ { - "x": 1582, - "y": 185 + "x": 170.5, + "y": 1629 }, { - "x": 1842, - "y": 185 + "x": 170.5, + "y": 1889 } ], "animated": false, @@ -1885,20 +1893,20 @@ "labelPercentage": 0, "route": [ { - "x": 1989.6666666666667, - "y": 512.5 + "x": 496.3333333333333, + "y": 2040 }, { - "x": 2095, - "y": 512.5 + "x": 496.3333333333333, + "y": 2145 }, { - "x": 2095, - "y": 227 + "x": 214.16666666666669, + "y": 2145 }, { - "x": 2145, - "y": 227 + "x": 214.16666666666669, + "y": 2195 } ], "animated": false, @@ -1932,12 +1940,12 @@ "labelPercentage": 0, "route": [ { - "x": 1965, - "y": 185 + "x": 170.5, + "y": 2015 }, { - "x": 2145, - "y": 185 + "x": 170.5, + "y": 2195 } ], "animated": false, @@ -1971,12 +1979,12 @@ "labelPercentage": 0, "route": [ { - "x": 2276, - "y": 185 + "x": 170.5, + "y": 2321 }, { - "x": 3229.6666666666665, - "y": 185 + "x": 170.5, + "y": 3294.6666666666665 } ], "animated": false, @@ -2010,28 +2018,28 @@ "labelPercentage": 0, "route": [ { - "x": 3353.6666666666665, - "y": 164 + "x": 149.83333333333331, + "y": 3420.6666666666665 }, { - "x": 3507, - "y": 164 + "x": 149.83333333333331, + "y": 3576 }, { - "x": 3507, - "y": 78 + "x": 63.666666666666664, + "y": 3576 }, { - "x": 4040, - "y": 78 + "x": 63.666666666666664, + "y": 4118 }, { - "x": 4040, - "y": 262.5 + "x": 252.5, + "y": 4118 }, { - "x": 4170, - "y": 262.5 + "x": 252.5, + "y": 4248 } ], "animated": false, @@ -2065,20 +2073,20 @@ "labelPercentage": 0, "route": [ { - "x": 3377, - "y": 406 + "x": 389.5, + "y": 3446 }, { - "x": 3507, - "y": 406 + "x": 389.5, + "y": 3576 }, { - "x": 3507, - "y": 248 + "x": 231.16666666666666, + "y": 3576 }, { - "x": 3637, - "y": 248 + "x": 231.16666666666666, + "y": 3706 } ], "animated": false, @@ -2112,12 +2120,12 @@ "labelPercentage": 0, "route": [ { - "x": 3353.6666666666665, - "y": 206 + "x": 191.16666666666666, + "y": 3420.6666666666665 }, { - "x": 3637, - "y": 206 + "x": 191.16666666666666, + "y": 3706 } ], "animated": false, @@ -2151,12 +2159,12 @@ "labelPercentage": 0, "route": [ { - "x": 3757, - "y": 227 + "x": 211.5, + "y": 3832 }, { - "x": 3777, - "y": 227 + "x": 211.5, + "y": 3852 } ], "animated": false, @@ -2190,20 +2198,20 @@ "labelPercentage": 0, "route": [ { - "x": 3900, - "y": 227 + "x": 211.16666666666666, + "y": 3978 }, { - "x": 4030, - "y": 227 + "x": 211.16666666666666, + "y": 4108 }, { - "x": 4030, - "y": 408.5 + "x": 394.5, + "y": 4108 }, { - "x": 4170.5, - "y": 408.5 + "x": 394.5, + "y": 4248 } ], "animated": false, @@ -2237,12 +2245,12 @@ "labelPercentage": 0, "route": [ { - "x": 4292.5, - "y": 408.5 + "x": 394.5, + "y": 4374 }, { - "x": 4473, - "y": 408.5 + "x": 394.5, + "y": 4554 } ], "animated": false, @@ -2276,20 +2284,20 @@ "labelPercentage": 0, "route": [ { - "x": 2276, - "y": 227 + "x": 214.16666666666669, + "y": 2321 }, { - "x": 2326, - "y": 227 + "x": 214.16666666666669, + "y": 2371 }, { - "x": 2326, - "y": 427 + "x": 410.5, + "y": 2371 }, { - "x": 2468.6666666666665, - "y": 427 + "x": 410.5, + "y": 2512.6666666666665 } ], "animated": false, diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index de1cf8958..84336e7e1 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 528, - "y": 1728 + "x": 1657, + "y": 541 }, "width": 113, "height": 126, @@ -43,8 +43,8 @@ "id": "b", "type": "", "pos": { - "x": 528, - "y": 1582 + "x": 1524, + "y": 541 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "c", "type": "", "pos": { - "x": 2112, - "y": 604 + "x": 578, + "y": 2178 }, "width": 113, "height": 126, @@ -119,8 +119,8 @@ "id": "d", "type": "", "pos": { - "x": 2112, - "y": 750 + "x": 711, + "y": 2178 }, "width": 114, "height": 126, @@ -157,8 +157,8 @@ "id": "e", "type": "", "pos": { - "x": 2326, - "y": 750 + "x": 712, + "y": 2404 }, "width": 113, "height": 126, @@ -195,8 +195,8 @@ "id": "f", "type": "", "pos": { - "x": 2112, - "y": 458 + "x": 447, + "y": 2178 }, "width": 111, "height": 126, @@ -233,8 +233,8 @@ "id": "g", "type": "", "pos": { - "x": 2112, - "y": 955 + "x": 919, + "y": 2178 }, "width": 114, "height": 126, @@ -271,8 +271,8 @@ "id": "h", "type": "", "pos": { - "x": 1271, - "y": 1050 + "x": 1006, + "y": 1311 }, "width": 113, "height": 126, @@ -309,11 +309,11 @@ "id": "i", "type": "", "pos": { - "x": 1271, - "y": 237 + "x": 239, + "y": 1311 }, - "width": 706, - "height": 792, + "width": 746, + "height": 732, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -347,11 +347,11 @@ "id": "i.j", "type": "", "pos": { - "x": 1346, - "y": 532 + "x": 517, + "y": 1386 }, - "width": 263, - "height": 422, + "width": 392, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -385,8 +385,8 @@ "id": "i.j.k", "type": "", "pos": { - "x": 1421, - "y": 607 + "x": 592, + "y": 1461 }, "width": 113, "height": 126, @@ -423,8 +423,8 @@ "id": "i.j.l", "type": "", "pos": { - "x": 1425, - "y": 753 + "x": 725, + "y": 1461 }, "width": 109, "height": 126, @@ -461,8 +461,8 @@ "id": "i.m", "type": "", "pos": { - "x": 1728, - "y": 458 + "x": 447, + "y": 1784 }, "width": 117, "height": 126, @@ -499,8 +499,8 @@ "id": "i.n", "type": "", "pos": { - "x": 1789, - "y": 312 + "x": 314, + "y": 1842 }, "width": 113, "height": 126, @@ -537,8 +537,8 @@ "id": "i.o", "type": "", "pos": { - "x": 1639, - "y": 678 + "x": 648, + "y": 1692 }, "width": 263, "height": 276, @@ -575,8 +575,8 @@ "id": "i.o.p", "type": "", "pos": { - "x": 1714, - "y": 753 + "x": 723, + "y": 1767 }, "width": 113, "height": 126, @@ -613,8 +613,8 @@ "id": "q", "type": "", "pos": { - "x": 2112, - "y": 312 + "x": 313, + "y": 2178 }, "width": 114, "height": 126, @@ -654,8 +654,8 @@ "x": 12, "y": 12 }, - "width": 1139, - "height": 1550, + "width": 1492, + "height": 1179, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -689,11 +689,11 @@ "id": "r.s", "type": "", "pos": { - "x": 386, - "y": 87 + "x": 87, + "y": 388 }, - "width": 553, - "height": 812, + "width": 767, + "height": 577, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -727,8 +727,8 @@ "id": "r.s.t", "type": "", "pos": { - "x": 658, - "y": 698 + "x": 669, + "y": 671 }, "width": 111, "height": 126, @@ -765,8 +765,8 @@ "id": "r.s.u", "type": "", "pos": { - "x": 595, - "y": 162 + "x": 162, + "y": 609 }, "width": 264, "height": 276, @@ -803,8 +803,8 @@ "id": "r.s.u.v", "type": "", "pos": { - "x": 670, - "y": 237 + "x": 237, + "y": 684 }, "width": 114, "height": 126, @@ -841,8 +841,8 @@ "id": "r.s.w", "type": "", "pos": { - "x": 671, - "y": 458 + "x": 446, + "y": 687 }, "width": 118, "height": 126, @@ -879,8 +879,8 @@ "id": "r.s.x", "type": "", "pos": { - "x": 462, - "y": 479 + "x": 467, + "y": 463 }, "width": 113, "height": 126, @@ -917,8 +917,8 @@ "id": "r.s.y", "type": "", "pos": { - "x": 461, - "y": 625 + "x": 600, + "y": 463 }, "width": 114, "height": 126, @@ -955,8 +955,8 @@ "id": "r.z", "type": "", "pos": { - "x": 964, - "y": 237 + "x": 238, + "y": 990 }, "width": 112, "height": 126, @@ -993,8 +993,8 @@ "id": "r.aa", "type": "", "pos": { - "x": 239, - "y": 584 + "x": 549, + "y": 237 }, "width": 122, "height": 126, @@ -1031,11 +1031,11 @@ "id": "r.bb", "type": "", "pos": { - "x": 87, - "y": 1065 + "x": 1014, + "y": 87 }, - "width": 274, - "height": 422, + "width": 415, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -1069,8 +1069,8 @@ "id": "r.bb.cc", "type": "", "pos": { - "x": 164, - "y": 1140 + "x": 1089, + "y": 162 }, "width": 121, "height": 126, @@ -1107,8 +1107,8 @@ "id": "r.bb.dd", "type": "", "pos": { - "x": 162, - "y": 1286 + "x": 1230, + "y": 162 }, "width": 124, "height": 126, @@ -1145,8 +1145,8 @@ "id": "r.ee", "type": "", "pos": { - "x": 239, - "y": 919 + "x": 872, + "y": 237 }, "width": 122, "height": 126, @@ -1183,8 +1183,8 @@ "id": "r.ff", "type": "", "pos": { - "x": 386, - "y": 919 + "x": 875, + "y": 388 }, "width": 117, "height": 126, @@ -1221,8 +1221,8 @@ "id": "r.gg", "type": "", "pos": { - "x": 238, - "y": 730 + "x": 691, + "y": 237 }, "width": 123, "height": 126, @@ -1283,20 +1283,20 @@ "labelPercentage": 0, "route": [ { - "x": 1534, - "y": 670 + "x": 648, + "y": 1587 }, { - "x": 1624, - "y": 670 + "x": 648, + "y": 1677 }, { - "x": 1624, - "y": 552.5 + "x": 534.75, + "y": 1677 }, { - "x": 1728.375, - "y": 552.5 + "x": 534.75, + "y": 1783.875 } ], "animated": false, @@ -1330,12 +1330,12 @@ "labelPercentage": 0, "route": [ { - "x": 1534, - "y": 816 + "x": 779, + "y": 1587 }, { - "x": 1714, - "y": 816 + "x": 779, + "y": 1767 } ], "animated": false, @@ -1369,28 +1369,28 @@ "labelPercentage": 0, "route": [ { - "x": 2112, - "y": 343.5 + "x": 341.5, + "y": 2178 }, { - "x": 2032, - "y": 343.5 + "x": 341.5, + "y": 2098 }, { - "x": 2032, - "y": 227 + "x": 228.5, + "y": 2098 }, { - "x": 1216, - "y": 227 + "x": 228.5, + "y": 1256 }, { - "x": 1216, - "y": 489.5 + "x": 475.75, + "y": 1256 }, { - "x": 1728.375, - "y": 489.5 + "x": 475.75, + "y": 1783.875 } ], "animated": false, @@ -1424,20 +1424,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 479 + "x": 466, + "y": 1909.875 }, { - "x": 2032, - "y": 479 + "x": 466, + "y": 2098 }, { - "x": 2032, - "y": 406.5 + "x": 398.5, + "y": 2098 }, { - "x": 2112, - "y": 406.5 + "x": 398.5, + "y": 2178 } ], "animated": false, @@ -1471,12 +1471,12 @@ "labelPercentage": 0, "route": [ { - "x": 1902, - "y": 375 + "x": 370, + "y": 1968 }, { - "x": 2112, - "y": 375 + "x": 370, + "y": 2178 } ], "animated": false, @@ -1510,20 +1510,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 521 + "x": 505, + "y": 1909.875 }, { - "x": 2052, - "y": 521 + "x": 505, + "y": 2118 }, { - "x": 2052, - "y": 667 + "x": 634.5, + "y": 2118 }, { - "x": 2112, - "y": 667 + "x": 634.5, + "y": 2178 } ], "animated": false, @@ -1557,20 +1557,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 542 + "x": 524.5, + "y": 1909.875 }, { - "x": 2042, - "y": 542 + "x": 524.5, + "y": 2108 }, { - "x": 2042, - "y": 813 + "x": 768, + "y": 2108 }, { - "x": 2112, - "y": 813 + "x": 768, + "y": 2178 } ], "animated": false, @@ -1604,20 +1604,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 563 + "x": 544, + "y": 1909.875 }, { - "x": 2032, - "y": 563 + "x": 544, + "y": 2098 }, { - "x": 2032, - "y": 997 + "x": 957, + "y": 2098 }, { - "x": 2112, - "y": 997 + "x": 957, + "y": 2178 } ], "animated": false, @@ -1651,20 +1651,20 @@ "labelPercentage": 0, "route": [ { - "x": 1845.375, - "y": 500 + "x": 485.5, + "y": 1909.875 }, { - "x": 2062, - "y": 500 + "x": 485.5, + "y": 2128 }, { - "x": 2062, - "y": 521 + "x": 502.5, + "y": 2128 }, { - "x": 2112, - "y": 521 + "x": 502.5, + "y": 2178 } ], "animated": false, @@ -1698,12 +1698,12 @@ "labelPercentage": 0, "route": [ { - "x": 2226, - "y": 813 + "x": 768, + "y": 2304 }, { - "x": 2326, - "y": 813 + "x": 768, + "y": 2404 } ], "animated": false, @@ -1737,20 +1737,20 @@ "labelPercentage": 0, "route": [ { - "x": 575, - "y": 563 + "x": 542.6666666666666, + "y": 589 }, { - "x": 585, - "y": 563 + "x": 542.6666666666666, + "y": 599 }, { - "x": 585, - "y": 729.5 + "x": 696.5833333333333, + "y": 599 }, { - "x": 658.2, - "y": 729.5 + "x": 696.5833333333333, + "y": 671 } ], "animated": false, @@ -1784,12 +1784,12 @@ "labelPercentage": 0, "route": [ { - "x": 575, - "y": 521 + "x": 505, + "y": 589 }, { - "x": 670.5, - "y": 521 + "x": 505, + "y": 686.5 } ], "animated": false, @@ -1823,12 +1823,12 @@ "labelPercentage": 0, "route": [ { - "x": 361, - "y": 792.5 + "x": 752.0833333333333, + "y": 363 }, { - "x": 658.2, - "y": 792.5 + "x": 752.0833333333333, + "y": 671 } ], "animated": false, @@ -1862,12 +1862,12 @@ "labelPercentage": 0, "route": [ { - "x": 784, - "y": 300 + "x": 294, + "y": 810 }, { - "x": 964, - "y": 300 + "x": 294, + "y": 990 } ], "animated": false, @@ -1901,20 +1901,20 @@ "labelPercentage": 0, "route": [ { - "x": 361, - "y": 646.5 + "x": 609.5833333333333, + "y": 363 }, { - "x": 371, - "y": 646.5 + "x": 609.5833333333333, + "y": 373 }, { - "x": 371, - "y": 761 + "x": 724.3333333333333, + "y": 373 }, { - "x": 658.2, - "y": 761 + "x": 724.3333333333333, + "y": 671 } ], "animated": false, @@ -1948,12 +1948,12 @@ "labelPercentage": 0, "route": [ { - "x": 788.5, - "y": 521 + "x": 505, + "y": 812.5 }, { - "x": 1728.375, - "y": 521 + "x": 505, + "y": 1783.875 } ], "animated": false, @@ -1987,20 +1987,20 @@ "labelPercentage": 0, "route": [ { - "x": 769.2, - "y": 740 + "x": 705.8333333333333, + "y": 797 }, { - "x": 1216, - "y": 740 + "x": 705.8333333333333, + "y": 1256 }, { - "x": 1216, - "y": 1039 + "x": 995, + "y": 1256 }, { - "x": 2112, - "y": 1039 + "x": 995, + "y": 2178 } ], "animated": false, @@ -2034,20 +2034,20 @@ "labelPercentage": 0, "route": [ { - "x": 769.2, - "y": 782 + "x": 742.8333333333333, + "y": 797 }, { - "x": 1206, - "y": 782 + "x": 742.8333333333333, + "y": 1246 }, { - "x": 1206, - "y": 1113 + "x": 1062.5, + "y": 1246 }, { - "x": 1271, - "y": 1113 + "x": 1062.5, + "y": 1311 } ], "animated": false, @@ -2081,12 +2081,12 @@ "labelPercentage": 0, "route": [ { - "x": 361, - "y": 982 + "x": 933.3333333333333, + "y": 363 }, { - "x": 386, - "y": 982 + "x": 933.3333333333333, + "y": 388 } ], "animated": false, diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index 727b05b40..2004579dd 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 263, - "height": 422, + "width": 396, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "a.b", "type": "", "pos": { - "x": 87, - "y": 233 + "x": 220, + "y": 87 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "c", "type": "", "pos": { - "x": 1021, - "y": 223 + "x": 209, + "y": 1071 }, "width": 113, "height": 126, @@ -119,8 +119,8 @@ "id": "d", "type": "", "pos": { - "x": 807, - "y": 223 + "x": 209, + "y": 845 }, "width": 114, "height": 126, @@ -157,8 +157,8 @@ "id": "e", "type": "", "pos": { - "x": 594, - "y": 77 + "x": 77, + "y": 619 }, "width": 113, "height": 126, @@ -195,8 +195,8 @@ "id": "f", "type": "", "pos": { - "x": 595, - "y": 223 + "x": 210, + "y": 619 }, "width": 111, "height": 126, @@ -233,8 +233,8 @@ "id": "g", "type": "", "pos": { - "x": 380, - "y": 223 + "x": 209, + "y": 393 }, "width": 114, "height": 126, @@ -333,28 +333,28 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 296 + "x": 276.5, + "y": 213 }, { - "x": 330, - "y": 296 + "x": 276.5, + "y": 343 }, { - "x": 330, - "y": 359 + "x": 332.5, + "y": 343 }, { - "x": 971, - "y": 359 + "x": 332.5, + "y": 1021 }, { - "x": 971, - "y": 317.5 + "x": 293.75, + "y": 1021 }, { - "x": 1021, - "y": 317.5 + "x": 293.75, + "y": 1071 } ], "animated": false, @@ -388,12 +388,12 @@ "labelPercentage": 0, "route": [ { - "x": 921, - "y": 286 + "x": 265.5, + "y": 971 }, { - "x": 1021, - "y": 286 + "x": 265.5, + "y": 1071 } ], "animated": false, @@ -427,20 +427,20 @@ "labelPercentage": 0, "route": [ { - "x": 707, - "y": 140 + "x": 133.5, + "y": 745 }, { - "x": 971, - "y": 140 + "x": 133.5, + "y": 1021 }, { - "x": 971, - "y": 254.5 + "x": 237.25, + "y": 1021 }, { - "x": 1021, - "y": 254.5 + "x": 237.25, + "y": 1071 } ], "animated": false, @@ -474,12 +474,12 @@ "labelPercentage": 0, "route": [ { - "x": 706, - "y": 286 + "x": 265.5, + "y": 745 }, { - "x": 807, - "y": 286 + "x": 265.5, + "y": 845 } ], "animated": false, @@ -513,12 +513,12 @@ "labelPercentage": 0, "route": [ { - "x": 275, - "y": 140 + "x": 133.5, + "y": 288 }, { - "x": 594, - "y": 140 + "x": 133.5, + "y": 619 } ], "animated": false, @@ -552,12 +552,12 @@ "labelPercentage": 0, "route": [ { - "x": 494, - "y": 286 + "x": 265.5, + "y": 519 }, { - "x": 595, - "y": 286 + "x": 265.5, + "y": 619 } ], "animated": false, @@ -591,20 +591,20 @@ "labelPercentage": 0, "route": [ { - "x": 200, - "y": 150 + "x": 143.5, + "y": 213 }, { - "x": 330, - "y": 150 + "x": 143.5, + "y": 343 }, { - "x": 330, - "y": 286 + "x": 265.5, + "y": 343 }, { - "x": 380, - "y": 286 + "x": 265.5, + "y": 393 } ], "animated": false, 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 aae43f08d..f2ff75d3d 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 12, - "y": 308 + "x": 295, + "y": 12 }, "width": 113, "height": 126, @@ -43,8 +43,8 @@ "id": "c", "type": "", "pos": { - "x": 12, - "y": 162 + "x": 162, + "y": 12 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "b", "type": "", "pos": { - "x": 12, - "y": 454 + "x": 428, + "y": 12 }, "width": 113, "height": 126, @@ -119,11 +119,11 @@ "id": "l1", "type": "", "pos": { - "x": 230, - "y": 87 + "x": 87, + "y": 243 }, - "width": 263, - "height": 568, + "width": 529, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -157,8 +157,8 @@ "id": "l1.b", "type": "", "pos": { - "x": 305, - "y": 454 + "x": 428, + "y": 318 }, "width": 113, "height": 126, @@ -195,8 +195,8 @@ "id": "l1.a", "type": "", "pos": { - "x": 305, - "y": 308 + "x": 295, + "y": 318 }, "width": 113, "height": 126, @@ -233,8 +233,8 @@ "id": "l1.c", "type": "", "pos": { - "x": 305, - "y": 162 + "x": 162, + "y": 318 }, "width": 113, "height": 126, @@ -271,8 +271,8 @@ "id": "l2c1", "type": "", "pos": { - "x": 613, - "y": 383 + "x": 370, + "y": 639 }, "width": 263, "height": 276, @@ -309,8 +309,8 @@ "id": "l2c1.a", "type": "", "pos": { - "x": 688, - "y": 458 + "x": 445, + "y": 714 }, "width": 113, "height": 126, @@ -347,8 +347,8 @@ "id": "l2c3", "type": "", "pos": { - "x": 613, - "y": 87 + "x": 87, + "y": 639 }, "width": 263, "height": 276, @@ -385,8 +385,8 @@ "id": "l2c3.c", "type": "", "pos": { - "x": 688, - "y": 162 + "x": 162, + "y": 714 }, "width": 113, "height": 126, @@ -423,8 +423,8 @@ "id": "l2c2", "type": "", "pos": { - "x": 613, - "y": 679 + "x": 653, + "y": 639 }, "width": 263, "height": 276, @@ -461,8 +461,8 @@ "id": "l2c2.b", "type": "", "pos": { - "x": 688, - "y": 754 + "x": 728, + "y": 714 }, "width": 113, "height": 126, @@ -499,11 +499,11 @@ "id": "l3c1", "type": "", "pos": { - "x": 986, - "y": 383 + "x": 370, + "y": 1025 }, - "width": 263, - "height": 422, + "width": 396, + "height": 276, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -537,8 +537,8 @@ "id": "l3c1.a", "type": "", "pos": { - "x": 1061, - "y": 458 + "x": 445, + "y": 1100 }, "width": 113, "height": 126, @@ -575,8 +575,8 @@ "id": "l3c1.b", "type": "", "pos": { - "x": 1061, - "y": 604 + "x": 578, + "y": 1100 }, "width": 113, "height": 126, @@ -613,8 +613,8 @@ "id": "l3c2", "type": "", "pos": { - "x": 986, - "y": 87 + "x": 87, + "y": 1025 }, "width": 263, "height": 276, @@ -651,8 +651,8 @@ "id": "l3c2.c", "type": "", "pos": { - "x": 1061, - "y": 162 + "x": 162, + "y": 1100 }, "width": 113, "height": 126, @@ -689,11 +689,11 @@ "id": "l4", "type": "", "pos": { - "x": 1359, - "y": 12 + "x": 12, + "y": 1411 }, - "width": 418, - "height": 1018, + "width": 979, + "height": 431, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -727,8 +727,8 @@ "id": "l4.c1", "type": "", "pos": { - "x": 1439, - "y": 383 + "x": 370, + "y": 1491 }, "width": 263, "height": 276, @@ -765,8 +765,8 @@ "id": "l4.c1.a", "type": "", "pos": { - "x": 1514, - "y": 458 + "x": 445, + "y": 1566 }, "width": 113, "height": 126, @@ -803,8 +803,8 @@ "id": "l4.c2", "type": "", "pos": { - "x": 1439, - "y": 679 + "x": 653, + "y": 1491 }, "width": 263, "height": 276, @@ -841,8 +841,8 @@ "id": "l4.c2.b", "type": "", "pos": { - "x": 1514, - "y": 754 + "x": 728, + "y": 1566 }, "width": 113, "height": 126, @@ -879,8 +879,8 @@ "id": "l4.c3", "type": "", "pos": { - "x": 1439, - "y": 87 + "x": 87, + "y": 1491 }, "width": 263, "height": 276, @@ -917,8 +917,8 @@ "id": "l4.c3.c", "type": "", "pos": { - "x": 1514, - "y": 162 + "x": 162, + "y": 1566 }, "width": 113, "height": 126, @@ -979,12 +979,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 517 + "x": 484.5, + "y": 138 }, { - "x": 305, - "y": 517 + "x": 484.5, + "y": 318 } ], "animated": false, @@ -1018,12 +1018,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 371 + "x": 351.5, + "y": 138 }, { - "x": 305, - "y": 371 + "x": 351.5, + "y": 318 } ], "animated": false, @@ -1057,12 +1057,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 225 + "x": 218.5, + "y": 138 }, { - "x": 305, - "y": 225 + "x": 218.5, + "y": 318 } ], "animated": false, @@ -1096,20 +1096,20 @@ "labelPercentage": 0, "route": [ { - "x": 418, - "y": 371 + "x": 351.5, + "y": 444 }, { - "x": 558, - "y": 371 + "x": 351.5, + "y": 584 }, { - "x": 558, - "y": 521 + "x": 501.5, + "y": 584 }, { - "x": 688, - "y": 521 + "x": 501.5, + "y": 714 } ], "animated": false, @@ -1143,12 +1143,12 @@ "labelPercentage": 0, "route": [ { - "x": 418, - "y": 225 + "x": 218.5, + "y": 444 }, { - "x": 688, - "y": 225 + "x": 218.5, + "y": 714 } ], "animated": false, @@ -1182,20 +1182,20 @@ "labelPercentage": 0, "route": [ { - "x": 418, - "y": 517 + "x": 484.5, + "y": 444 }, { - "x": 548, - "y": 517 + "x": 484.5, + "y": 574 }, { - "x": 548, - "y": 817 + "x": 784.5, + "y": 574 }, { - "x": 688, - "y": 817 + "x": 784.5, + "y": 714 } ], "animated": false, @@ -1229,12 +1229,12 @@ "labelPercentage": 0, "route": [ { - "x": 801, - "y": 521 + "x": 501.5, + "y": 840 }, { - "x": 1061, - "y": 521 + "x": 501.5, + "y": 1100 } ], "animated": false, @@ -1268,20 +1268,20 @@ "labelPercentage": 0, "route": [ { - "x": 801, - "y": 817 + "x": 784.5, + "y": 840 }, { - "x": 931, - "y": 817 + "x": 784.5, + "y": 970 }, { - "x": 931, - "y": 667 + "x": 634.5, + "y": 970 }, { - "x": 1061, - "y": 667 + "x": 634.5, + "y": 1100 } ], "animated": false, @@ -1315,12 +1315,12 @@ "labelPercentage": 0, "route": [ { - "x": 801, - "y": 225 + "x": 218.5, + "y": 840 }, { - "x": 1061, - "y": 225 + "x": 218.5, + "y": 1100 } ], "animated": false, @@ -1354,12 +1354,12 @@ "labelPercentage": 0, "route": [ { - "x": 1174, - "y": 521 + "x": 501.5, + "y": 1226 }, { - "x": 1514, - "y": 521 + "x": 501.5, + "y": 1566 } ], "animated": false, @@ -1393,20 +1393,20 @@ "labelPercentage": 0, "route": [ { - "x": 1174, - "y": 667 + "x": 634.5, + "y": 1226 }, { - "x": 1304, - "y": 667 + "x": 634.5, + "y": 1356 }, { - "x": 1304, - "y": 817 + "x": 784.5, + "y": 1356 }, { - "x": 1514, - "y": 817 + "x": 784.5, + "y": 1566 } ], "animated": false, @@ -1440,12 +1440,12 @@ "labelPercentage": 0, "route": [ { - "x": 1174, - "y": 225 + "x": 218.5, + "y": 1226 }, { - "x": 1514, - "y": 225 + "x": 218.5, + "y": 1566 } ], "animated": false, diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json index ce7e26c0c..5e26d64b9 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json @@ -10,7 +10,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 0.5, "strokeDash": 0, "strokeWidth": 7, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json index af5b43a50..f44e41856 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json @@ -10,7 +10,6 @@ }, "width": 139, "height": 126, - "level": 1, "opacity": 0.5, "strokeDash": 0, "strokeWidth": 7, @@ -37,7 +36,8 @@ "underline": false, "labelWidth": 39, "labelHeight": 26, - "labelPosition": "INSIDE_MIDDLE_CENTER" + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 1 } ], "connections": [] diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json index be1f60856..76ea3356d 100644 --- a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json +++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json @@ -8,8 +8,8 @@ "x": 12, "y": 12 }, - "width": 509, - "height": 321, + "width": 336, + "height": 463, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -43,8 +43,8 @@ "id": "container.first", "type": "", "pos": { - "x": 87, - "y": 132 + "x": 138, + "y": 87 }, "width": 135, "height": 126, @@ -81,8 +81,8 @@ "id": "container.second", "type": "", "pos": { - "x": 291, - "y": 111 + "x": 102, + "y": 274 }, "width": 155, "height": 126, @@ -143,12 +143,12 @@ "labelPercentage": 0, "route": [ { - "x": 222, - "y": 195 + "x": 205.5, + "y": 213 }, { - "x": 291, - "y": 195 + "x": 205.5, + "y": 274 } ], "animated": false, @@ -182,20 +182,20 @@ "labelPercentage": 0, "route": [ { - "x": 12, - "y": 111 + "x": 117, + "y": 12 }, { - "x": 281, - "y": 111 + "x": 117, + "y": 264 }, { - "x": 281, - "y": 153 + "x": 153.83333333333334, + "y": 264 }, { - "x": 291, - "y": 153 + "x": 153.83333333333334, + "y": 274 } ], "animated": false,