From a9a27821c486410d501a24d985e131dbc7cc68a6 Mon Sep 17 00:00:00 2001 From: Mayank Mohapatra <125661248+Mayank77maruti@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:50:35 +0000 Subject: [PATCH] try --- d2layouts/d2cycle/layout.go | 47 +++++- .../txtar/cycle-diagram/dagre/board.exp.json | 24 +-- .../txtar/cycle-diagram/dagre/sketch.exp.svg | 152 +++++++++--------- .../txtar/cycle-diagram/elk/board.exp.json | 24 +-- .../txtar/cycle-diagram/elk/sketch.exp.svg | 152 +++++++++--------- 5 files changed, 219 insertions(+), 180 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index c63eb2039..91bab5add 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -99,13 +99,52 @@ func createCircularArc(edge *d2graph.Edge) { path[len(path)-1] = newDst // Trim redundant path points that fall inside node boundaries. - path = trimPathPoints(path, edge.Src.Box) - path = trimPathPoints(path, edge.Dst.Box) +// path = trimPathPoints(path, edge.Src.Box) +// path = trimPathPoints(path, edge.Dst.Box) - edge.Route = path - edge.IsCurve = true +// edge.Route = path +// edge.IsCurve = true +// } +path = trimPathPoints(path, edge.Src.Box) +path = trimPathPoints(path, edge.Dst.Box) + +// Adjust the last two points to align the arrow direction with the arc's tangent +if len(path) >= 2 { + dstPoint := path[len(path)-1] + prevPoint := path[len(path)-2] + + // Calculate the vector between the last two points + dx := dstPoint.X - prevPoint.X + dy := dstPoint.Y - prevPoint.Y + + // Calculate the perpendicular vector (rotated 90 degrees counter-clockwise) + // This gives us the center direction of the circular arc + centerDirX := -dy + centerDirY := dx + + // Normalize the center direction vector + centerLength := math.Hypot(centerDirX, centerDirY) + if centerLength > 0 { + centerDirX /= centerLength + centerDirY /= centerLength + } + + // Calculate the tangent direction (perpendicular to center direction) + tangentX := -centerDirY + tangentY := centerDirX + + // Adjust the penultimate point to create proper arrow alignment + step := 10.0 + newPrevX := dstPoint.X - tangentX*step + newPrevY := dstPoint.Y - tangentY*step + + // Update the path with the adjusted point + path[len(path)-2] = geo.NewPoint(newPrevX, newPrevY) } +edge.Route = path +edge.IsCurve = true +} // clampPointOutsideBox walks forward along the path until it finds a point outside the box, // then replaces the point with a precise intersection. diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json b/e2etests/testdata/txtar/cycle-diagram/dagre/board.exp.json index 78ed2dffe..3a9f3504b 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": 197.02099609375, - "y": -34.3849983215332 + "x": 198.8939971923828, + "y": -23.135000228881836 }, { "x": 197.2519989013672, @@ -1228,8 +1228,8 @@ "y": 197.53700256347656 }, { - "x": 28.18000030517578, - "y": 198.00399780273438 + "x": 16.589000701904297, + "y": 199.56100463867188 }, { "x": 26.5, @@ -1592,8 +1592,8 @@ "y": 37.47600173950195 }, { - "x": -197.02099609375, - "y": 34.3849983215332 + "x": -198.8939971923828, + "y": 23.135000228881836 }, { "x": -197.2519989013672, @@ -1972,8 +1972,8 @@ "y": 111.8030014038086 }, { - "x": 701.875, - "y": 115.77300262451172 + "x": 698.0460205078125, + "y": 126.40799713134766 }, { "x": 701.4329833984375, @@ -2336,8 +2336,8 @@ "y": 186.90899658203125 }, { - "x": 364.3710021972656, - "y": 183.8260040283203 + "x": 357.02899169921875, + "y": 175.4980010986328 }, { "x": 363.6419982910156, @@ -2740,8 +2740,8 @@ "y": 196.45700073242188 }, { - "x": 1003.2860107421875, - "y": 197.53700256347656 + "x": 988.5989990234375, + "y": 199.6269989013672 }, { "x": 998.5, diff --git a/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/dagre/sketch.exp.svg index 015478d74..408ede6d2 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-809410311 .fill-N1{fill:#0A0F25;} + .d2-809410311 .fill-N2{fill:#676C7E;} + .d2-809410311 .fill-N3{fill:#9499AB;} + .d2-809410311 .fill-N4{fill:#CFD2DD;} + .d2-809410311 .fill-N5{fill:#DEE1EB;} + .d2-809410311 .fill-N6{fill:#EEF1F8;} + .d2-809410311 .fill-N7{fill:#FFFFFF;} + .d2-809410311 .fill-B1{fill:#0D32B2;} + .d2-809410311 .fill-B2{fill:#0D32B2;} + .d2-809410311 .fill-B3{fill:#E3E9FD;} + .d2-809410311 .fill-B4{fill:#E3E9FD;} + .d2-809410311 .fill-B5{fill:#EDF0FD;} + .d2-809410311 .fill-B6{fill:#F7F8FE;} + .d2-809410311 .fill-AA2{fill:#4A6FF3;} + .d2-809410311 .fill-AA4{fill:#EDF0FD;} + .d2-809410311 .fill-AA5{fill:#F7F8FE;} + .d2-809410311 .fill-AB4{fill:#EDF0FD;} + .d2-809410311 .fill-AB5{fill:#F7F8FE;} + .d2-809410311 .stroke-N1{stroke:#0A0F25;} + .d2-809410311 .stroke-N2{stroke:#676C7E;} + .d2-809410311 .stroke-N3{stroke:#9499AB;} + .d2-809410311 .stroke-N4{stroke:#CFD2DD;} + .d2-809410311 .stroke-N5{stroke:#DEE1EB;} + .d2-809410311 .stroke-N6{stroke:#EEF1F8;} + .d2-809410311 .stroke-N7{stroke:#FFFFFF;} + .d2-809410311 .stroke-B1{stroke:#0D32B2;} + .d2-809410311 .stroke-B2{stroke:#0D32B2;} + .d2-809410311 .stroke-B3{stroke:#E3E9FD;} + .d2-809410311 .stroke-B4{stroke:#E3E9FD;} + .d2-809410311 .stroke-B5{stroke:#EDF0FD;} + .d2-809410311 .stroke-B6{stroke:#F7F8FE;} + .d2-809410311 .stroke-AA2{stroke:#4A6FF3;} + .d2-809410311 .stroke-AA4{stroke:#EDF0FD;} + .d2-809410311 .stroke-AA5{stroke:#F7F8FE;} + .d2-809410311 .stroke-AB4{stroke:#EDF0FD;} + .d2-809410311 .stroke-AB5{stroke:#F7F8FE;} + .d2-809410311 .background-color-N1{background-color:#0A0F25;} + .d2-809410311 .background-color-N2{background-color:#676C7E;} + .d2-809410311 .background-color-N3{background-color:#9499AB;} + .d2-809410311 .background-color-N4{background-color:#CFD2DD;} + .d2-809410311 .background-color-N5{background-color:#DEE1EB;} + .d2-809410311 .background-color-N6{background-color:#EEF1F8;} + .d2-809410311 .background-color-N7{background-color:#FFFFFF;} + .d2-809410311 .background-color-B1{background-color:#0D32B2;} + .d2-809410311 .background-color-B2{background-color:#0D32B2;} + .d2-809410311 .background-color-B3{background-color:#E3E9FD;} + .d2-809410311 .background-color-B4{background-color:#E3E9FD;} + .d2-809410311 .background-color-B5{background-color:#EDF0FD;} + .d2-809410311 .background-color-B6{background-color:#F7F8FE;} + .d2-809410311 .background-color-AA2{background-color:#4A6FF3;} + .d2-809410311 .background-color-AA4{background-color:#EDF0FD;} + .d2-809410311 .background-color-AA5{background-color:#F7F8FE;} + .d2-809410311 .background-color-AB4{background-color:#EDF0FD;} + .d2-809410311 .background-color-AB5{background-color:#F7F8FE;} + .d2-809410311 .color-N1{color:#0A0F25;} + .d2-809410311 .color-N2{color:#676C7E;} + .d2-809410311 .color-N3{color:#9499AB;} + .d2-809410311 .color-N4{color:#CFD2DD;} + .d2-809410311 .color-N5{color:#DEE1EB;} + .d2-809410311 .color-N6{color:#EEF1F8;} + .d2-809410311 .color-N7{color:#FFFFFF;} + .d2-809410311 .color-B1{color:#0D32B2;} + .d2-809410311 .color-B2{color:#0D32B2;} + .d2-809410311 .color-B3{color:#E3E9FD;} + .d2-809410311 .color-B4{color:#E3E9FD;} + .d2-809410311 .color-B5{color:#EDF0FD;} + .d2-809410311 .color-B6{color:#F7F8FE;} + .d2-809410311 .color-AA2{color:#4A6FF3;} + .d2-809410311 .color-AA4{color:#EDF0FD;} + .d2-809410311 .color-AA5{color:#F7F8FE;} + .d2-809410311 .color-AB4{color:#EDF0FD;} + .d2-809410311 .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-809410311);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-809410311);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-809410311);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-809410311);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-809410311);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-809410311);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-809410311);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-809410311);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-809410311);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 6eb058a84..3c71bae17 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": 209.02099609375, - "y": -22.385000228881836 + "x": 210.8939971923828, + "y": -11.135000228881836 }, { "x": 209.2519989013672, @@ -1228,8 +1228,8 @@ "y": 209.53700256347656 }, { - "x": 40.18000030517578, - "y": 210.00399780273438 + "x": 28.589000701904297, + "y": 211.56100463867188 }, { "x": 38.5, @@ -1592,8 +1592,8 @@ "y": 49.47600173950195 }, { - "x": -185.02099609375, - "y": 46.3849983215332 + "x": -186.8939971923828, + "y": 35.1349983215332 }, { "x": -185.2519989013672, @@ -1972,8 +1972,8 @@ "y": 123.8030014038086 }, { - "x": 674.375, - "y": 127.77300262451172 + "x": 670.5460205078125, + "y": 138.4080047607422 }, { "x": 673.9329833984375, @@ -2336,8 +2336,8 @@ "y": 198.90899658203125 }, { - "x": 336.8710021972656, - "y": 195.8260040283203 + "x": 329.52899169921875, + "y": 187.4980010986328 }, { "x": 336.1419982910156, @@ -2740,8 +2740,8 @@ "y": 208.45700073242188 }, { - "x": 936.197021484375, - "y": 209.53700256347656 + "x": 921.5089721679688, + "y": 211.6269989013672 }, { "x": 931.4099731445312, diff --git a/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg b/e2etests/testdata/txtar/cycle-diagram/elk/sketch.exp.svg index 21e65f752..ebcfc05cf 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-301116794 .fill-N1{fill:#0A0F25;} + .d2-301116794 .fill-N2{fill:#676C7E;} + .d2-301116794 .fill-N3{fill:#9499AB;} + .d2-301116794 .fill-N4{fill:#CFD2DD;} + .d2-301116794 .fill-N5{fill:#DEE1EB;} + .d2-301116794 .fill-N6{fill:#EEF1F8;} + .d2-301116794 .fill-N7{fill:#FFFFFF;} + .d2-301116794 .fill-B1{fill:#0D32B2;} + .d2-301116794 .fill-B2{fill:#0D32B2;} + .d2-301116794 .fill-B3{fill:#E3E9FD;} + .d2-301116794 .fill-B4{fill:#E3E9FD;} + .d2-301116794 .fill-B5{fill:#EDF0FD;} + .d2-301116794 .fill-B6{fill:#F7F8FE;} + .d2-301116794 .fill-AA2{fill:#4A6FF3;} + .d2-301116794 .fill-AA4{fill:#EDF0FD;} + .d2-301116794 .fill-AA5{fill:#F7F8FE;} + .d2-301116794 .fill-AB4{fill:#EDF0FD;} + .d2-301116794 .fill-AB5{fill:#F7F8FE;} + .d2-301116794 .stroke-N1{stroke:#0A0F25;} + .d2-301116794 .stroke-N2{stroke:#676C7E;} + .d2-301116794 .stroke-N3{stroke:#9499AB;} + .d2-301116794 .stroke-N4{stroke:#CFD2DD;} + .d2-301116794 .stroke-N5{stroke:#DEE1EB;} + .d2-301116794 .stroke-N6{stroke:#EEF1F8;} + .d2-301116794 .stroke-N7{stroke:#FFFFFF;} + .d2-301116794 .stroke-B1{stroke:#0D32B2;} + .d2-301116794 .stroke-B2{stroke:#0D32B2;} + .d2-301116794 .stroke-B3{stroke:#E3E9FD;} + .d2-301116794 .stroke-B4{stroke:#E3E9FD;} + .d2-301116794 .stroke-B5{stroke:#EDF0FD;} + .d2-301116794 .stroke-B6{stroke:#F7F8FE;} + .d2-301116794 .stroke-AA2{stroke:#4A6FF3;} + .d2-301116794 .stroke-AA4{stroke:#EDF0FD;} + .d2-301116794 .stroke-AA5{stroke:#F7F8FE;} + .d2-301116794 .stroke-AB4{stroke:#EDF0FD;} + .d2-301116794 .stroke-AB5{stroke:#F7F8FE;} + .d2-301116794 .background-color-N1{background-color:#0A0F25;} + .d2-301116794 .background-color-N2{background-color:#676C7E;} + .d2-301116794 .background-color-N3{background-color:#9499AB;} + .d2-301116794 .background-color-N4{background-color:#CFD2DD;} + .d2-301116794 .background-color-N5{background-color:#DEE1EB;} + .d2-301116794 .background-color-N6{background-color:#EEF1F8;} + .d2-301116794 .background-color-N7{background-color:#FFFFFF;} + .d2-301116794 .background-color-B1{background-color:#0D32B2;} + .d2-301116794 .background-color-B2{background-color:#0D32B2;} + .d2-301116794 .background-color-B3{background-color:#E3E9FD;} + .d2-301116794 .background-color-B4{background-color:#E3E9FD;} + .d2-301116794 .background-color-B5{background-color:#EDF0FD;} + .d2-301116794 .background-color-B6{background-color:#F7F8FE;} + .d2-301116794 .background-color-AA2{background-color:#4A6FF3;} + .d2-301116794 .background-color-AA4{background-color:#EDF0FD;} + .d2-301116794 .background-color-AA5{background-color:#F7F8FE;} + .d2-301116794 .background-color-AB4{background-color:#EDF0FD;} + .d2-301116794 .background-color-AB5{background-color:#F7F8FE;} + .d2-301116794 .color-N1{color:#0A0F25;} + .d2-301116794 .color-N2{color:#676C7E;} + .d2-301116794 .color-N3{color:#9499AB;} + .d2-301116794 .color-N4{color:#CFD2DD;} + .d2-301116794 .color-N5{color:#DEE1EB;} + .d2-301116794 .color-N6{color:#EEF1F8;} + .d2-301116794 .color-N7{color:#FFFFFF;} + .d2-301116794 .color-B1{color:#0D32B2;} + .d2-301116794 .color-B2{color:#0D32B2;} + .d2-301116794 .color-B3{color:#E3E9FD;} + .d2-301116794 .color-B4{color:#E3E9FD;} + .d2-301116794 .color-B5{color:#EDF0FD;} + .d2-301116794 .color-B6{color:#F7F8FE;} + .d2-301116794 .color-AA2{color:#4A6FF3;} + .d2-301116794 .color-AA4{color:#EDF0FD;} + .d2-301116794 .color-AA5{color:#F7F8FE;} + .d2-301116794 .color-AB4{color:#EDF0FD;} + .d2-301116794 .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-301116794);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-301116794);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-301116794);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-301116794);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-301116794);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-301116794);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-301116794);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-301116794);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcab