diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c2573b1d4..663ef7687 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -117,7 +117,7 @@ func createCircularArc(edge *d2graph.Edge) { tangentX /= mag tangentY /= mag } - const MIN_SEGMENT_LEN = 4.255 + const MIN_SEGMENT_LEN = 4.1 dx := lastPoint.X - secondLastPoint.X dy := lastPoint.Y - secondLastPoint.Y diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 22305b18d..68b1440d2 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json @@ -864,8 +864,8 @@ "y": -37.47600173950195 }, { - "x": 196.5500030517578, - "y": -37.19599914550781 + "x": 196.5760040283203, + "y": -37.042999267578125 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 30.716999053955078, - "y": 197.66600036621094 + "x": 30.562999725341797, + "y": 197.68699645996094 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -196.5500030517578, - "y": 37.19599914550781 + "x": -196.5760040283203, + "y": 37.042999267578125 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 702.8590087890625, - "y": 112.98999786376953 + "x": 702.8070068359375, + "y": 113.13600158691406 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 366.47198486328125, - "y": 186.177001953125 + "x": 366.3689880371094, + "y": 186.06100463867188 }, { "x": 363.6419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 88a40d4eb..29008bab0 100644 --- a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3351427828 .fill-N1{fill:#0A0F25;} + .d2-3351427828 .fill-N2{fill:#676C7E;} + .d2-3351427828 .fill-N3{fill:#9499AB;} + .d2-3351427828 .fill-N4{fill:#CFD2DD;} + .d2-3351427828 .fill-N5{fill:#DEE1EB;} + .d2-3351427828 .fill-N6{fill:#EEF1F8;} + .d2-3351427828 .fill-N7{fill:#FFFFFF;} + .d2-3351427828 .fill-B1{fill:#0D32B2;} + .d2-3351427828 .fill-B2{fill:#0D32B2;} + .d2-3351427828 .fill-B3{fill:#E3E9FD;} + .d2-3351427828 .fill-B4{fill:#E3E9FD;} + .d2-3351427828 .fill-B5{fill:#EDF0FD;} + .d2-3351427828 .fill-B6{fill:#F7F8FE;} + .d2-3351427828 .fill-AA2{fill:#4A6FF3;} + .d2-3351427828 .fill-AA4{fill:#EDF0FD;} + .d2-3351427828 .fill-AA5{fill:#F7F8FE;} + .d2-3351427828 .fill-AB4{fill:#EDF0FD;} + .d2-3351427828 .fill-AB5{fill:#F7F8FE;} + .d2-3351427828 .stroke-N1{stroke:#0A0F25;} + .d2-3351427828 .stroke-N2{stroke:#676C7E;} + .d2-3351427828 .stroke-N3{stroke:#9499AB;} + .d2-3351427828 .stroke-N4{stroke:#CFD2DD;} + .d2-3351427828 .stroke-N5{stroke:#DEE1EB;} + .d2-3351427828 .stroke-N6{stroke:#EEF1F8;} + .d2-3351427828 .stroke-N7{stroke:#FFFFFF;} + .d2-3351427828 .stroke-B1{stroke:#0D32B2;} + .d2-3351427828 .stroke-B2{stroke:#0D32B2;} + .d2-3351427828 .stroke-B3{stroke:#E3E9FD;} + .d2-3351427828 .stroke-B4{stroke:#E3E9FD;} + .d2-3351427828 .stroke-B5{stroke:#EDF0FD;} + .d2-3351427828 .stroke-B6{stroke:#F7F8FE;} + .d2-3351427828 .stroke-AA2{stroke:#4A6FF3;} + .d2-3351427828 .stroke-AA4{stroke:#EDF0FD;} + .d2-3351427828 .stroke-AA5{stroke:#F7F8FE;} + .d2-3351427828 .stroke-AB4{stroke:#EDF0FD;} + .d2-3351427828 .stroke-AB5{stroke:#F7F8FE;} + .d2-3351427828 .background-color-N1{background-color:#0A0F25;} + .d2-3351427828 .background-color-N2{background-color:#676C7E;} + .d2-3351427828 .background-color-N3{background-color:#9499AB;} + .d2-3351427828 .background-color-N4{background-color:#CFD2DD;} + .d2-3351427828 .background-color-N5{background-color:#DEE1EB;} + .d2-3351427828 .background-color-N6{background-color:#EEF1F8;} + .d2-3351427828 .background-color-N7{background-color:#FFFFFF;} + .d2-3351427828 .background-color-B1{background-color:#0D32B2;} + .d2-3351427828 .background-color-B2{background-color:#0D32B2;} + .d2-3351427828 .background-color-B3{background-color:#E3E9FD;} + .d2-3351427828 .background-color-B4{background-color:#E3E9FD;} + .d2-3351427828 .background-color-B5{background-color:#EDF0FD;} + .d2-3351427828 .background-color-B6{background-color:#F7F8FE;} + .d2-3351427828 .background-color-AA2{background-color:#4A6FF3;} + .d2-3351427828 .background-color-AA4{background-color:#EDF0FD;} + .d2-3351427828 .background-color-AA5{background-color:#F7F8FE;} + .d2-3351427828 .background-color-AB4{background-color:#EDF0FD;} + .d2-3351427828 .background-color-AB5{background-color:#F7F8FE;} + .d2-3351427828 .color-N1{color:#0A0F25;} + .d2-3351427828 .color-N2{color:#676C7E;} + .d2-3351427828 .color-N3{color:#9499AB;} + .d2-3351427828 .color-N4{color:#CFD2DD;} + .d2-3351427828 .color-N5{color:#DEE1EB;} + .d2-3351427828 .color-N6{color:#EEF1F8;} + .d2-3351427828 .color-N7{color:#FFFFFF;} + .d2-3351427828 .color-B1{color:#0D32B2;} + .d2-3351427828 .color-B2{color:#0D32B2;} + .d2-3351427828 .color-B3{color:#E3E9FD;} + .d2-3351427828 .color-B4{color:#E3E9FD;} + .d2-3351427828 .color-B5{color:#EDF0FD;} + .d2-3351427828 .color-B6{color:#F7F8FE;} + .d2-3351427828 .color-AA2{color:#4A6FF3;} + .d2-3351427828 .color-AA4{color:#EDF0FD;} + .d2-3351427828 .color-AA5{color:#F7F8FE;} + .d2-3351427828 .color-AB4{color:#EDF0FD;} + .d2-3351427828 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3351427828);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3351427828);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3351427828);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3351427828);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3351427828);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3351427828);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3351427828);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3351427828);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json index f05462190..4de7352c6 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json +++ b/e2etests/testdata/txtar/cycle-diagram/elk/board.exp.json @@ -864,8 +864,8 @@ "y": -25.47599983215332 }, { - "x": 208.5500030517578, - "y": -25.195999145507812 + "x": 208.5760040283203, + "y": -25.042999267578125 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 42.71699905395508, - "y": 209.66600036621094 + "x": 42.5629997253418, + "y": 209.68699645996094 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -184.5500030517578, - "y": 49.19599914550781 + "x": -184.5760040283203, + "y": 49.042999267578125 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 675.3590087890625, - "y": 124.98999786376953 + "x": 675.3070068359375, + "y": 125.13600158691406 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 338.97198486328125, - "y": 198.177001953125 + "x": 338.8689880371094, + "y": 198.06100463867188 }, { "x": 336.1419982910156, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 144dbb734..6af5df962 100644 --- a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcab + .d2-3353223673 .fill-N1{fill:#0A0F25;} + .d2-3353223673 .fill-N2{fill:#676C7E;} + .d2-3353223673 .fill-N3{fill:#9499AB;} + .d2-3353223673 .fill-N4{fill:#CFD2DD;} + .d2-3353223673 .fill-N5{fill:#DEE1EB;} + .d2-3353223673 .fill-N6{fill:#EEF1F8;} + .d2-3353223673 .fill-N7{fill:#FFFFFF;} + .d2-3353223673 .fill-B1{fill:#0D32B2;} + .d2-3353223673 .fill-B2{fill:#0D32B2;} + .d2-3353223673 .fill-B3{fill:#E3E9FD;} + .d2-3353223673 .fill-B4{fill:#E3E9FD;} + .d2-3353223673 .fill-B5{fill:#EDF0FD;} + .d2-3353223673 .fill-B6{fill:#F7F8FE;} + .d2-3353223673 .fill-AA2{fill:#4A6FF3;} + .d2-3353223673 .fill-AA4{fill:#EDF0FD;} + .d2-3353223673 .fill-AA5{fill:#F7F8FE;} + .d2-3353223673 .fill-AB4{fill:#EDF0FD;} + .d2-3353223673 .fill-AB5{fill:#F7F8FE;} + .d2-3353223673 .stroke-N1{stroke:#0A0F25;} + .d2-3353223673 .stroke-N2{stroke:#676C7E;} + .d2-3353223673 .stroke-N3{stroke:#9499AB;} + .d2-3353223673 .stroke-N4{stroke:#CFD2DD;} + .d2-3353223673 .stroke-N5{stroke:#DEE1EB;} + .d2-3353223673 .stroke-N6{stroke:#EEF1F8;} + .d2-3353223673 .stroke-N7{stroke:#FFFFFF;} + .d2-3353223673 .stroke-B1{stroke:#0D32B2;} + .d2-3353223673 .stroke-B2{stroke:#0D32B2;} + .d2-3353223673 .stroke-B3{stroke:#E3E9FD;} + .d2-3353223673 .stroke-B4{stroke:#E3E9FD;} + .d2-3353223673 .stroke-B5{stroke:#EDF0FD;} + .d2-3353223673 .stroke-B6{stroke:#F7F8FE;} + .d2-3353223673 .stroke-AA2{stroke:#4A6FF3;} + .d2-3353223673 .stroke-AA4{stroke:#EDF0FD;} + .d2-3353223673 .stroke-AA5{stroke:#F7F8FE;} + .d2-3353223673 .stroke-AB4{stroke:#EDF0FD;} + .d2-3353223673 .stroke-AB5{stroke:#F7F8FE;} + .d2-3353223673 .background-color-N1{background-color:#0A0F25;} + .d2-3353223673 .background-color-N2{background-color:#676C7E;} + .d2-3353223673 .background-color-N3{background-color:#9499AB;} + .d2-3353223673 .background-color-N4{background-color:#CFD2DD;} + .d2-3353223673 .background-color-N5{background-color:#DEE1EB;} + .d2-3353223673 .background-color-N6{background-color:#EEF1F8;} + .d2-3353223673 .background-color-N7{background-color:#FFFFFF;} + .d2-3353223673 .background-color-B1{background-color:#0D32B2;} + .d2-3353223673 .background-color-B2{background-color:#0D32B2;} + .d2-3353223673 .background-color-B3{background-color:#E3E9FD;} + .d2-3353223673 .background-color-B4{background-color:#E3E9FD;} + .d2-3353223673 .background-color-B5{background-color:#EDF0FD;} + .d2-3353223673 .background-color-B6{background-color:#F7F8FE;} + .d2-3353223673 .background-color-AA2{background-color:#4A6FF3;} + .d2-3353223673 .background-color-AA4{background-color:#EDF0FD;} + .d2-3353223673 .background-color-AA5{background-color:#F7F8FE;} + .d2-3353223673 .background-color-AB4{background-color:#EDF0FD;} + .d2-3353223673 .background-color-AB5{background-color:#F7F8FE;} + .d2-3353223673 .color-N1{color:#0A0F25;} + .d2-3353223673 .color-N2{color:#676C7E;} + .d2-3353223673 .color-N3{color:#9499AB;} + .d2-3353223673 .color-N4{color:#CFD2DD;} + .d2-3353223673 .color-N5{color:#DEE1EB;} + .d2-3353223673 .color-N6{color:#EEF1F8;} + .d2-3353223673 .color-N7{color:#FFFFFF;} + .d2-3353223673 .color-B1{color:#0D32B2;} + .d2-3353223673 .color-B2{color:#0D32B2;} + .d2-3353223673 .color-B3{color:#E3E9FD;} + .d2-3353223673 .color-B4{color:#E3E9FD;} + .d2-3353223673 .color-B5{color:#EDF0FD;} + .d2-3353223673 .color-B6{color:#F7F8FE;} + .d2-3353223673 .color-AA2{color:#4A6FF3;} + .d2-3353223673 .color-AA4{color:#EDF0FD;} + .d2-3353223673 .color-AA5{color:#F7F8FE;} + .d2-3353223673 .color-AB4{color:#EDF0FD;} + .d2-3353223673 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3353223673);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3353223673);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3353223673);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3353223673);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3353223673);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3353223673);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3353223673);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3353223673);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab