From 019429edcf6272ca72ba94d830244f3ec6e47dd5 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Fri, 10 Feb 2023 21:45:31 -0800 Subject: [PATCH] try different value --- d2layouts/d2dagrelayout/layout.go | 2 +- .../testdata/all_shapes/sketch.exp.svg | 6 +- .../d2sketch/testdata/animated/sketch.exp.svg | 6 +- .../testdata/arrowheads/sketch.exp.svg | 24 +- .../testdata/child_to_child/sketch.exp.svg | 6 +- .../testdata/crows_feet/sketch.exp.svg | 6 +- .../d2sketch/testdata/opacity/sketch.exp.svg | 12 +- .../testdata/sql_tables/sketch.exp.svg | 50 +- .../d2sketch/testdata/twitter/sketch.exp.svg | 22 +- .../dagre/board.exp.json | 4 +- .../dagre/sketch.exp.svg | 10 +- .../dagre/board.exp.json | 38 +- .../dagre/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 44 +- .../dagre/sketch.exp.svg | 14 +- .../dagre_special_ids/dagre/board.exp.json | 44 +- .../dagre_special_ids/dagre/sketch.exp.svg | 6 +- .../elk_alignment/dagre/board.exp.json | 94 +- .../elk_alignment/dagre/sketch.exp.svg | 22 +- .../dagre/board.exp.json | 2 +- .../dagre/sketch.exp.svg | 6 +- .../elk_loop_panic/dagre/board.exp.json | 40 +- .../elk_loop_panic/dagre/sketch.exp.svg | 6 +- .../regression/elk_order/dagre/board.exp.json | 56 +- .../regression/elk_order/dagre/sketch.exp.svg | 14 +- .../empty_class_height/dagre/board.exp.json | 2 +- .../empty_class_height/dagre/sketch.exp.svg | 6 +- .../opacity-on-label/dagre/board.exp.json | 2 +- .../opacity-on-label/dagre/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 52 +- .../dagre/sketch.exp.svg | 14 +- .../sql_table_overflow/dagre/board.exp.json | 2 +- .../sql_table_overflow/dagre/sketch.exp.svg | 14 +- .../sanity/1_to_2/dagre/board.exp.json | 16 +- .../sanity/1_to_2/dagre/sketch.exp.svg | 6 +- .../child_to_child/dagre/board.exp.json | 22 +- .../child_to_child/dagre/sketch.exp.svg | 6 +- .../stable/all_shapes/dagre/board.exp.json | 100 +- .../stable/all_shapes/dagre/sketch.exp.svg | 6 +- .../all_shapes_multiple/dagre/board.exp.json | 100 +- .../all_shapes_multiple/dagre/sketch.exp.svg | 6 +- .../all_shapes_shadow/dagre/board.exp.json | 100 +- .../all_shapes_shadow/dagre/sketch.exp.svg | 6 +- .../stable/animated/dagre/board.exp.json | 84 +- .../stable/animated/dagre/sketch.exp.svg | 8 +- .../arrowhead_adjustment/dagre/board.exp.json | 60 +- .../arrowhead_adjustment/dagre/sketch.exp.svg | 6 +- .../stable/binary_tree/dagre/board.exp.json | 160 +- .../stable/binary_tree/dagre/sketch.exp.svg | 6 +- .../stable/border-radius/dagre/board.exp.json | 2 +- .../stable/border-radius/dagre/sketch.exp.svg | 6 +- .../stable/chaos1/dagre/board.exp.json | 30 +- .../stable/chaos1/dagre/sketch.exp.svg | 10 +- .../stable/chaos2/dagre/board.exp.json | 206 +- .../stable/chaos2/dagre/sketch.exp.svg | 22 +- .../circle_arrowhead/dagre/board.exp.json | 12 +- .../circle_arrowhead/dagre/sketch.exp.svg | 8 +- .../complex-layers/dagre/board.exp.json | 28 +- .../complex-layers/dagre/sketch.exp.svg | 6 +- .../connected_container/dagre/board.exp.json | 48 +- .../connected_container/dagre/sketch.exp.svg | 6 +- .../constant_near_title/dagre/board.exp.json | 46 +- .../constant_near_title/dagre/sketch.exp.svg | 8 +- .../container_edges/dagre/board.exp.json | 76 +- .../container_edges/dagre/sketch.exp.svg | 6 +- .../crow_foot_arrowhead/dagre/board.exp.json | 154 +- .../crow_foot_arrowhead/dagre/sketch.exp.svg | 6 +- .../stable/dense/dagre/board.exp.json | 360 ++-- .../stable/dense/dagre/sketch.exp.svg | 6 +- .../different_subgraphs/dagre/board.exp.json | 184 +- .../different_subgraphs/dagre/sketch.exp.svg | 6 +- .../stable/direction/dagre/board.exp.json | 124 +- .../stable/direction/dagre/sketch.exp.svg | 6 +- .../stable/font_sizes/dagre/board.exp.json | 36 +- .../stable/font_sizes/dagre/sketch.exp.svg | 10 +- .../dagre/board.exp.json | 10 +- .../dagre/sketch.exp.svg | 4 +- .../stable/investigate/dagre/board.exp.json | 662 +++--- .../stable/investigate/dagre/sketch.exp.svg | 18 +- .../stable/large_arch/dagre/board.exp.json | 464 ++--- .../stable/large_arch/dagre/sketch.exp.svg | 6 +- .../stable/latex/dagre/board.exp.json | 54 +- .../stable/latex/dagre/sketch.exp.svg | 8 +- .../markdown_stroke_fill/dagre/board.exp.json | 14 +- .../markdown_stroke_fill/dagre/sketch.exp.svg | 10 +- .../md_2space_newline/dagre/board.exp.json | 4 +- .../md_2space_newline/dagre/sketch.exp.svg | 8 +- .../md_backslash_newline/dagre/board.exp.json | 4 +- .../md_backslash_newline/dagre/sketch.exp.svg | 8 +- .../multiple_trees/dagre/board.exp.json | 248 +-- .../multiple_trees/dagre/sketch.exp.svg | 6 +- .../stable/n22_e32/dagre/board.exp.json | 544 ++--- .../stable/n22_e32/dagre/sketch.exp.svg | 6 +- .../number_connections/dagre/board.exp.json | 12 +- .../number_connections/dagre/sketch.exp.svg | 6 +- .../one_container_loop/dagre/board.exp.json | 130 +- .../one_container_loop/dagre/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 78 +- .../dagre/sketch.exp.svg | 6 +- .../dagre/board.exp.json | 94 +- .../dagre/sketch.exp.svg | 18 +- .../stable/people/dagre/board.exp.json | 22 +- .../stable/people/dagre/sketch.exp.svg | 6 +- .../self-referencing/dagre/board.exp.json | 118 +- .../self-referencing/dagre/sketch.exp.svg | 8 +- .../sequence_diagrams/dagre/board.exp.json | 278 +-- .../sequence_diagrams/dagre/sketch.exp.svg | 30 +- .../dagre/board.exp.json | 6 +- .../dagre/sketch.exp.svg | 62 +- .../stable/sql_tables/dagre/board.exp.json | 34 +- .../stable/sql_tables/dagre/sketch.exp.svg | 50 +- .../dagre/board.exp.json | 228 +-- .../dagre/sketch.exp.svg | 6 +- .../text_font_sizes/dagre/board.exp.json | 16 +- .../text_font_sizes/dagre/sketch.exp.svg | 6 +- .../stable/us_map/dagre/board.exp.json | 1796 ++++++++--------- .../stable/us_map/dagre/sketch.exp.svg | 6 +- .../child_parent_edges/dagre/board.exp.json | 84 +- .../child_parent_edges/dagre/sketch.exp.svg | 6 +- .../container_child_edge/dagre/board.exp.json | 22 +- .../container_child_edge/dagre/sketch.exp.svg | 10 +- .../container_icon_label/dagre/board.exp.json | 26 +- .../container_icon_label/dagre/sketch.exp.svg | 6 +- .../container_label_loop/dagre/board.exp.json | 48 +- .../container_label_loop/dagre/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 100 +- .../dagre/sketch.exp.svg | 56 +- 127 files changed, 4104 insertions(+), 4104 deletions(-) diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index d8e0476ab..a3d943200 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -41,7 +41,7 @@ type ConfigurableOpts struct { } var DefaultOpts = ConfigurableOpts{ - NodeSep: 40, + NodeSep: 60, EdgeSep: 20, } diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index 8835236a2..6e4e30c89 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/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="1310" height="712" viewBox="-102 -102 1310 712"> \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json index 8ed66324b..7eefdfb9a 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json @@ -9,7 +9,7 @@ "x": 0, "y": 41 }, - "width": 226, + "width": 266, "height": 125, "opacity": 1, "strokeDash": 0, @@ -47,7 +47,7 @@ "id": "x.a", "type": "rectangle", "pos": { - "x": 30, + "x": 40, "y": 70 }, "width": 53, @@ -88,7 +88,7 @@ "id": "x.b", "type": "rectangle", "pos": { - "x": 143, + "x": 173, "y": 70 }, "width": 53, @@ -153,56 +153,56 @@ "labelPercentage": 0, "route": [ { - "x": 83, - "y": 84.69354838709677 + "x": 93, + "y": 87.05172413793103 }, { - "x": 99, - "y": 73.33870967741936 + "x": 114.33333333333334, + "y": 73.8103448275862 }, { - "x": 104, + "x": 121, "y": 70.5 }, { - "x": 105.5, + "x": 123, "y": 70.5 }, { - "x": 107, + "x": 125.00000000000001, "y": 70.5 }, { - "x": 109, + "x": 127.66666666666667, "y": 77.1 }, { - "x": 110.5, + "x": 129.66666666666669, "y": 87 }, { - "x": 112, + "x": 131.66666666666666, "y": 96.9 }, { - "x": 112, + "x": 131.66666666666666, "y": 110.1 }, { - "x": 110.5, + "x": 129.66666666666669, "y": 120 }, { - "x": 109, + "x": 127.66666666666667, "y": 129.9 }, { - "x": 99, - "y": 133.66129032258064 + "x": 114.33333333333334, + "y": 133.18965517241378 }, { - "x": 83, - "y": 122.30645161290323 + "x": 93, + "y": 119.94827586206897 } ], "isCurve": true, diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg index 40f7e5ee1..636457be9 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/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="430" height="368" viewBox="-102 -100 430 368">

Oldest message

-

Offset

-

Last message

-

Next message will be
+

Oldest message

+

Offset

+

Last message

+

Next message will be
inserted here

-
M0M1M2M3M4M5M6 - +
M0M1M2M3M4M5M6 + x

linux: because a PC is a terrible thing to waste

-
a You don't have to know how the computer works,just how to work the computer. - +x

linux: because a PC is a terrible thing to waste

+
a You don't have to know how the computer works,just how to work the computer. + aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - +aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + + + + + + + + + poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

-
 - +poll the peopleresultsunfavorablefavorablewill of the people

A winning strategy

+
 + mixed togethersugarsolution we get - - +mixed togethersugarsolution we get + + container

they did it in style

-

a header

+container

they did it in style

+

a header

a line of text and an

{
 	indented: "block",
@@ -805,8 +805,8 @@ width="476" height="684" viewBox="-102 -100 476 684">markdown
Lorem ipsum dolor sit amet, consectetur adipiscing elit,

+markdown
Lorem ipsum dolor sit amet, consectetur adipiscing elit,

 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-

-
+

+
 
 markdown
Lorem ipsum dolor sit amet, consectetur adipiscing elit,

+markdown
Lorem ipsum dolor sit amet, consectetur adipiscing elit,

 sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

-

-
+

+
 
 bearmama bearpapa bear  
-
+bearmama bearpapa bear  
+
 
 containerscloudtall cylinderclass-
-num
-int-
-timeout
-int-
-pid
-+
-getStatus()
-Enum+
-getJobs()
-Job[]+
-setTimeout(seconds int)
-voidusersid
-int
-name
-string
-email
-string
-password
-string
-last_login
-datetime
-container
markdown text expanded to 800x400

-
a := 5
+containerscloudtall cylinderclass-
+num
+int-
+timeout
+int-
+pid
++
+getStatus()
+Enum+
+getJobs()
+Job[]+
+setTimeout(seconds int)
+voidusersid
+int
+name
+string
+email
+string
+password
+string
+last_login
+datetime
+container
markdown text expanded to 800x400

+
a := 5
 b := a + 7
-fmt.Printf("%d", b)a := 5
+fmt.Printf("%d", b)a := 5
 b := a + 7
-fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval  
-
+fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval  
+