From d93833a4f1a19f17d0aafc73823167f1798e58f7 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 22:38:43 -0800 Subject: [PATCH] nvm --- d2layouts/d2sequence/sequence_diagram.go | 2 + .../dagre/board.exp.json | 32 +- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 32 +- .../elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 90 ++-- .../dagre/sketch.exp.svg | 14 +- .../elk/board.exp.json | 90 ++-- .../elk/sketch.exp.svg | 14 +- .../dagre/board.exp.json | 108 ++--- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 108 ++--- .../elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 50 +-- .../dagre/sketch.exp.svg | 8 +- .../sequence_diagram_note/elk/board.exp.json | 50 +-- .../sequence_diagram_note/elk/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 114 ++--- .../dagre/sketch.exp.svg | 32 +- .../sequence_diagram_real/elk/board.exp.json | 118 +++--- .../sequence_diagram_real/elk/sketch.exp.svg | 32 +- .../dagre/board.exp.json | 68 +-- .../dagre/sketch.exp.svg | 18 +- .../elk/board.exp.json | 68 +-- .../elk/sketch.exp.svg | 18 +- .../dagre/board.exp.json | 12 +- .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 12 +- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 112 ++--- .../dagre/sketch.exp.svg | 30 +- .../sequence_diagram_span/elk/board.exp.json | 112 ++--- .../sequence_diagram_span/elk/sketch.exp.svg | 30 +- .../sequence_diagrams/dagre/board.exp.json | 394 +++++++++--------- .../sequence_diagrams/dagre/sketch.exp.svg | 54 +-- .../sequence_diagrams/elk/board.exp.json | 360 ++++++++-------- .../sequence_diagrams/elk/sketch.exp.svg | 54 +-- 37 files changed, 1133 insertions(+), 1131 deletions(-) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 0876d8568..a6a704cc2 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -101,7 +101,9 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se sd.objectRank[actor] = rank if actor.Width < MIN_ACTOR_WIDTH { + aspectRatio := actor.Height / actor.Width actor.Width = MIN_ACTOR_WIDTH + actor.Height = math.Round(aspectRatio * actor.Width) } sd.maxActorHeight = math.Max(sd.maxActorHeight, actor.Height) diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json index 73b2fad99..f06d31ed2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json @@ -45,10 +45,10 @@ "type": "oval", "pos": { "x": 223, - "y": 87 + "y": 84 }, "width": 150, - "height": 147, + "height": 150, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,10 +212,10 @@ "type": "cylinder", "pos": { "x": 1269, - "y": 108 + "y": 84 }, "width": 150, - "height": 126, + "height": 150, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -251,10 +251,10 @@ "type": "diamond", "pos": { "x": 1489, - "y": 108 + "y": 85 }, "width": 150, - "height": 126, + "height": 149, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -290,10 +290,10 @@ "type": "document", "pos": { "x": 1709, - "y": 108 + "y": 97 }, "width": 150, - "height": 126, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -368,10 +368,10 @@ "type": "image", "pos": { "x": 2181, - "y": 85 + "y": 63 }, "width": 150, - "height": 128, + "height": 150, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,10 +418,10 @@ "type": "oval", "pos": { "x": 2401, - "y": 108 + "y": 97 }, "width": 150, - "height": 126, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -457,10 +457,10 @@ "type": "package", "pos": { "x": 2621, - "y": 108 + "y": 98 }, "width": 150, - "height": 126, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -730,10 +730,10 @@ "type": "stored_data", "pos": { "x": 4312, - "y": 108 + "y": 96 }, "width": 150, - "height": 126, + "height": 138, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 7e13b2b3a..8cf3cf52b 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -14,13 +14,13 @@ width="4942" height="2984" viewBox="-100 -50 4942 2984">a labelblabelsa class+ +a labelblabelsa class+ public() bool void- private() int voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid int name varchar diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 73b2fad99..f06d31ed2 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -45,10 +45,10 @@ "type": "oval", "pos": { "x": 223, - "y": 87 + "y": 84 }, "width": 150, - "height": 147, + "height": 150, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,10 +212,10 @@ "type": "cylinder", "pos": { "x": 1269, - "y": 108 + "y": 84 }, "width": 150, - "height": 126, + "height": 150, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -251,10 +251,10 @@ "type": "diamond", "pos": { "x": 1489, - "y": 108 + "y": 85 }, "width": 150, - "height": 126, + "height": 149, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -290,10 +290,10 @@ "type": "document", "pos": { "x": 1709, - "y": 108 + "y": 97 }, "width": 150, - "height": 126, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -368,10 +368,10 @@ "type": "image", "pos": { "x": 2181, - "y": 85 + "y": 63 }, "width": 150, - "height": 128, + "height": 150, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,10 +418,10 @@ "type": "oval", "pos": { "x": 2401, - "y": 108 + "y": 97 }, "width": 150, - "height": 126, + "height": 137, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -457,10 +457,10 @@ "type": "package", "pos": { "x": 2621, - "y": 108 + "y": 98 }, "width": 150, - "height": 126, + "height": 136, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -730,10 +730,10 @@ "type": "stored_data", "pos": { "x": 4312, - "y": 108 + "y": 96 }, "width": 150, - "height": 126, + "height": 138, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 7e13b2b3a..8cf3cf52b 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -14,13 +14,13 @@ width="4942" height="2984" viewBox="-100 -50 4942 2984">a labelblabelsa class+ +a labelblabelsa class+ public() bool void- private() int voidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid int name varchar 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 251a8aed9..9a6740045 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -6,10 +6,10 @@ "type": "", "pos": { "x": 0, - "y": 50 + "y": 52 }, "width": 150, - "height": 126, + "height": 167, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -45,10 +45,10 @@ "type": "", "pos": { "x": 220, - "y": 50 + "y": 52 }, "width": 150, - "height": 126, + "height": 167, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -87,7 +87,7 @@ "y": 50 }, "width": 150, - "height": 126, + "height": 169, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -123,10 +123,10 @@ "type": "", "pos": { "x": 660, - "y": 50 + "y": 52 }, "width": 150, - "height": 126, + "height": 167, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -162,7 +162,7 @@ "type": "", "pos": { "x": 25, - "y": 396 + "y": 439 }, "width": 320, "height": 80, @@ -200,7 +200,7 @@ "type": "", "pos": { "x": 245, - "y": 526 + "y": 569 }, "width": 320, "height": 730, @@ -238,7 +238,7 @@ "type": "", "pos": { "x": 245, - "y": 786 + "y": 829 }, "width": 320, "height": 80, @@ -276,7 +276,7 @@ "type": "", "pos": { "x": 245, - "y": 1306 + "y": 1349 }, "width": 453, "height": 466, @@ -314,7 +314,7 @@ "type": "rectangle", "pos": { "x": 382, - "y": 1476 + "y": 1519 }, "width": 266, "height": 126, @@ -353,7 +353,7 @@ "type": "", "pos": { "x": 601, - "y": 1822 + "y": 1865 }, "width": 268, "height": 206, @@ -391,7 +391,7 @@ "type": "rectangle", "pos": { "x": 651, - "y": 1862 + "y": 1905 }, "width": 168, "height": 126, @@ -430,7 +430,7 @@ "type": "rectangle", "pos": { "x": 289, - "y": 940 + "y": 983 }, "width": 12, "height": 292, @@ -468,7 +468,7 @@ "type": "rectangle", "pos": { "x": 509, - "y": 940 + "y": 983 }, "width": 12, "height": 292, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 1070 + "y": 1113 }, "width": 20, "height": 80, @@ -568,11 +568,11 @@ "route": [ { "x": 75, - "y": 306 + "y": 349 }, { "x": 295, - "y": 306 + "y": 349 } ], "animated": false, @@ -607,11 +607,11 @@ "route": [ { "x": 75, - "y": 436 + "y": 479 }, { "x": 295, - "y": 436 + "y": 479 } ], "animated": false, @@ -646,11 +646,11 @@ "route": [ { "x": 295, - "y": 566 + "y": 609 }, { "x": 515, - "y": 566 + "y": 609 } ], "animated": false, @@ -685,11 +685,11 @@ "route": [ { "x": 515, - "y": 696 + "y": 739 }, { "x": 295, - "y": 696 + "y": 739 } ], "animated": false, @@ -724,11 +724,11 @@ "route": [ { "x": 515, - "y": 826 + "y": 869 }, { "x": 295, - "y": 826 + "y": 869 } ], "animated": false, @@ -763,11 +763,11 @@ "route": [ { "x": 301, - "y": 956 + "y": 999 }, { "x": 509, - "y": 956 + "y": 999 } ], "animated": false, @@ -802,11 +802,11 @@ "route": [ { "x": 305, - "y": 1086 + "y": 1129 }, { "x": 509, - "y": 1086 + "y": 1129 } ], "animated": false, @@ -841,11 +841,11 @@ "route": [ { "x": 509, - "y": 1216 + "y": 1259 }, { "x": 301, - "y": 1216 + "y": 1259 } ], "animated": false, @@ -880,11 +880,11 @@ "route": [ { "x": 295, - "y": 1346 + "y": 1389 }, { "x": 515, - "y": 1346 + "y": 1389 } ], "animated": false, @@ -919,11 +919,11 @@ "route": [ { "x": 515, - "y": 1732 + "y": 1775 }, { "x": 295, - "y": 1732 + "y": 1775 } ], "animated": false, @@ -958,11 +958,11 @@ "route": [ { "x": 75, - "y": 176 + "y": 219 }, { "x": 75, - "y": 2118 + "y": 2161 } ], "animated": false, @@ -997,11 +997,11 @@ "route": [ { "x": 295, - "y": 176 + "y": 219 }, { "x": 295, - "y": 2118 + "y": 2161 } ], "animated": false, @@ -1036,11 +1036,11 @@ "route": [ { "x": 515, - "y": 176 + "y": 219 }, { "x": 515, - "y": 2118 + "y": 2161 } ], "animated": false, @@ -1075,11 +1075,11 @@ "route": [ { "x": 735, - "y": 176 + "y": 219 }, { "x": 735, - "y": 2118 + "y": 2161 } ], "animated": false, 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 507bae4f8..b569a7a6e 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 + + + + + abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + + + + + scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome 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 - - +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 + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - - - - - - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + + + + + + + ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - - - - - - +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + + + + + + + AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response +AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json index 185e1d749..a444d77d8 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json @@ -45,10 +45,10 @@ "type": "person", "pos": { "x": 233, - "y": 141 + "y": 124 }, "width": 150, - "height": 126, + "height": 143, "opacity": 1, "strokeDash": 0, "strokeWidth": 5, @@ -84,10 +84,10 @@ "type": "cylinder", "pos": { "x": 453, - "y": 162 + "y": 136 }, "width": 150, - "height": 126, + "height": 152, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -123,10 +123,10 @@ "type": "queue", "pos": { "x": 673, - "y": 162 + "y": 161 }, "width": 150, - "height": 126, + "height": 127, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index 4385b15c0..2d06dbcbd 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1295" height="1868" viewBox="-100 -50 1295 1868">AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response +AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentialsAuthentication ResponseAnother authentication Requestdo it later storedAnother authentication Response diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json index 7508fc49c..a8d1c897c 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json @@ -6,10 +6,10 @@ "type": "", "pos": { "x": 0, - "y": 50 + "y": 62 }, "width": 150, - "height": 126, + "height": 128, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -45,7 +45,7 @@ "type": "rectangle", "pos": { "x": 69, - "y": 290 + "y": 304 }, "width": 12, "height": 1592, @@ -83,7 +83,7 @@ "type": "", "pos": { "x": 220, - "y": 50 + "y": 64 }, "width": 200, "height": 126, @@ -122,7 +122,7 @@ "type": "rectangle", "pos": { "x": 314, - "y": 290 + "y": 304 }, "width": 12, "height": 162, @@ -163,7 +163,7 @@ "y": 50 }, "width": 150, - "height": 126, + "height": 140, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -199,7 +199,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 550 + "y": 564 }, "width": 12, "height": 162, @@ -237,7 +237,7 @@ "type": "", "pos": { "x": 710, - "y": 50 + "y": 64 }, "width": 186, "height": 126, @@ -276,7 +276,7 @@ "type": "rectangle", "pos": { "x": 797, - "y": 810 + "y": 824 }, "width": 12, "height": 422, @@ -314,7 +314,7 @@ "type": "rectangle", "pos": { "x": 793, - "y": 940 + "y": 954 }, "width": 20, "height": 162, @@ -352,7 +352,7 @@ "type": "", "pos": { "x": 966, - "y": 50 + "y": 64 }, "width": 160, "height": 126, @@ -391,7 +391,7 @@ "type": "rectangle", "pos": { "x": 1040, - "y": 1070 + "y": 1084 }, "width": 12, "height": 80, @@ -429,7 +429,7 @@ "type": "", "pos": { "x": 1196, - "y": 50 + "y": 64 }, "width": 197, "height": 126, @@ -468,7 +468,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1330 + "y": 1344 }, "width": 12, "height": 80, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 1460 + "y": 1474 }, "width": 12, "height": 80, @@ -544,7 +544,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 1590 + "y": 1604 }, "width": 12, "height": 80, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1720 + "y": 1734 }, "width": 12, "height": 80, @@ -620,7 +620,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1850 + "y": 1864 }, "width": 12, "height": 80, @@ -682,11 +682,11 @@ "route": [ { "x": 81, - "y": 306 + "y": 320 }, { "x": 314, - "y": 306 + "y": 320 } ], "animated": false, @@ -721,11 +721,11 @@ "route": [ { "x": 81, - "y": 436 + "y": 450 }, { "x": 314, - "y": 436 + "y": 450 } ], "animated": false, @@ -760,11 +760,11 @@ "route": [ { "x": 81, - "y": 566 + "y": 580 }, { "x": 559, - "y": 566 + "y": 580 } ], "animated": false, @@ -799,11 +799,11 @@ "route": [ { "x": 81, - "y": 696 + "y": 710 }, { "x": 559, - "y": 696 + "y": 710 } ], "animated": false, @@ -838,11 +838,11 @@ "route": [ { "x": 81, - "y": 826 + "y": 840 }, { "x": 797, - "y": 826 + "y": 840 } ], "animated": false, @@ -877,11 +877,11 @@ "route": [ { "x": 320, - "y": 956 + "y": 970 }, { "x": 793, - "y": 956 + "y": 970 } ], "animated": false, @@ -916,11 +916,11 @@ "route": [ { "x": 813, - "y": 1086 + "y": 1100 }, { "x": 1040, - "y": 1086 + "y": 1100 } ], "animated": false, @@ -955,11 +955,11 @@ "route": [ { "x": 75, - "y": 1216 + "y": 1230 }, { "x": 797, - "y": 1216 + "y": 1230 } ], "animated": false, @@ -994,11 +994,11 @@ "route": [ { "x": 81, - "y": 1346 + "y": 1360 }, { "x": 1288.5, - "y": 1346 + "y": 1360 } ], "animated": false, @@ -1033,11 +1033,11 @@ "route": [ { "x": 81, - "y": 1476 + "y": 1490 }, { "x": 559, - "y": 1476 + "y": 1490 } ], "animated": false, @@ -1072,11 +1072,11 @@ "route": [ { "x": 81, - "y": 1606 + "y": 1620 }, { "x": 559, - "y": 1606 + "y": 1620 } ], "animated": false, @@ -1111,11 +1111,11 @@ "route": [ { "x": 81, - "y": 1736 + "y": 1750 }, { "x": 1288.5, - "y": 1736 + "y": 1750 } ], "animated": false, @@ -1150,11 +1150,11 @@ "route": [ { "x": 81, - "y": 1866 + "y": 1880 }, { "x": 1288.5, - "y": 1866 + "y": 1880 } ], "animated": false, @@ -1189,11 +1189,11 @@ "route": [ { "x": 75, - "y": 176 + "y": 190 }, { "x": 75, - "y": 1996 + "y": 2010 } ], "animated": false, @@ -1228,11 +1228,11 @@ "route": [ { "x": 320, - "y": 176 + "y": 190 }, { "x": 320, - "y": 1996 + "y": 2010 } ], "animated": false, @@ -1267,11 +1267,11 @@ "route": [ { "x": 565, - "y": 176 + "y": 190 }, { "x": 565, - "y": 1996 + "y": 2010 } ], "animated": false, @@ -1306,11 +1306,11 @@ "route": [ { "x": 803, - "y": 176 + "y": 190 }, { "x": 803, - "y": 1996 + "y": 2010 } ], "animated": false, @@ -1345,11 +1345,11 @@ "route": [ { "x": 1046, - "y": 176 + "y": 190 }, { "x": 1046, - "y": 1996 + "y": 2010 } ], "animated": false, @@ -1384,11 +1384,11 @@ "route": [ { "x": 1294.5, - "y": 176 + "y": 190 }, { "x": 1294.5, - "y": 1996 + "y": 2010 } ], "animated": false, diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index e74474a1b..bf69f8d48 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -2,7 +2,7 @@ scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - +scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - +a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + + a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - +a_shapea_sequenceanotherfinallysequencesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponsescoreritemResponseitemessayRubricconceptitemOutcome getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + + + + + + + + + + + + + + + + + + + +