From 1739d79b6b9e93b49b081422dea15efdfef02f88 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 6 Jan 2023 12:19:01 -0800 Subject: [PATCH] fix dagre edge label overlaps --- .../dagre/board.exp.json | 40 +- .../dagre/sketch.exp.svg | 14 +- .../elk_alignment/dagre/board.exp.json | 134 ++-- .../elk_alignment/dagre/sketch.exp.svg | 22 +- .../connection_label/dagre/board.exp.json | 8 +- .../connection_label/dagre/sketch.exp.svg | 8 +- .../arrowhead_labels/dagre/board.exp.json | 8 +- .../arrowhead_labels/dagre/sketch.exp.svg | 8 +- .../stable/chaos1/dagre/board.exp.json | 40 +- .../stable/chaos1/dagre/sketch.exp.svg | 10 +- .../stable/chaos2/dagre/board.exp.json | 316 ++++----- .../stable/chaos2/dagre/sketch.exp.svg | 22 +- .../stable/font_colors/dagre/board.exp.json | 8 +- .../stable/font_colors/dagre/sketch.exp.svg | 8 +- .../stable/font_sizes/dagre/board.exp.json | 24 +- .../stable/font_sizes/dagre/sketch.exp.svg | 12 +- .../stable/investigate/dagre/board.exp.json | 630 +++++++++--------- .../stable/investigate/dagre/sketch.exp.svg | 18 +- .../stable/latex/dagre/board.exp.json | 8 +- .../stable/latex/dagre/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 92 +-- .../dagre/sketch.exp.svg | 18 +- .../self-referencing/dagre/board.exp.json | 30 +- .../self-referencing/dagre/sketch.exp.svg | 8 +- .../stable/stylish/dagre/board.exp.json | 8 +- .../stable/stylish/dagre/sketch.exp.svg | 12 +- .../container_child_edge/dagre/board.exp.json | 34 +- .../container_child_edge/dagre/sketch.exp.svg | 10 +- .../font_sizes_large/dagre/board.exp.json | 42 +- .../font_sizes_large/dagre/sketch.exp.svg | 14 +- .../todo/tall_edge_label/dagre/board.exp.json | 8 +- .../todo/tall_edge_label/dagre/sketch.exp.svg | 8 +- 32 files changed, 815 insertions(+), 815 deletions(-) diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json index 0ba8aaac5..2eb8b7fa0 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json @@ -9,7 +9,7 @@ "x": 0, "y": 0 }, - "width": 2148, + "width": 2628, "height": 237, "opacity": 1, "strokeDash": 0, @@ -86,7 +86,7 @@ "id": "build_workflow.GHA", "type": "", "pos": { - "x": 644, + "x": 698, "y": 50 }, "width": 269, @@ -126,7 +126,7 @@ "id": "build_workflow.S3", "type": "", "pos": { - "x": 1122, + "x": 1314, "y": 50 }, "width": 131, @@ -166,7 +166,7 @@ "id": "build_workflow.Terraform", "type": "", "pos": { - "x": 1462, + "x": 1773, "y": 50 }, "width": 218, @@ -206,7 +206,7 @@ "id": "build_workflow.AWS", "type": "", "pos": { - "x": 1889, + "x": 2369, "y": 50 }, "width": 155, @@ -274,15 +274,15 @@ "y": 118.5 }, { - "x": 518.3, + "x": 539.9, "y": 118.5 }, { - "x": 559.9, + "x": 592.3, "y": 118.5 }, { - "x": 643.5, + "x": 697.5, "y": 118.5 } ], @@ -318,19 +318,19 @@ "labelPercentage": 0, "route": [ { - "x": 913.5, + "x": 966.5, "y": 118.5 }, { - "x": 996.3, + "x": 1105.3, "y": 118.5 }, { - "x": 1037.9, + "x": 1174.7, "y": 118.5 }, { - "x": 1121.5, + "x": 1313.5, "y": 118.5 } ], @@ -366,19 +366,19 @@ "labelPercentage": 0, "route": [ { - "x": 1253.5, + "x": 1445.5, "y": 118.5 }, { - "x": 1336.3, + "x": 1575.9, "y": 118.5 }, { - "x": 1377.9, + "x": 1641.3, "y": 118.5 }, { - "x": 1461.5, + "x": 1772.5, "y": 118.5 } ], @@ -414,19 +414,19 @@ "labelPercentage": 0, "route": [ { - "x": 1680.5, + "x": 1991.5, "y": 118.5 }, { - "x": 1763.3, + "x": 2141.9, "y": 118.5 }, { - "x": 1804.9, + "x": 2217.3, "y": 118.5 }, { - "x": 1888.5, + "x": 2368.5, "y": 118.5 } ], diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg index 5815a5190..1e7b73085 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg @@ -3,7 +3,7 @@ id="d2-svg" style="background: white;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" -width="2352" height="441" viewBox="-102 -102 2352 441">aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + mixed togethersugarsolution we get - - +mixed togethersugarsolution we get + +