From 72b6101fbf4df5b36bf99cc16422e949a6c76c6a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 13:55:00 -0800 Subject: [PATCH] fix shifting --- d2layouts/d2sequence/sequence_diagram.go | 2 + .../dagre/board.exp.json | 28 +++++----- .../dagre/sketch.exp.svg | 6 +-- .../elk/board.exp.json | 28 +++++----- .../elk/sketch.exp.svg | 6 +-- .../dagre/board.exp.json | 8 +-- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 8 +-- .../elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 52 +++++++++---------- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 52 +++++++++---------- .../elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 16 +++--- .../dagre/sketch.exp.svg | 4 +- .../sequence_diagram_note/elk/board.exp.json | 16 +++--- .../sequence_diagram_note/elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 8 +-- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_real/elk/board.exp.json | 8 +-- .../sequence_diagram_real/elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 20 +++---- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 20 +++---- .../elk/sketch.exp.svg | 4 +- 25 files changed, 158 insertions(+), 156 deletions(-) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index feedea323..2ed3e5950 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -537,6 +537,8 @@ func (sd *sequenceDiagram) getHeight() float64 { func (sd *sequenceDiagram) shift(tl *geo.Point) { allObjects := append([]*d2graph.Object{}, sd.actors...) allObjects = append(allObjects, sd.spans...) + allObjects = append(allObjects, sd.groups...) + allObjects = append(allObjects, sd.notes...) for _, obj := range allObjects { obj.TopLeft.X += tl.X obj.TopLeft.Y += tl.Y diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json index 42ec43bf8..00aca25ac 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -165,8 +165,8 @@ "id": "ggg", "type": "", "pos": { - "x": 25, - "y": 396 + "x": 49, + "y": 420 }, "width": 350, "height": 80, @@ -204,8 +204,8 @@ "id": "group 1", "type": "", "pos": { - "x": 251, - "y": 526 + "x": 275, + "y": 550 }, "width": 398, "height": 730, @@ -243,8 +243,8 @@ "id": "group 1.nested guy", "type": "", "pos": { - "x": 275, - "y": 786 + "x": 299, + "y": 810 }, "width": 350, "height": 80, @@ -282,8 +282,8 @@ "id": "group b", "type": "", "pos": { - "x": 275, - "y": 1306 + "x": 299, + "y": 1330 }, "width": 468, "height": 466, @@ -321,8 +321,8 @@ "id": "c.what would arnold say", "type": "rectangle", "pos": { - "x": 446, - "y": 1476 + "x": 470, + "y": 1500 }, "width": 257, "height": 126, @@ -361,8 +361,8 @@ "id": "choo", "type": "", "pos": { - "x": 693, - "y": 1822 + "x": 717, + "y": 1846 }, "width": 254, "height": 216, @@ -400,8 +400,8 @@ "id": "d.this note", "type": "rectangle", "pos": { - "x": 743, - "y": 1862 + "x": 767, + "y": 1886 }, "width": 164, "height": 126, diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg index 0016febae..baad6e566 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -2,7 +2,7 @@ abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json index 42ec43bf8..00aca25ac 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -165,8 +165,8 @@ "id": "ggg", "type": "", "pos": { - "x": 25, - "y": 396 + "x": 49, + "y": 420 }, "width": 350, "height": 80, @@ -204,8 +204,8 @@ "id": "group 1", "type": "", "pos": { - "x": 251, - "y": 526 + "x": 275, + "y": 550 }, "width": 398, "height": 730, @@ -243,8 +243,8 @@ "id": "group 1.nested guy", "type": "", "pos": { - "x": 275, - "y": 786 + "x": 299, + "y": 810 }, "width": 350, "height": 80, @@ -282,8 +282,8 @@ "id": "group b", "type": "", "pos": { - "x": 275, - "y": 1306 + "x": 299, + "y": 1330 }, "width": 468, "height": 466, @@ -321,8 +321,8 @@ "id": "c.what would arnold say", "type": "rectangle", "pos": { - "x": 446, - "y": 1476 + "x": 470, + "y": 1500 }, "width": 257, "height": 126, @@ -361,8 +361,8 @@ "id": "choo", "type": "", "pos": { - "x": 693, - "y": 1822 + "x": 717, + "y": 1846 }, "width": 254, "height": 216, @@ -400,8 +400,8 @@ "id": "d.this note", "type": "rectangle", "pos": { - "x": 743, - "y": 1862 + "x": 767, + "y": 1886 }, "width": 164, "height": 126, diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg index 0016febae..baad6e566 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -2,7 +2,7 @@ abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json index c88a71bf9..d423c7d1d 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json @@ -45,8 +45,8 @@ "id": "b.note", "type": "rectangle", "pos": { - "x": -187, - "y": 436 + "x": -163, + "y": 460 }, "width": 525, "height": 126, @@ -125,8 +125,8 @@ "id": "a.note", "type": "rectangle", "pos": { - "x": 319, - "y": 692 + "x": 343, + "y": 716 }, "width": 137, "height": 190, diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg index d745a335b..e341c6b43 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg @@ -2,7 +2,7 @@ abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier +abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json index e4d793745..39b144a5b 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -325,8 +325,8 @@ "id": "How this is rendered.d2compiler.measurements also take place", "type": "rectangle", "pos": { - "x": 421, - "y": 732 + "x": 457, + "y": 768 }, "width": 307, "height": 126, @@ -365,8 +365,8 @@ "id": "How this is rendered.only if root is not sequence", "type": "", "pos": { - "x": 781, - "y": 1338 + "x": 817, + "y": 1374 }, "width": 1365, "height": 80, diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index ad5662304..f2f4d06d7 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -18,7 +18,7 @@ width="2447" height="2536" viewBox="-88 -88 2447 2536">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json index 1c9c641a1..bf9dc2e70 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json @@ -125,8 +125,8 @@ "id": "this is a message group", "type": "", "pos": { - "x": -71, - "y": 396 + "x": -47, + "y": 420 }, "width": 542, "height": 696, @@ -164,8 +164,8 @@ "id": "this is a message group.and this is a nested message group", "type": "", "pos": { - "x": -47, - "y": 526 + "x": -23, + "y": 550 }, "width": 494, "height": 542, @@ -203,8 +203,8 @@ "id": "this is a message group.and this is a nested message group.what about more nesting", "type": "", "pos": { - "x": -23, - "y": 656 + "x": 1, + "y": 680 }, "width": 446, "height": 388, @@ -242,8 +242,8 @@ "id": "this is a message group.and this is a nested message group.what about more nesting.yo", "type": "", "pos": { - "x": 1, - "y": 786 + "x": 25, + "y": 810 }, "width": 398, "height": 234, @@ -281,8 +281,8 @@ "id": "this is a message group.and this is a nested message group.what about more nesting.yo.yo", "type": "", "pos": { - "x": 25, - "y": 916 + "x": 49, + "y": 940 }, "width": 350, "height": 80, diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg index c17ac7f6f..45f3f9430 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg @@ -2,7 +2,7 @@