From 5489733e2d3b2d3a5a9f66ccda45ef70b8361896 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 28 Nov 2022 21:42:55 -0800 Subject: [PATCH] 2022-11-28 09:42:55PM --- .../testdata/sanity/1_to_2/elk/board.exp.json | 36 +- .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 4 +- .../testdata/sanity/basic/elk/board.exp.json | 12 +- .../testdata/sanity/basic/elk/sketch.exp.svg | 4 +- .../sanity/child_to_child/elk/board.exp.json | 20 +- .../sanity/child_to_child/elk/sketch.exp.svg | 4 +- .../connection_label/elk/board.exp.json | 12 +- .../connection_label/elk/sketch.exp.svg | 10 +- .../stable/all_shapes/elk/board.exp.json | 154 +- .../stable/all_shapes/elk/sketch.exp.svg | 4 +- .../all_shapes_multiple/elk/board.exp.json | 154 +- .../all_shapes_multiple/elk/sketch.exp.svg | 4 +- .../all_shapes_shadow/elk/board.exp.json | 154 +- .../all_shapes_shadow/elk/sketch.exp.svg | 4 +- .../arrowhead_adjustment/elk/board.exp.json | 88 +- .../arrowhead_adjustment/elk/sketch.exp.svg | 4 +- .../arrowhead_labels/elk/board.exp.json | 14 +- .../arrowhead_labels/elk/sketch.exp.svg | 10 +- .../stable/binary_tree/elk/board.exp.json | 228 +-- .../stable/binary_tree/elk/sketch.exp.svg | 4 +- .../testdata/stable/chaos1/elk/board.exp.json | 40 +- .../testdata/stable/chaos1/elk/sketch.exp.svg | 16 +- .../testdata/stable/chaos2/elk/board.exp.json | 288 ++- .../testdata/stable/chaos2/elk/sketch.exp.svg | 58 +- .../child_parent_edges/elk/board.exp.json | 40 +- .../child_parent_edges/elk/sketch.exp.svg | 4 +- .../circular_dependency/elk/board.exp.json | 40 +- .../circular_dependency/elk/sketch.exp.svg | 4 +- .../stable/code_snippet/elk/board.exp.json | 28 +- .../stable/code_snippet/elk/sketch.exp.svg | 6 +- .../connected_container/elk/board.exp.json | 48 +- .../connected_container/elk/sketch.exp.svg | 4 +- .../stable/container_edges/elk/board.exp.json | 120 +- .../stable/container_edges/elk/sketch.exp.svg | 4 +- .../testdata/stable/dense/elk/board.exp.json | 404 ++-- .../testdata/stable/dense/elk/sketch.exp.svg | 4 +- .../different_subgraphs/elk/board.exp.json | 284 +-- .../different_subgraphs/elk/sketch.exp.svg | 4 +- .../stable/font_colors/elk/board.exp.json | 12 +- .../stable/font_colors/elk/sketch.exp.svg | 10 +- .../giant_markdown_test/elk/board.exp.json | 28 +- .../giant_markdown_test/elk/sketch.exp.svg | 6 +- .../testdata/stable/hr/elk/board.exp.json | 28 +- .../testdata/stable/hr/elk/sketch.exp.svg | 6 +- .../testdata/stable/images/elk/board.exp.json | 12 +- .../testdata/stable/images/elk/sketch.exp.svg | 4 +- .../stable/investigate/elk/board.exp.json | 434 ++-- .../stable/investigate/elk/sketch.exp.svg | 40 +- .../stable/large_arch/elk/board.exp.json | 396 ++-- .../stable/large_arch/elk/sketch.exp.svg | 4 +- .../testdata/stable/latex/elk/board.exp.json | 96 +- .../testdata/stable/latex/elk/sketch.exp.svg | 10 +- .../testdata/stable/li1/elk/board.exp.json | 26 +- .../testdata/stable/li1/elk/sketch.exp.svg | 6 +- .../testdata/stable/li2/elk/board.exp.json | 26 +- .../testdata/stable/li2/elk/sketch.exp.svg | 6 +- .../testdata/stable/li3/elk/board.exp.json | 28 +- .../testdata/stable/li3/elk/sketch.exp.svg | 6 +- .../testdata/stable/li4/elk/board.exp.json | 28 +- .../testdata/stable/li4/elk/sketch.exp.svg | 6 +- .../stable/lone_h1/elk/board.exp.json | 26 +- .../stable/lone_h1/elk/sketch.exp.svg | 6 +- .../stable/markdown/elk/board.exp.json | 28 +- .../stable/markdown/elk/sketch.exp.svg | 6 +- .../md_code_block_fenced/elk/board.exp.json | 26 +- .../md_code_block_fenced/elk/sketch.exp.svg | 6 +- .../md_code_block_indented/elk/board.exp.json | 28 +- .../md_code_block_indented/elk/sketch.exp.svg | 6 +- .../stable/md_code_inline/elk/board.exp.json | 24 +- .../stable/md_code_inline/elk/sketch.exp.svg | 6 +- .../stable/multiple_trees/elk/board.exp.json | 364 ++-- .../stable/multiple_trees/elk/sketch.exp.svg | 4 +- .../stable/n22_e32/elk/board.exp.json | 540 ++--- .../stable/n22_e32/elk/sketch.exp.svg | 4 +- .../one_container_loop/elk/board.exp.json | 116 +- .../one_container_loop/elk/sketch.exp.svg | 4 +- .../elk/board.exp.json | 120 +- .../elk/sketch.exp.svg | 4 +- .../stable/orientation/elk/board.exp.json | 164 +- .../stable/orientation/elk/sketch.exp.svg | 4 +- e2etests/testdata/stable/p/elk/board.exp.json | 26 +- e2etests/testdata/stable/p/elk/sketch.exp.svg | 6 +- .../testdata/stable/pre/elk/board.exp.json | 28 +- .../testdata/stable/pre/elk/sketch.exp.svg | 6 +- .../stable/sql_tables/elk/board.exp.json | 54 +- .../stable/sql_tables/elk/sketch.exp.svg | 64 +- .../stable/square_3d/elk/board.exp.json | 14 +- .../stable/square_3d/elk/sketch.exp.svg | 4 +- .../elk/board.exp.json | 240 +-- .../elk/sketch.exp.svg | 4 +- .../stable/stylish/elk/board.exp.json | 14 +- .../stable/stylish/elk/sketch.exp.svg | 4 +- .../testdata/stable/us_map/elk/board.exp.json | 1808 +++++++++-------- .../testdata/stable/us_map/elk/sketch.exp.svg | 4 +- .../container_child_edge/elk/board.exp.json | 36 +- .../container_child_edge/elk/sketch.exp.svg | 16 +- 96 files changed, 3692 insertions(+), 3660 deletions(-) diff --git a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json index c1d27b8de..6c709942a 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json @@ -5,8 +5,8 @@ "id": "a", "type": "", "pos": { - "x": 12, - "y": 33 + "x": 31, + "y": 12 }, "width": 113, "height": 126, @@ -43,8 +43,8 @@ "id": "b", "type": "", "pos": { - "x": 225, - "y": 12 + "x": 12, + "y": 238 }, "width": 113, "height": 126, @@ -81,8 +81,8 @@ "id": "c", "type": "", "pos": { - "x": 225, - "y": 158 + "x": 145, + "y": 238 }, "width": 113, "height": 126, @@ -143,12 +143,12 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 75 + "x": 68.5, + "y": 138 }, { - "x": 225, - "y": 75 + "x": 68.5, + "y": 238 } ], "animated": false, @@ -181,20 +181,20 @@ "labelPercentage": 0, "route": [ { - "x": 125, - "y": 117 + "x": 106.16666666666667, + "y": 138 }, { - "x": 175, - "y": 117 + "x": 106.16666666666667, + "y": 188 }, { - "x": 175, - "y": 221 + "x": 201.5, + "y": 188 }, { - "x": 225, - "y": 221 + "x": 201.5, + "y": 238 } ], "animated": false, diff --git a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg index 76640f7f2..c6a7e3671 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg @@ -2,7 +2,7 @@ // RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. func RegisterHash(h Hash, f func() hash.Hash) { @@ -22,7 +22,7 @@ width="1382" height="366" viewBox="-88 -88 1382 366">        panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -}xy acfbdhg agdfbhec abcdefghijklmnopq finallyatreeandnodessomemoremanythenhereyouhavehierarchyanotherofnestingtreesatreeinsidehierarchyroot alphabeta - - -gammaab aabbccddllffwwyynniijjkkssuurmeemmmmgghhzzooppqqrrttvvxxabac - - -1 - - -2 - - -3 - - -4 - - -5 - - -6abcdefghiqrjmnoszaabbeeffggklptuwxyccddv abcdefghijklmnopqrstuvw abcdefghijklmnopqrstu acdefgbh topabcbottomstartend bacde21345abcde usersid -int -name -string -email -string -password -string -last_login -datetime -productsid -int -price -decimal -sku -string -name -string -ordersid -int -user_id -int -product_id -int -shipmentsid -int -order_id +usersid +int +name +string +email +string +password +string +last_login +datetime +productsid +int +price +decimal +sku +string +name +string +ordersid +int +user_id +int +product_id +int +shipmentsid int -tracking_number -string -status +order_id +int +tracking_number string - rectanglesquare acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc AKHIALFLGAMSTNAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTNDcontainerfirstsecond - - -1->2 - - -c->2