From e9c9a80edb00c280c202e368387620471c0864a5 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 19:57:52 -0800 Subject: [PATCH 01/18] actors are B5 fill --- d2graph/d2graph.go | 4 +++ .../dagre/board.exp.json | 28 +++++++++---------- .../dagre/sketch.exp.svg | 6 ++-- .../elk/board.exp.json | 28 +++++++++---------- .../elk/sketch.exp.svg | 6 ++-- .../dagre/board.exp.json | 16 +++++------ .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 16 +++++------ .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 12 ++++---- .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 12 ++++---- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 8 +++--- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_note/elk/board.exp.json | 8 +++--- .../sequence_diagram_note/elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 4 +-- .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 4 +-- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 8 +++--- .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 8 +++--- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 12 ++++---- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_span/elk/board.exp.json | 12 ++++---- .../sequence_diagram_span/elk/sketch.exp.svg | 2 +- .../sequence_diagrams/dagre/board.exp.json | 24 ++++++++-------- .../sequence_diagrams/dagre/sketch.exp.svg | 2 +- .../sequence_diagrams/elk/board.exp.json | 24 ++++++++-------- .../sequence_diagrams/elk/sketch.exp.svg | 2 +- 33 files changed, 136 insertions(+), 132 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 961ab0bcb..21562dbfe 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -330,6 +330,10 @@ func (l ContainerLevel) LabelSize() int { } func (obj *Object) GetFill(theme *d2themes.Theme) string { + if obj.Parent.IsSequenceDiagram() { + return theme.Colors.B5 + } + level := int(obj.Level()) shape := obj.Attributes.Shape.Value 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 49097965c..32da45631 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 @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -92,7 +92,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0A0F25", "shadow": false, "3d": false, @@ -142,7 +142,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -181,7 +181,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0A0F25", "shadow": false, "3d": false, @@ -259,7 +259,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#CFD2DD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -337,7 +337,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -376,7 +376,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -426,7 +426,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -543,7 +543,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -582,7 +582,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -621,7 +621,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -660,7 +660,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -777,7 +777,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0A0F25", "shadow": false, "3d": false, 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 0428bcef4..ed4a6ea54 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="8495" height="2984" viewBox="-100 -50 8495 2984">a labelblabelsa class+ +a labelblabelsa class+ public() bool void- private() int -voidcloudyyyya := 5 +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 49097965c..32da45631 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 @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -92,7 +92,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0A0F25", "shadow": false, "3d": false, @@ -142,7 +142,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -181,7 +181,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0A0F25", "shadow": false, "3d": false, @@ -259,7 +259,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#CFD2DD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -337,7 +337,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -376,7 +376,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -426,7 +426,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -543,7 +543,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -582,7 +582,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -621,7 +621,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -660,7 +660,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -777,7 +777,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#FFFFFF", + "fill": "#EDF0FD", "stroke": "#0A0F25", "shadow": false, "3d": false, 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 0428bcef4..ed4a6ea54 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="8495" height="2984" viewBox="-100 -50 8495 2984">a labelblabelsa class+ +a labelblabelsa class+ public() bool void- private() int -voidcloudyyyya := 5 +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 4c97039b0..b288f8176 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -92,7 +92,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -131,7 +131,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -170,7 +170,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -208,7 +208,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -284,7 +284,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -361,7 +361,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": 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 71742568e..0eef16041 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="1609" height="2311" viewBox="-100 -50 1609 2311">abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay 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 4c97039b0..b288f8176 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -92,7 +92,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -131,7 +131,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -170,7 +170,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -208,7 +208,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -284,7 +284,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -361,7 +361,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, 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 71742568e..0eef16041 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1609" height="2311" viewBox="-100 -50 1609 2311">abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json index a99b8fa61..a0f022a65 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 5, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "red", "shadow": false, "3d": false, @@ -91,7 +91,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -168,7 +168,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -283,7 +283,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -436,7 +436,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -627,7 +627,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg index 26d4f47aa..18f1079a0 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="2493" height="1640" viewBox="-100 -50 2493 1640">scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome abcdexplanationanother 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 okay +abcdexplanationanother 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 okay abcdexplanationanother 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 okay +abcdexplanationanother 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 okay ab a self edge herebetween actorsto descendantto deeper descendantto parentactor +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json index 7bb323ba1..5a65dbefb 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index fe2e24cb0..b04b259e8 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="826" height="1409" viewBox="-100 -50 826 1409">ab a self edge herebetween actorsto descendantto deeper descendantto parentactor +ab a self edge herebetween actorsto descendantto deeper descendantto parentactor diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json index 1fd6bd83f..345f367a8 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "red", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 5, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -131,7 +131,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -170,7 +170,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index 867f37b16..9b2acd3cf 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="2283" height="1868" viewBox="-100 -50 2283 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_simple/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json index 1fd6bd83f..345f367a8 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "red", "shadow": false, "3d": false, @@ -53,7 +53,7 @@ "strokeDash": 0, "strokeWidth": 5, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -131,7 +131,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F0F3F9", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -170,7 +170,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, 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 867f37b16..9b2acd3cf 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="2283" height="1868" viewBox="-100 -50 2283 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 6d2c55f61..70fce0949 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -91,7 +91,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -168,7 +168,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -245,7 +245,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -360,7 +360,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -437,7 +437,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": 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 edb12da43..99cecf596 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="2493" height="2160" viewBox="-100 -50 2493 2160">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) diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json index 6d2c55f61..70fce0949 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json @@ -14,7 +14,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -91,7 +91,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -168,7 +168,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -245,7 +245,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -360,7 +360,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -437,7 +437,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#E3E9FD", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index edb12da43..99cecf596 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="2493" height="2160" viewBox="-100 -50 2493 2160">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) diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index 5d18bf4a4..7031e5e64 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -248,7 +248,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -287,7 +287,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -326,7 +326,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -365,7 +365,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -404,7 +404,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -443,7 +443,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1134,7 +1134,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1211,7 +1211,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1288,7 +1288,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1365,7 +1365,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1480,7 +1480,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1557,7 +1557,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 86332068e..e2f189e71 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="5044" height="4201" viewBox="-100 -100 5044 4201">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) diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 2d17a53d3..63049cb6c 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -248,7 +248,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -287,7 +287,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -326,7 +326,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -365,7 +365,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -404,7 +404,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -443,7 +443,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1134,7 +1134,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1211,7 +1211,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1288,7 +1288,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1365,7 +1365,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1480,7 +1480,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -1557,7 +1557,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#EDF0FD", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 6a63ebb90..d4e75631c 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="4966" height="4321" viewBox="-88 -88 4966 4321">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) From 0f5b14c76a82480f01b56553ea756401f59f1066 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 20:05:25 -0800 Subject: [PATCH 02/18] reduce distance between actors --- d2layouts/d2sequence/constants.go | 2 +- d2layouts/d2sequence/sequence_diagram.go | 13 +- .../dagre/board.exp.json | 188 ++++----- .../dagre/sketch.exp.svg | 28 +- .../elk/board.exp.json | 188 ++++----- .../elk/sketch.exp.svg | 28 +- .../dagre/board.exp.json | 80 ++-- .../dagre/sketch.exp.svg | 14 +- .../elk/board.exp.json | 80 ++-- .../elk/sketch.exp.svg | 14 +- .../dagre/board.exp.json | 90 ++-- .../dagre/sketch.exp.svg | 4 +- .../elk/board.exp.json | 90 ++-- .../elk/sketch.exp.svg | 4 +- .../dagre/board.exp.json | 32 +- .../dagre/sketch.exp.svg | 8 +- .../sequence_diagram_note/elk/board.exp.json | 32 +- .../sequence_diagram_note/elk/sketch.exp.svg | 8 +- .../dagre/board.exp.json | 92 ++--- .../dagre/sketch.exp.svg | 32 +- .../sequence_diagram_real/elk/board.exp.json | 92 ++--- .../sequence_diagram_real/elk/sketch.exp.svg | 32 +- .../dagre/board.exp.json | 42 +- .../dagre/sketch.exp.svg | 16 +- .../elk/board.exp.json | 42 +- .../elk/sketch.exp.svg | 16 +- .../dagre/board.exp.json | 56 +-- .../dagre/sketch.exp.svg | 22 +- .../elk/board.exp.json | 56 +-- .../elk/sketch.exp.svg | 22 +- .../dagre/board.exp.json | 80 ++-- .../dagre/sketch.exp.svg | 30 +- .../sequence_diagram_span/elk/board.exp.json | 80 ++-- .../sequence_diagram_span/elk/sketch.exp.svg | 30 +- .../sequence_diagrams/dagre/board.exp.json | 390 +++++++++--------- .../sequence_diagrams/dagre/sketch.exp.svg | 54 +-- .../sequence_diagrams/elk/board.exp.json | 346 ++++++++-------- .../sequence_diagrams/elk/sketch.exp.svg | 54 +-- 38 files changed, 1238 insertions(+), 1249 deletions(-) diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index 676eb3d73..a64394d6e 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -6,7 +6,7 @@ const HORIZONTAL_PAD = 50. // leaves at least 25 units of space on the top/bottom when computing the space required between messages const VERTICAL_PAD = 50. -const MIN_ACTOR_DISTANCE = 250. +const MIN_ACTOR_DISTANCE = 70. const MIN_ACTOR_WIDTH = 150. diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 3df170756..359109b47 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -33,7 +33,6 @@ type sequenceDiagram struct { lastMessage map[*d2graph.Object]*d2graph.Edge yStep float64 - actorXStep float64 maxActorHeight float64 verticalIndices map[string]int @@ -140,7 +139,6 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se firstMessage: make(map[*d2graph.Object]*d2graph.Edge), lastMessage: make(map[*d2graph.Object]*d2graph.Edge), yStep: MIN_MESSAGE_DISTANCE, - actorXStep: MIN_ACTOR_DISTANCE, maxActorHeight: 0., verticalIndices: make(map[string]int), } @@ -189,15 +187,6 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se sd.verticalIndices[message.AbsID()] = getEdgeEarliestLineNum(message) sd.yStep = math.Max(sd.yStep, float64(message.LabelDimensions.Height)) - // ensures that long labels, spanning over multiple actors, don't make for large gaps between actors - // by distributing the label length across the actors rank difference - rankDiff := math.Abs(float64(sd.objectRank[message.Src]) - float64(sd.objectRank[message.Dst])) - if rankDiff != 0 { - // rankDiff = 0 for self edges - distributedLabelWidth := float64(message.LabelDimensions.Width) / rankDiff - sd.actorXStep = math.Max(sd.actorXStep, distributedLabelWidth+HORIZONTAL_PAD) - - } sd.lastMessage[message.Src] = message if _, exists := sd.firstMessage[message.Src]; !exists { sd.firstMessage[message.Src] = message @@ -304,7 +293,7 @@ func (sd *sequenceDiagram) placeActors() { yOffset = sd.maxActorHeight - actor.Height } actor.TopLeft = geo.NewPoint(x, yOffset) - x += actor.Width + sd.actorXStep + x += actor.Width + MIN_ACTOR_DISTANCE } } 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 32da45631..5de39d535 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 @@ -44,7 +44,7 @@ "id": "b", "type": "oval", "pos": { - "x": 410, + "x": 223, "y": 84 }, "width": 150, @@ -83,7 +83,7 @@ "id": "c", "type": "class", "pos": { - "x": 817, + "x": 443, "y": 50 }, "width": 241, @@ -133,7 +133,7 @@ "id": "d", "type": "cloud", "pos": { - "x": 1315, + "x": 754, "y": 108 }, "width": 179, @@ -172,7 +172,7 @@ "id": "e", "type": "code", "pos": { - "x": 1751, + "x": 1003, "y": 164 }, "width": 196, @@ -211,7 +211,7 @@ "id": "f", "type": "cylinder", "pos": { - "x": 2204, + "x": 1269, "y": 84 }, "width": 150, @@ -250,7 +250,7 @@ "id": "g", "type": "diamond", "pos": { - "x": 2611, + "x": 1489, "y": 85 }, "width": 150, @@ -289,7 +289,7 @@ "id": "h", "type": "document", "pos": { - "x": 3018, + "x": 1709, "y": 97 }, "width": 150, @@ -328,7 +328,7 @@ "id": "i", "type": "hexagon", "pos": { - "x": 3425, + "x": 1929, "y": 108 }, "width": 182, @@ -367,7 +367,7 @@ "id": "j", "type": "image", "pos": { - "x": 3864, + "x": 2181, "y": 63 }, "width": 150, @@ -417,7 +417,7 @@ "id": "k", "type": "oval", "pos": { - "x": 4271, + "x": 2401, "y": 97 }, "width": 150, @@ -456,7 +456,7 @@ "id": "l", "type": "package", "pos": { - "x": 4678, + "x": 2621, "y": 98 }, "width": 150, @@ -495,7 +495,7 @@ "id": "m", "type": "page", "pos": { - "x": 5085, + "x": 2841, "y": 108 }, "width": 175, @@ -534,7 +534,7 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 5517, + "x": 3086, "y": 92 }, "width": 183, @@ -573,7 +573,7 @@ "id": "o", "type": "person", "pos": { - "x": 5957, + "x": 3339, "y": 55 }, "width": 154, @@ -612,7 +612,7 @@ "id": "p", "type": "queue", "pos": { - "x": 6368, + "x": 3563, "y": 108 }, "width": 161, @@ -651,7 +651,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 6786, + "x": 3794, "y": 69 }, "width": 165, @@ -690,7 +690,7 @@ "id": "r", "type": "step", "pos": { - "x": 7208, + "x": 4029, "y": 108 }, "width": 213, @@ -729,7 +729,7 @@ "id": "s", "type": "stored_data", "pos": { - "x": 7678, + "x": 4312, "y": 96 }, "width": 150, @@ -768,7 +768,7 @@ "id": "t", "type": "sql_table", "pos": { - "x": 8085, + "x": 4532, "y": 126 }, "width": 210, @@ -848,7 +848,7 @@ "y": 364 }, { - "x": 485, + "x": 298, "y": 364 } ], @@ -883,11 +883,11 @@ "labelPercentage": 0, "route": [ { - "x": 485, + "x": 298, "y": 494 }, { - "x": 937.5, + "x": 563.5, "y": 494 } ], @@ -922,11 +922,11 @@ "labelPercentage": 0, "route": [ { - "x": 937.5, + "x": 563.5, "y": 624 }, { - "x": 1404.5, + "x": 843.5, "y": 624 } ], @@ -961,11 +961,11 @@ "labelPercentage": 0, "route": [ { - "x": 1404.5, + "x": 843.5, "y": 754 }, { - "x": 1849, + "x": 1101, "y": 754 } ], @@ -1000,11 +1000,11 @@ "labelPercentage": 0, "route": [ { - "x": 1849, + "x": 1101, "y": 884 }, { - "x": 2279, + "x": 1344, "y": 884 } ], @@ -1039,11 +1039,11 @@ "labelPercentage": 0, "route": [ { - "x": 2279, + "x": 1344, "y": 1014 }, { - "x": 2686, + "x": 1564, "y": 1014 } ], @@ -1078,11 +1078,11 @@ "labelPercentage": 0, "route": [ { - "x": 2686, + "x": 1564, "y": 1144 }, { - "x": 3093, + "x": 1784, "y": 1144 } ], @@ -1117,11 +1117,11 @@ "labelPercentage": 0, "route": [ { - "x": 3093, + "x": 1784, "y": 1274 }, { - "x": 3516, + "x": 2020, "y": 1274 } ], @@ -1156,11 +1156,11 @@ "labelPercentage": 0, "route": [ { - "x": 3516, + "x": 2020, "y": 1404 }, { - "x": 3939, + "x": 2256, "y": 1404 } ], @@ -1195,11 +1195,11 @@ "labelPercentage": 0, "route": [ { - "x": 3939, + "x": 2256, "y": 1534 }, { - "x": 4346, + "x": 2476, "y": 1534 } ], @@ -1234,11 +1234,11 @@ "labelPercentage": 0, "route": [ { - "x": 4346, + "x": 2476, "y": 1664 }, { - "x": 4753, + "x": 2696, "y": 1664 } ], @@ -1273,11 +1273,11 @@ "labelPercentage": 0, "route": [ { - "x": 4753, + "x": 2696, "y": 1794 }, { - "x": 5172.5, + "x": 2928.5, "y": 1794 } ], @@ -1312,11 +1312,11 @@ "labelPercentage": 0, "route": [ { - "x": 5172.5, + "x": 2928.5, "y": 1924 }, { - "x": 5608.5, + "x": 3177.5, "y": 1924 } ], @@ -1351,11 +1351,11 @@ "labelPercentage": 0, "route": [ { - "x": 5608.5, + "x": 3177.5, "y": 2054 }, { - "x": 6034, + "x": 3416, "y": 2054 } ], @@ -1390,11 +1390,11 @@ "labelPercentage": 0, "route": [ { - "x": 6034, + "x": 3416, "y": 2184 }, { - "x": 6448.5, + "x": 3643.5, "y": 2184 } ], @@ -1429,11 +1429,11 @@ "labelPercentage": 0, "route": [ { - "x": 6448.5, + "x": 3643.5, "y": 2314 }, { - "x": 6868.5, + "x": 3876.5, "y": 2314 } ], @@ -1468,11 +1468,11 @@ "labelPercentage": 0, "route": [ { - "x": 6868.5, + "x": 3876.5, "y": 2444 }, { - "x": 7314.5, + "x": 4135.5, "y": 2444 } ], @@ -1507,11 +1507,11 @@ "labelPercentage": 0, "route": [ { - "x": 7314.5, + "x": 4135.5, "y": 2574 }, { - "x": 7753, + "x": 4387, "y": 2574 } ], @@ -1546,11 +1546,11 @@ "labelPercentage": 0, "route": [ { - "x": 7753, + "x": 4387, "y": 2704 }, { - "x": 8190, + "x": 4637, "y": 2704 } ], @@ -1624,11 +1624,11 @@ "labelPercentage": 0, "route": [ { - "x": 485, + "x": 298, "y": 234 }, { - "x": 485, + "x": 298, "y": 2834 } ], @@ -1663,11 +1663,11 @@ "labelPercentage": 0, "route": [ { - "x": 937.5, + "x": 563.5, "y": 234 }, { - "x": 937.5, + "x": 563.5, "y": 2834 } ], @@ -1702,11 +1702,11 @@ "labelPercentage": 0, "route": [ { - "x": 1404.5, + "x": 843.5, "y": 234 }, { - "x": 1404.5, + "x": 843.5, "y": 2834 } ], @@ -1741,11 +1741,11 @@ "labelPercentage": 0, "route": [ { - "x": 1849, + "x": 1101, "y": 234 }, { - "x": 1849, + "x": 1101, "y": 2834 } ], @@ -1780,11 +1780,11 @@ "labelPercentage": 0, "route": [ { - "x": 2279, + "x": 1344, "y": 234 }, { - "x": 2279, + "x": 1344, "y": 2834 } ], @@ -1819,11 +1819,11 @@ "labelPercentage": 0, "route": [ { - "x": 2686, + "x": 1564, "y": 234 }, { - "x": 2686, + "x": 1564, "y": 2834 } ], @@ -1858,11 +1858,11 @@ "labelPercentage": 0, "route": [ { - "x": 3093, + "x": 1784, "y": 234 }, { - "x": 3093, + "x": 1784, "y": 2834 } ], @@ -1897,11 +1897,11 @@ "labelPercentage": 0, "route": [ { - "x": 3516, + "x": 2020, "y": 234 }, { - "x": 3516, + "x": 2020, "y": 2834 } ], @@ -1936,11 +1936,11 @@ "labelPercentage": 0, "route": [ { - "x": 3939, + "x": 2256, "y": 239 }, { - "x": 3939, + "x": 2256, "y": 2834 } ], @@ -1975,11 +1975,11 @@ "labelPercentage": 0, "route": [ { - "x": 4346, + "x": 2476, "y": 234 }, { - "x": 4346, + "x": 2476, "y": 2834 } ], @@ -2014,11 +2014,11 @@ "labelPercentage": 0, "route": [ { - "x": 4753, + "x": 2696, "y": 234 }, { - "x": 4753, + "x": 2696, "y": 2834 } ], @@ -2053,11 +2053,11 @@ "labelPercentage": 0, "route": [ { - "x": 5172.5, + "x": 2928.5, "y": 234 }, { - "x": 5172.5, + "x": 2928.5, "y": 2834 } ], @@ -2092,11 +2092,11 @@ "labelPercentage": 0, "route": [ { - "x": 5608.5, + "x": 3177.5, "y": 234 }, { - "x": 5608.5, + "x": 3177.5, "y": 2834 } ], @@ -2131,11 +2131,11 @@ "labelPercentage": 0, "route": [ { - "x": 6034, + "x": 3416, "y": 239 }, { - "x": 6034, + "x": 3416, "y": 2834 } ], @@ -2170,11 +2170,11 @@ "labelPercentage": 0, "route": [ { - "x": 6448.5, + "x": 3643.5, "y": 234 }, { - "x": 6448.5, + "x": 3643.5, "y": 2834 } ], @@ -2209,11 +2209,11 @@ "labelPercentage": 0, "route": [ { - "x": 6868.5, + "x": 3876.5, "y": 234 }, { - "x": 6868.5, + "x": 3876.5, "y": 2834 } ], @@ -2248,11 +2248,11 @@ "labelPercentage": 0, "route": [ { - "x": 7314.5, + "x": 4135.5, "y": 234 }, { - "x": 7314.5, + "x": 4135.5, "y": 2834 } ], @@ -2287,11 +2287,11 @@ "labelPercentage": 0, "route": [ { - "x": 7753, + "x": 4387, "y": 234 }, { - "x": 7753, + "x": 4387, "y": 2834 } ], @@ -2326,11 +2326,11 @@ "labelPercentage": 0, "route": [ { - "x": 8190, + "x": 4637, "y": 234 }, { - "x": 8190, + "x": 4637, "y": 2834 } ], 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 ed4a6ea54..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 @@ -2,7 +2,7 @@ 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 -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + a labelblabelsa class+ -public() bool -void- -private() int -voidcloudyyyya := 5 +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 -int -name -varchar - result := callThisFunction(obj, 5) midthis sideother side - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersid +int +name +varchar + result := callThisFunction(obj, 5) midthis sideother side + + + abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay - - - - - +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay + + + + + abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay - - - - - +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay + + + + + scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome scoreritemResponseitemessayRubricconceptitemOutcome abcdexplanationanother 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 okay - - +abcdexplanationanother 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 okay + + abcdexplanationanother 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 okay - - +abcdexplanationanother 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 okay + + How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG - - - - - - - - - - - - - - +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG + + + + + + + + + + + + + + How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG - - - - - - - - - - - - - - +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG + + + + + + + + + + + + + + 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 + + + + + + + + + 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 + + + + + + + + + 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) - - - - - - - - - - - - - +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) + + + + + + + + + + + + + + + + + + + + + + + + + abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay 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 6f276addd..04f77737e 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -322,7 +322,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -399,7 +399,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, 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 3ea0fe3ff..379a88b2a 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2311" viewBox="-100 -50 1069 2311">abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay +abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json index e5fb3ef6f..367835c2f 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json @@ -170,7 +170,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -209,7 +209,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -248,7 +248,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, @@ -287,7 +287,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg index 6fdac19db..0db91b14f 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="1255" height="1929" viewBox="-150 -50 1255 1929">abcdexplanationanother 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 okay +abcdexplanationanother 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 okay abcdexplanationanother 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 okay +abcdexplanationanother 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 okay How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG 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 9a0910d5a..12c45e559 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -326,7 +326,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#F7F8FE", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, 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 bb3e1137d..ea8ac8ffc 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="2393" height="2511" viewBox="-88 -88 2393 2511">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG +How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG From 47201373a7eeccca6bcaf985599724b24650626c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 20:53:31 -0800 Subject: [PATCH 05/18] wip: z-indexing group <-> span --- d2layouts/d2sequence/constants.go | 7 ++ d2layouts/d2sequence/sequence_diagram.go | 8 ++- e2etests/stable_test.go | 4 +- .../dagre/board.exp.json | 71 ++++++++++++++----- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_real/elk/board.exp.json | 66 +++++++++++++---- .../sequence_diagram_real/elk/sketch.exp.svg | 2 +- 7 files changed, 124 insertions(+), 36 deletions(-) diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index a64394d6e..b19d080cc 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -30,3 +30,10 @@ const LIFELINE_STROKE_DASH int = 6 // pad when the actor has the label placed OutsideMiddleBottom so that the lifeline is not so close to the text const LIFELINE_LABEL_PAD = 5. + +const ( + SPAN_Z_INDEX = 1 + GROUP_Z_INDEX = 2 + MESSAGE_Z_INDEX = 3 + NOTE_Z_INDEX = 4 +) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index d4d24e030..47f19ceb0 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -189,6 +189,8 @@ func (sd *sequenceDiagram) layout() error { func (sd *sequenceDiagram) placeGroups() { for _, group := range sd.groups { + group.ZIndex = GROUP_Z_INDEX + // group.Attributes.Style.Opacity = &d2graph.Scalar{Value: "0.5"} sd.placeGroup(group) } } @@ -330,7 +332,7 @@ func (sd *sequenceDiagram) placeNotes() { x := rankToX[sd.objectRank[note]] - (note.Width / 2.) note.Box.TopLeft = geo.NewPoint(x, y) - note.ZIndex = 1 + note.ZIndex = NOTE_Z_INDEX } } @@ -406,7 +408,7 @@ func (sd *sequenceDiagram) placeSpans() { width := SPAN_BASE_WIDTH + (float64(span.Level()-2) * SPAN_DEPTH_GROWTH_FACTOR) x := rankToX[sd.objectRank[span]] - (width / 2.) span.Box = geo.NewBox(geo.NewPoint(x, minY), width, height) - span.ZIndex = 1 + span.ZIndex = SPAN_Z_INDEX } } @@ -415,6 +417,7 @@ func (sd *sequenceDiagram) placeSpans() { func (sd *sequenceDiagram) routeMessages() error { messageOffset := sd.maxActorHeight + sd.yStep for _, message := range sd.messages { + message.ZIndex = MESSAGE_Z_INDEX noteOffset := 0. for _, note := range sd.notes { if sd.verticalIndices[note.AbsID()] < sd.verticalIndices[message.AbsID()] { @@ -423,7 +426,6 @@ func (sd *sequenceDiagram) routeMessages() error { } startY := messageOffset + noteOffset - message.ZIndex = 2 var startX, endX float64 if startCenter := getCenter(message.Src); startCenter != nil { startX = startCenter.X diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index d256a29ed..a60268d54 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -1399,7 +1399,9 @@ choo: { d2compiler -> CLI: objects and edges CLI -> d2layout.layout: run layout engines d2layout.layout -> d2sequencelayout: run engine on shape: sequence_diagram, temporarily remove - d2layout.layout -> d2dagrelayout: run core engine on rest + only if root is not sequence: { + _.d2layout.layout -> _.d2dagrelayout: run core engine on rest + } d2layout.layout <- d2sequencelayout: add back in sequence diagrams d2layout -> CLI: diagram with correct positions and dimensions CLI -> d2exporter: export diagram with chosen theme and renderer diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json index b2169827a..11437b91f 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json @@ -8,8 +8,8 @@ "x": 0, "y": 0 }, - "width": 2193, - "height": 2311, + "width": 1504, + "height": 180, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -349,9 +349,48 @@ "labelWidth": 218, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 3 }, + { + "id": "How this is rendered.only if root is not sequence", + "type": "", + "pos": { + "x": 50, + "y": 50 + }, + "width": 1404, + "height": 80, + "opacity": 0.5, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "only if root is not sequence", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 195, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 2, + "level": 2 + }, { "id": "How this is rendered.d2layout.layout", "type": "rectangle", @@ -545,7 +584,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2ast -> CLI)[0]", @@ -584,7 +623,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(CLI -> d2compiler)[0]", @@ -623,7 +662,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2compiler -> CLI)[0]", @@ -662,7 +701,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(CLI -> d2layout.layout)[0]", @@ -701,7 +740,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout.layout -> d2sequencelayout)[0]", @@ -740,7 +779,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout.layout -> d2dagrelayout)[0]", @@ -779,7 +818,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout.layout <- d2sequencelayout)[0]", @@ -818,7 +857,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout -> CLI)[0]", @@ -857,7 +896,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(CLI -> d2exporter)[0]", @@ -896,7 +935,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2exporter.export -> d2themes)[0]", @@ -935,7 +974,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2exporter.export -> d2renderer)[0]", @@ -974,7 +1013,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2exporter.export -> CLI)[0]", @@ -1013,7 +1052,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(How this is rendered.CLI -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index 1e6312585..d6277b3b1 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="2393" height="2511" viewBox="-100 -100 2393 2511">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG +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 12c45e559..9bf5a502d 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -349,9 +349,47 @@ "labelWidth": 218, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 3 }, + { + "id": "How this is rendered.only if root is not sequence", + "type": "", + "pos": { + "x": 734, + "y": 1361 + }, + "width": 1404, + "height": 80, + "opacity": 0.5, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "only if root is not sequence", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 195, + "labelHeight": 26, + "zIndex": 2, + "level": 2 + }, { "id": "How this is rendered.d2layout.layout", "type": "rectangle", @@ -545,7 +583,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2ast -> CLI)[0]", @@ -584,7 +622,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(CLI -> d2compiler)[0]", @@ -623,7 +661,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2compiler -> CLI)[0]", @@ -662,7 +700,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(CLI -> d2layout.layout)[0]", @@ -701,7 +739,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout.layout -> d2sequencelayout)[0]", @@ -740,7 +778,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout.layout -> d2dagrelayout)[0]", @@ -779,7 +817,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout.layout <- d2sequencelayout)[0]", @@ -818,7 +856,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2layout -> CLI)[0]", @@ -857,7 +895,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(CLI -> d2exporter)[0]", @@ -896,7 +934,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2exporter.export -> d2themes)[0]", @@ -935,7 +973,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2exporter.export -> d2renderer)[0]", @@ -974,7 +1012,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "How this is rendered.(d2exporter.export -> CLI)[0]", @@ -1013,7 +1051,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(How this is rendered.CLI -- )[0]", 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 ea8ac8ffc..ae3f03e69 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="2393" height="2511" viewBox="-88 -88 2393 2511">How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutmeasurements also take place '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 SVG +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 From 9bf1fb7b722a07d2e133470f4abd599c13dee797 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 21:12:59 -0800 Subject: [PATCH 06/18] refactor group check --- d2graph/seqdiagram.go | 17 ++ d2layouts/d2sequence/constants.go | 4 +- d2layouts/d2sequence/sequence_diagram.go | 21 +-- .../dagre/board.exp.json | 38 ++--- .../elk/board.exp.json | 38 ++--- .../dagre/board.exp.json | 40 ++--- .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 40 ++--- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 52 +++---- .../elk/board.exp.json | 52 +++---- .../dagre/board.exp.json | 14 +- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_note/elk/board.exp.json | 14 +- .../sequence_diagram_note/elk/sketch.exp.svg | 2 +- .../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 | 24 +-- .../elk/board.exp.json | 24 +-- .../dagre/board.exp.json | 20 +-- .../elk/board.exp.json | 20 +-- .../dagre/board.exp.json | 48 +++--- .../sequence_diagram_span/elk/board.exp.json | 48 +++--- .../sequence_diagrams/dagre/board.exp.json | 146 +++++++++--------- .../sequence_diagrams/elk/board.exp.json | 146 +++++++++--------- 27 files changed, 418 insertions(+), 416 deletions(-) diff --git a/d2graph/seqdiagram.go b/d2graph/seqdiagram.go index 5052f5c45..bf89b0f70 100644 --- a/d2graph/seqdiagram.go +++ b/d2graph/seqdiagram.go @@ -16,6 +16,23 @@ func (obj *Object) outerSequenceDiagram() *Object { return nil } +// groups are objects in sequence diagrams that have no messages connected +// and does not have a note as a child (a note can appear within a group, but it's a child of an actor) +func (obj *Object) IsSequenceDiagramGroup(edges []*Edge) bool { + for _, e := range edges { + if e.Src == obj || e.Dst == obj { + return false + } + } + for _, ch := range obj.ChildrenArray { + // if the child contains a message, it's a span, not a note + if !ch.ContainsAnyEdge(edges) { + return false + } + } + return true +} + // notes are descendant of actors with no edges and no children func (obj *Object) IsSequenceDiagramNote() bool { sd := obj.outerSequenceDiagram() diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index b19d080cc..0973b3ca2 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -32,8 +32,8 @@ const LIFELINE_STROKE_DASH int = 6 const LIFELINE_LABEL_PAD = 5. const ( - SPAN_Z_INDEX = 1 - GROUP_Z_INDEX = 2 + GROUP_Z_INDEX = 1 + SPAN_Z_INDEX = 2 MESSAGE_Z_INDEX = 3 NOTE_Z_INDEX = 4 ) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 47f19ceb0..3d424d11c 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -65,24 +65,7 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se var groups []*d2graph.Object for _, obj := range objects { - messageRecipient := false - for _, m := range messages { - if m.Src == obj || m.Dst == obj { - messageRecipient = true - break - } - } - hasNote := false - for _, ch := range obj.ChildrenArray { - // if the child contains a message, it's a span, not a note - if !ch.ContainsAnyEdge(messages) { - hasNote = true - break - } - } - if messageRecipient || hasNote { - actors = append(actors, obj) - } else { + if obj.IsSequenceDiagramGroup(messages) { queue := []*d2graph.Object{obj} // Groups may have more nested groups for len(queue) > 0 { @@ -93,6 +76,8 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se queue = append(queue, c) } } + } else { + actors = append(actors, obj) } } 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 5de39d535..f0e06e2ca 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 @@ -855,7 +855,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b <-> c)[0]", @@ -894,7 +894,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> d)[0]", @@ -933,7 +933,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(d -> e)[0]", @@ -972,7 +972,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(e -> f)[0]", @@ -1011,7 +1011,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(f -> g)[0]", @@ -1050,7 +1050,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(g -> h)[0]", @@ -1089,7 +1089,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(h -> i)[0]", @@ -1128,7 +1128,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(i -> j)[0]", @@ -1167,7 +1167,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(j -> k)[0]", @@ -1206,7 +1206,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(k -> l)[0]", @@ -1245,7 +1245,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(l -> m)[0]", @@ -1284,7 +1284,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(m -> n)[0]", @@ -1323,7 +1323,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(n -> o)[0]", @@ -1362,7 +1362,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(o -> p)[0]", @@ -1401,7 +1401,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(p -> q)[0]", @@ -1440,7 +1440,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(q -> r)[0]", @@ -1479,7 +1479,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(r -> s)[0]", @@ -1518,7 +1518,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(s -> t)[0]", @@ -1557,7 +1557,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -- )[0]", 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 5de39d535..f0e06e2ca 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 @@ -855,7 +855,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b <-> c)[0]", @@ -894,7 +894,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> d)[0]", @@ -933,7 +933,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(d -> e)[0]", @@ -972,7 +972,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(e -> f)[0]", @@ -1011,7 +1011,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(f -> g)[0]", @@ -1050,7 +1050,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(g -> h)[0]", @@ -1089,7 +1089,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(h -> i)[0]", @@ -1128,7 +1128,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(i -> j)[0]", @@ -1167,7 +1167,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(j -> k)[0]", @@ -1206,7 +1206,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(k -> l)[0]", @@ -1245,7 +1245,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(l -> m)[0]", @@ -1284,7 +1284,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(m -> n)[0]", @@ -1323,7 +1323,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(n -> o)[0]", @@ -1362,7 +1362,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(o -> p)[0]", @@ -1401,7 +1401,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(p -> q)[0]", @@ -1440,7 +1440,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(q -> r)[0]", @@ -1479,7 +1479,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(r -> s)[0]", @@ -1518,7 +1518,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(s -> t)[0]", @@ -1557,7 +1557,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -- )[0]", 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 04f77737e..ed029f471 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -192,7 +192,7 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -230,7 +230,7 @@ "underline": false, "labelWidth": 57, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -268,7 +268,7 @@ "underline": false, "labelWidth": 82, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 2 }, { @@ -306,7 +306,7 @@ "underline": false, "labelWidth": 60, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -345,7 +345,7 @@ "labelWidth": 166, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 }, { @@ -383,7 +383,7 @@ "underline": false, "labelWidth": 40, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -422,7 +422,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 }, { @@ -460,7 +460,7 @@ "underline": false, "labelWidth": 25, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 } ], @@ -578,7 +578,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -> b)[1]", @@ -617,7 +617,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> c)[0]", @@ -656,7 +656,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> b)[0]", @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> b)[1]", @@ -734,7 +734,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b.t1 -> c.t1)[0]", @@ -773,7 +773,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b.t1.t2 -> c.t1)[0]", @@ -812,7 +812,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c.t1 -> b.t1)[0]", @@ -851,7 +851,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> c)[1]", @@ -890,7 +890,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> b)[2]", @@ -929,7 +929,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -- )[0]", 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 379a88b2a..af4ca4cec 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2311" viewBox="-100 -50 1069 2311">abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay +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 04f77737e..ed029f471 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -192,7 +192,7 @@ "underline": false, "labelWidth": 32, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -230,7 +230,7 @@ "underline": false, "labelWidth": 57, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -268,7 +268,7 @@ "underline": false, "labelWidth": 82, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 2 }, { @@ -306,7 +306,7 @@ "underline": false, "labelWidth": 60, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -345,7 +345,7 @@ "labelWidth": 166, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 }, { @@ -383,7 +383,7 @@ "underline": false, "labelWidth": 40, "labelHeight": 26, - "zIndex": 0, + "zIndex": 1, "level": 1 }, { @@ -422,7 +422,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 }, { @@ -460,7 +460,7 @@ "underline": false, "labelWidth": 25, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 } ], @@ -578,7 +578,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -> b)[1]", @@ -617,7 +617,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> c)[0]", @@ -656,7 +656,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> b)[0]", @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> b)[1]", @@ -734,7 +734,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b.t1 -> c.t1)[0]", @@ -773,7 +773,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b.t1.t2 -> c.t1)[0]", @@ -812,7 +812,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c.t1 -> b.t1)[0]", @@ -851,7 +851,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> c)[1]", @@ -890,7 +890,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> b)[2]", @@ -929,7 +929,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -- )[0]", 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 379a88b2a..af4ca4cec 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2311" viewBox="-100 -50 1069 2311">abcdggggroup 1group bchoonested guywhat would arnold saythis note lalaeyokayokay +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json index 3dee48987..ca680e34e 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -267,7 +267,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -382,7 +382,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -420,7 +420,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -497,7 +497,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -535,7 +535,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -573,7 +573,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -611,7 +611,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -688,7 +688,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -726,7 +726,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -764,7 +764,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -802,7 +802,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -840,7 +840,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -878,7 +878,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 } ], @@ -920,7 +920,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(itemResponse.a -> item.a.b)[0]", @@ -959,7 +959,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(item.a.b -> essayRubric.a.b.c)[0]", @@ -998,7 +998,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -1037,7 +1037,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(item.a -> essayRubric.a.b)[0]", @@ -1076,7 +1076,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -1115,7 +1115,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.abc -> item.a)[0]", @@ -1154,7 +1154,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -1193,7 +1193,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer -> itemResponse.c)[0]", @@ -1232,7 +1232,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json index 3dee48987..ca680e34e 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -267,7 +267,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -382,7 +382,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -420,7 +420,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -497,7 +497,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -535,7 +535,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -573,7 +573,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -611,7 +611,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -688,7 +688,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -726,7 +726,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -764,7 +764,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -802,7 +802,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -840,7 +840,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -878,7 +878,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 } ], @@ -920,7 +920,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(itemResponse.a -> item.a.b)[0]", @@ -959,7 +959,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(item.a.b -> essayRubric.a.b.c)[0]", @@ -998,7 +998,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -1037,7 +1037,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(item.a -> essayRubric.a.b)[0]", @@ -1076,7 +1076,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -1115,7 +1115,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.abc -> item.a)[0]", @@ -1154,7 +1154,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -1193,7 +1193,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer -> itemResponse.c)[0]", @@ -1232,7 +1232,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json index 367835c2f..5ca5fbedb 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json @@ -193,7 +193,7 @@ "labelWidth": 90, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 }, { @@ -232,7 +232,7 @@ "labelWidth": 150, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 }, { @@ -271,7 +271,7 @@ "labelWidth": 293, "labelHeight": 42, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 }, { @@ -310,7 +310,7 @@ "labelWidth": 441, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 1, + "zIndex": 4, "level": 2 } ], @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> c)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(c -> b)[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg index 0db91b14f..a67b12b1c 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="1255" height="1929" viewBox="-150 -50 1255 1929">abcdexplanationanother 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 okay +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 abcdexplanationanother 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 okay +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 9bf5a502d..ab96624a8 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -361,7 +361,7 @@ }, "width": 1404, "height": 80, - "opacity": 0.5, + "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, @@ -387,7 +387,7 @@ "underline": false, "labelWidth": 195, "labelHeight": 26, - "zIndex": 2, + "zIndex": 1, "level": 2 }, { @@ -425,7 +425,7 @@ "underline": false, "labelWidth": 50, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -541,7 +541,7 @@ "underline": false, "labelWidth": 52, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 } ], 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 ae3f03e69..6c2bc8c4c 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="2393" height="2511" viewBox="-88 -88 2393 2511">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_self_edges/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json index f487b4280..4ea28acaa 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json @@ -114,7 +114,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -190,7 +190,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -228,7 +228,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -266,7 +266,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 } ], @@ -316,7 +316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -> b)[0]", @@ -355,7 +355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> b.1)[0]", @@ -402,7 +402,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "b.(1 -> 1.2)[0]", @@ -449,7 +449,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b.1.2 -> b)[0]", @@ -496,7 +496,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> a.1.2)[0]", @@ -535,7 +535,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a.1 -> b.3)[0]", @@ -574,7 +574,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json index f487b4280..4ea28acaa 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json @@ -114,7 +114,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -190,7 +190,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -228,7 +228,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -266,7 +266,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 } ], @@ -316,7 +316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -> b)[0]", @@ -355,7 +355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> b.1)[0]", @@ -402,7 +402,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "b.(1 -> 1.2)[0]", @@ -449,7 +449,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b.1.2 -> b)[0]", @@ -496,7 +496,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(b -> a.1.2)[0]", @@ -535,7 +535,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a.1 -> b.3)[0]", @@ -574,7 +574,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json index c1e909cce..228fd12c1 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json @@ -235,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> service)[0]", @@ -274,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(service -> db)[0]", @@ -313,7 +313,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(db -> service)[0]", @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(service -> bob)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> alice)[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(alice -> bob)[1]", @@ -469,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> queue)[0]", @@ -508,7 +508,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(queue -> bob)[0]", @@ -547,7 +547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> alice)[1]", @@ -586,7 +586,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(alice -- )[0]", 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 c1e909cce..228fd12c1 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json @@ -235,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> service)[0]", @@ -274,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(service -> db)[0]", @@ -313,7 +313,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(db -> service)[0]", @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(service -> bob)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> alice)[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(alice -> bob)[1]", @@ -469,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> queue)[0]", @@ -508,7 +508,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(queue -> bob)[0]", @@ -547,7 +547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(bob -> alice)[1]", @@ -586,7 +586,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(alice -- )[0]", 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 3d3df13a9..378ff4752 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -306,7 +306,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -421,7 +421,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -574,7 +574,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -612,7 +612,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -650,7 +650,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 } ], @@ -692,7 +692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t <- itemResponse.t)[0]", @@ -731,7 +731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> item.t1)[0]", @@ -770,7 +770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t <- item.t1)[0]", @@ -809,7 +809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> essayRubric.t)[0]", @@ -848,7 +848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(itemResponse -> essayRubric.t.c)[0]", @@ -887,7 +887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(essayRubric.t.c -> concept.t)[0]", @@ -926,7 +926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer <- essayRubric.t)[0]", @@ -965,7 +965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> itemOutcome.t1)[0]", @@ -1004,7 +1004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> item.t2)[0]", @@ -1043,7 +1043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> item.t3)[0]", @@ -1082,7 +1082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> itemOutcome.t2)[0]", @@ -1121,7 +1121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> itemOutcome.t3)[0]", @@ -1160,7 +1160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json index 3d3df13a9..378ff4752 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -306,7 +306,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 36, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -421,7 +421,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -574,7 +574,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -612,7 +612,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 }, { @@ -650,7 +650,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 2 } ], @@ -692,7 +692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t <- itemResponse.t)[0]", @@ -731,7 +731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> item.t1)[0]", @@ -770,7 +770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t <- item.t1)[0]", @@ -809,7 +809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> essayRubric.t)[0]", @@ -848,7 +848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(itemResponse -> essayRubric.t.c)[0]", @@ -887,7 +887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(essayRubric.t.c -> concept.t)[0]", @@ -926,7 +926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer <- essayRubric.t)[0]", @@ -965,7 +965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> itemOutcome.t1)[0]", @@ -1004,7 +1004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> item.t2)[0]", @@ -1043,7 +1043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> item.t3)[0]", @@ -1082,7 +1082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> itemOutcome.t2)[0]", @@ -1121,7 +1121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer.t -> itemOutcome.t3)[0]", @@ -1160,7 +1160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(scorer -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index d75c758da..1f98a41e0 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -543,7 +543,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -620,7 +620,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -697,7 +697,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -774,7 +774,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -812,7 +812,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -889,7 +889,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -966,7 +966,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1004,7 +1004,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1042,7 +1042,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1080,7 +1080,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1118,7 +1118,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1195,7 +1195,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1272,7 +1272,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1349,7 +1349,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1426,7 +1426,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1464,7 +1464,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -1541,7 +1541,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1618,7 +1618,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1656,7 +1656,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1694,7 +1694,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1732,7 +1732,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1770,7 +1770,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1847,7 +1847,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1885,7 +1885,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1923,7 +1923,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -1961,7 +1961,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1999,7 +1999,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -2037,7 +2037,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -2075,7 +2075,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -2113,7 +2113,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -2151,7 +2151,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -2189,7 +2189,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 7 }, { @@ -2227,7 +2227,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -2265,7 +2265,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -2303,7 +2303,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -2341,7 +2341,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 7 }, { @@ -2379,7 +2379,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 8 }, { @@ -2417,7 +2417,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -2455,7 +2455,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 } ], @@ -2497,7 +2497,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <- itemResponse.t)[0]", @@ -2536,7 +2536,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -> item.t1)[0]", @@ -2575,7 +2575,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <- item.t1)[0]", @@ -2614,7 +2614,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -> essayRubric.t)[0]", @@ -2653,7 +2653,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -2692,7 +2692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(essayRubric.t.c -> concept.t)[0]", @@ -2731,7 +2731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer <- essayRubric.t)[0]", @@ -2770,7 +2770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <-> itemOutcome.t1)[0]", @@ -2809,7 +2809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <-> item.t2)[0]", @@ -2848,7 +2848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -> item.t3)[0]", @@ -2887,7 +2887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t2)[0]", @@ -2926,7 +2926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t3)[0]", @@ -2965,7 +2965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemResponse.t)[0]", @@ -3004,7 +3004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t <- itemResponse.t)[0]", @@ -3043,7 +3043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> item.t1)[0]", @@ -3082,7 +3082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t <- item.t1)[0]", @@ -3121,7 +3121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> essayRubric.t)[0]", @@ -3160,7 +3160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -3199,7 +3199,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(essayRubric.t.c -> concept.t)[0]", @@ -3238,7 +3238,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer <- essayRubric.t)[0]", @@ -3277,7 +3277,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t1)[0]", @@ -3316,7 +3316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t <-> item.t2)[0]", @@ -3355,7 +3355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> item.t3)[0]", @@ -3394,7 +3394,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t2)[0]", @@ -3433,7 +3433,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t3)[0]", @@ -3472,7 +3472,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a_shape -> a_sequence)[0]", @@ -3811,7 +3811,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(item.a.b -> essayRubric.a.b.c)[0]", @@ -3850,7 +3850,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -3889,7 +3889,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(item.a -> essayRubric.a.b)[0]", @@ -3928,7 +3928,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -3967,7 +3967,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(scorer.abc -> item.a)[0]", @@ -4006,7 +4006,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -4045,7 +4045,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(scorer -> itemResponse.c)[0]", @@ -4084,7 +4084,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a_sequence.scorer -- )[0]", diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index ea58759c0..e028a3dd1 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -543,7 +543,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -620,7 +620,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -697,7 +697,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -774,7 +774,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -812,7 +812,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -889,7 +889,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -966,7 +966,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1004,7 +1004,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1042,7 +1042,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1080,7 +1080,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1118,7 +1118,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 3 }, { @@ -1195,7 +1195,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1272,7 +1272,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1349,7 +1349,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1426,7 +1426,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1464,7 +1464,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -1541,7 +1541,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1618,7 +1618,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1656,7 +1656,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1694,7 +1694,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1732,7 +1732,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1770,7 +1770,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1847,7 +1847,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1885,7 +1885,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1923,7 +1923,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -1961,7 +1961,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -1999,7 +1999,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -2037,7 +2037,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -2075,7 +2075,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -2113,7 +2113,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -2151,7 +2151,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -2189,7 +2189,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 7 }, { @@ -2227,7 +2227,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -2265,7 +2265,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 5 }, { @@ -2303,7 +2303,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 6 }, { @@ -2341,7 +2341,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 7 }, { @@ -2379,7 +2379,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 8 }, { @@ -2417,7 +2417,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 }, { @@ -2455,7 +2455,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 1, + "zIndex": 2, "level": 4 } ], @@ -2497,7 +2497,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <- itemResponse.t)[0]", @@ -2536,7 +2536,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -> item.t1)[0]", @@ -2575,7 +2575,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <- item.t1)[0]", @@ -2614,7 +2614,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -> essayRubric.t)[0]", @@ -2653,7 +2653,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -2692,7 +2692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(essayRubric.t.c -> concept.t)[0]", @@ -2731,7 +2731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer <- essayRubric.t)[0]", @@ -2770,7 +2770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <-> itemOutcome.t1)[0]", @@ -2809,7 +2809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t <-> item.t2)[0]", @@ -2848,7 +2848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -> item.t3)[0]", @@ -2887,7 +2887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t2)[0]", @@ -2926,7 +2926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t3)[0]", @@ -2965,7 +2965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemResponse.t)[0]", @@ -3004,7 +3004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t <- itemResponse.t)[0]", @@ -3043,7 +3043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> item.t1)[0]", @@ -3082,7 +3082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t <- item.t1)[0]", @@ -3121,7 +3121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> essayRubric.t)[0]", @@ -3160,7 +3160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -3199,7 +3199,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(essayRubric.t.c -> concept.t)[0]", @@ -3238,7 +3238,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer <- essayRubric.t)[0]", @@ -3277,7 +3277,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t1)[0]", @@ -3316,7 +3316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t <-> item.t2)[0]", @@ -3355,7 +3355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> item.t3)[0]", @@ -3394,7 +3394,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t2)[0]", @@ -3433,7 +3433,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t3)[0]", @@ -3472,7 +3472,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a_shape -> a_sequence)[0]", @@ -3730,7 +3730,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(item.a.b -> essayRubric.a.b.c)[0]", @@ -3769,7 +3769,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -3808,7 +3808,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(item.a -> essayRubric.a.b)[0]", @@ -3847,7 +3847,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -3886,7 +3886,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(scorer.abc -> item.a)[0]", @@ -3925,7 +3925,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -3964,7 +3964,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "finally.sequence.(scorer -> itemResponse.c)[0]", @@ -4003,7 +4003,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 2 + "zIndex": 3 }, { "id": "(a_sequence.scorer -- )[0]", From 823c7883074cdf021c010eb88e87172c93365096 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 21:19:40 -0800 Subject: [PATCH 07/18] lifeline z index --- d2layouts/d2sequence/constants.go | 9 +- d2layouts/d2sequence/sequence_diagram.go | 1 + .../dagre/board.exp.json | 78 ++++---- .../elk/board.exp.json | 78 ++++---- .../dagre/board.exp.json | 38 ++-- .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 38 ++-- .../elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 64 +++--- .../elk/board.exp.json | 64 +++--- .../dagre/board.exp.json | 22 +-- .../sequence_diagram_note/elk/board.exp.json | 22 +-- .../dagre/board.exp.json | 50 ++--- .../dagre/sketch.exp.svg | 2 +- .../sequence_diagram_real/elk/board.exp.json | 50 ++--- .../sequence_diagram_real/elk/sketch.exp.svg | 2 +- .../dagre/board.exp.json | 28 +-- .../elk/board.exp.json | 28 +-- .../dagre/board.exp.json | 30 +-- .../elk/board.exp.json | 30 +-- .../dagre/board.exp.json | 60 +++--- .../sequence_diagram_span/elk/board.exp.json | 60 +++--- .../sequence_diagrams/dagre/board.exp.json | 182 +++++++++--------- .../sequence_diagrams/elk/board.exp.json | 182 +++++++++--------- 24 files changed, 562 insertions(+), 560 deletions(-) diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index 0973b3ca2..67bd7b306 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -32,8 +32,9 @@ const LIFELINE_STROKE_DASH int = 6 const LIFELINE_LABEL_PAD = 5. const ( - GROUP_Z_INDEX = 1 - SPAN_Z_INDEX = 2 - MESSAGE_Z_INDEX = 3 - NOTE_Z_INDEX = 4 + GROUP_Z_INDEX = 1 + LIFELINE_Z_INDEX = 2 + SPAN_Z_INDEX = 3 + MESSAGE_Z_INDEX = 4 + NOTE_Z_INDEX = 5 ) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 3d424d11c..8a4385103 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -292,6 +292,7 @@ func (sd *sequenceDiagram) addLifelineEdges() { }, DstArrow: false, Route: []*geo.Point{actorBottom, actorLifelineEnd}, + ZIndex: LIFELINE_Z_INDEX, }) } } 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 f0e06e2ca..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 @@ -855,7 +855,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b <-> c)[0]", @@ -894,7 +894,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> d)[0]", @@ -933,7 +933,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(d -> e)[0]", @@ -972,7 +972,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(e -> f)[0]", @@ -1011,7 +1011,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(f -> g)[0]", @@ -1050,7 +1050,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(g -> h)[0]", @@ -1089,7 +1089,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(h -> i)[0]", @@ -1128,7 +1128,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(i -> j)[0]", @@ -1167,7 +1167,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(j -> k)[0]", @@ -1206,7 +1206,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(k -> l)[0]", @@ -1245,7 +1245,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(l -> m)[0]", @@ -1284,7 +1284,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(m -> n)[0]", @@ -1323,7 +1323,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(n -> o)[0]", @@ -1362,7 +1362,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(o -> p)[0]", @@ -1401,7 +1401,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(p -> q)[0]", @@ -1440,7 +1440,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(q -> r)[0]", @@ -1479,7 +1479,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(r -> s)[0]", @@ -1518,7 +1518,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(s -> t)[0]", @@ -1557,7 +1557,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -1596,7 +1596,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -1635,7 +1635,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(c -- )[0]", @@ -1674,7 +1674,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(d -- )[0]", @@ -1713,7 +1713,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(e -- )[0]", @@ -1752,7 +1752,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(f -- )[0]", @@ -1791,7 +1791,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(g -- )[0]", @@ -1830,7 +1830,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(h -- )[0]", @@ -1869,7 +1869,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(i -- )[0]", @@ -1908,7 +1908,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(j -- )[0]", @@ -1947,7 +1947,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(k -- )[0]", @@ -1986,7 +1986,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(l -- )[0]", @@ -2025,7 +2025,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(m -- )[0]", @@ -2064,7 +2064,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(n -- )[0]", @@ -2103,7 +2103,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(o -- )[0]", @@ -2142,7 +2142,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(p -- )[0]", @@ -2181,7 +2181,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(q -- )[0]", @@ -2220,7 +2220,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(r -- )[0]", @@ -2259,7 +2259,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(s -- )[0]", @@ -2298,7 +2298,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(t -- )[0]", @@ -2337,7 +2337,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } 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 f0e06e2ca..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 @@ -855,7 +855,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b <-> c)[0]", @@ -894,7 +894,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> d)[0]", @@ -933,7 +933,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(d -> e)[0]", @@ -972,7 +972,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(e -> f)[0]", @@ -1011,7 +1011,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(f -> g)[0]", @@ -1050,7 +1050,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(g -> h)[0]", @@ -1089,7 +1089,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(h -> i)[0]", @@ -1128,7 +1128,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(i -> j)[0]", @@ -1167,7 +1167,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(j -> k)[0]", @@ -1206,7 +1206,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(k -> l)[0]", @@ -1245,7 +1245,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(l -> m)[0]", @@ -1284,7 +1284,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(m -> n)[0]", @@ -1323,7 +1323,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(n -> o)[0]", @@ -1362,7 +1362,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(o -> p)[0]", @@ -1401,7 +1401,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(p -> q)[0]", @@ -1440,7 +1440,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(q -> r)[0]", @@ -1479,7 +1479,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(r -> s)[0]", @@ -1518,7 +1518,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(s -> t)[0]", @@ -1557,7 +1557,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -1596,7 +1596,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -1635,7 +1635,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(c -- )[0]", @@ -1674,7 +1674,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(d -- )[0]", @@ -1713,7 +1713,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(e -- )[0]", @@ -1752,7 +1752,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(f -- )[0]", @@ -1791,7 +1791,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(g -- )[0]", @@ -1830,7 +1830,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(h -- )[0]", @@ -1869,7 +1869,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(i -- )[0]", @@ -1908,7 +1908,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(j -- )[0]", @@ -1947,7 +1947,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(k -- )[0]", @@ -1986,7 +1986,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(l -- )[0]", @@ -2025,7 +2025,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(m -- )[0]", @@ -2064,7 +2064,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(n -- )[0]", @@ -2103,7 +2103,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(o -- )[0]", @@ -2142,7 +2142,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(p -- )[0]", @@ -2181,7 +2181,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(q -- )[0]", @@ -2220,7 +2220,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(r -- )[0]", @@ -2259,7 +2259,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(s -- )[0]", @@ -2298,7 +2298,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(t -- )[0]", @@ -2337,7 +2337,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } 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 ed029f471..1eada8b3a 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -345,7 +345,7 @@ "labelWidth": 166, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -422,7 +422,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -460,7 +460,7 @@ "underline": false, "labelWidth": 25, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 } ], @@ -578,7 +578,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -> b)[1]", @@ -617,7 +617,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -656,7 +656,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[0]", @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[1]", @@ -734,7 +734,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b.t1 -> c.t1)[0]", @@ -773,7 +773,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b.t1.t2 -> c.t1)[0]", @@ -812,7 +812,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c.t1 -> b.t1)[0]", @@ -851,7 +851,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> c)[1]", @@ -890,7 +890,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[2]", @@ -929,7 +929,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -968,7 +968,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -1007,7 +1007,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(c -- )[0]", @@ -1046,7 +1046,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(d -- )[0]", @@ -1085,7 +1085,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } 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 af4ca4cec..5b76838f8 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2311" viewBox="-100 -50 1069 2311">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +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 ed029f471..1eada8b3a 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -345,7 +345,7 @@ "labelWidth": 166, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -422,7 +422,7 @@ "labelWidth": 68, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -460,7 +460,7 @@ "underline": false, "labelWidth": 25, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 } ], @@ -578,7 +578,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -> b)[1]", @@ -617,7 +617,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -656,7 +656,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[0]", @@ -695,7 +695,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[1]", @@ -734,7 +734,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b.t1 -> c.t1)[0]", @@ -773,7 +773,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b.t1.t2 -> c.t1)[0]", @@ -812,7 +812,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c.t1 -> b.t1)[0]", @@ -851,7 +851,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> c)[1]", @@ -890,7 +890,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[2]", @@ -929,7 +929,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -968,7 +968,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -1007,7 +1007,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(c -- )[0]", @@ -1046,7 +1046,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(d -- )[0]", @@ -1085,7 +1085,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } 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 af4ca4cec..5b76838f8 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2311" viewBox="-100 -50 1069 2311">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json index ca680e34e..227a4b694 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -267,7 +267,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -382,7 +382,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -420,7 +420,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -497,7 +497,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -535,7 +535,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -573,7 +573,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -611,7 +611,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -688,7 +688,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -726,7 +726,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -764,7 +764,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -802,7 +802,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -840,7 +840,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -878,7 +878,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 } ], @@ -920,7 +920,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(itemResponse.a -> item.a.b)[0]", @@ -959,7 +959,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(item.a.b -> essayRubric.a.b.c)[0]", @@ -998,7 +998,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -1037,7 +1037,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(item.a -> essayRubric.a.b)[0]", @@ -1076,7 +1076,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -1115,7 +1115,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.abc -> item.a)[0]", @@ -1154,7 +1154,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -1193,7 +1193,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer -> itemResponse.c)[0]", @@ -1232,7 +1232,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer -- )[0]", @@ -1271,7 +1271,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemResponse -- )[0]", @@ -1310,7 +1310,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(item -- )[0]", @@ -1349,7 +1349,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(essayRubric -- )[0]", @@ -1388,7 +1388,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(concept -- )[0]", @@ -1427,7 +1427,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemOutcome -- )[0]", @@ -1466,7 +1466,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json index ca680e34e..227a4b694 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -267,7 +267,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -382,7 +382,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -420,7 +420,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -497,7 +497,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -535,7 +535,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -573,7 +573,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -611,7 +611,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -688,7 +688,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -726,7 +726,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -764,7 +764,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -802,7 +802,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -840,7 +840,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -878,7 +878,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 } ], @@ -920,7 +920,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(itemResponse.a -> item.a.b)[0]", @@ -959,7 +959,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(item.a.b -> essayRubric.a.b.c)[0]", @@ -998,7 +998,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -1037,7 +1037,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(item.a -> essayRubric.a.b)[0]", @@ -1076,7 +1076,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -1115,7 +1115,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.abc -> item.a)[0]", @@ -1154,7 +1154,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -1193,7 +1193,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer -> itemResponse.c)[0]", @@ -1232,7 +1232,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer -- )[0]", @@ -1271,7 +1271,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemResponse -- )[0]", @@ -1310,7 +1310,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(item -- )[0]", @@ -1349,7 +1349,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(essayRubric -- )[0]", @@ -1388,7 +1388,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(concept -- )[0]", @@ -1427,7 +1427,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemOutcome -- )[0]", @@ -1466,7 +1466,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json index 5ca5fbedb..2e2835f6a 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json @@ -193,7 +193,7 @@ "labelWidth": 90, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -232,7 +232,7 @@ "labelWidth": 150, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -271,7 +271,7 @@ "labelWidth": 293, "labelHeight": 42, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -310,7 +310,7 @@ "labelWidth": 441, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 } ], @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -469,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -508,7 +508,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(c -- )[0]", @@ -547,7 +547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(d -- )[0]", @@ -586,7 +586,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json index 5ca5fbedb..2e2835f6a 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json @@ -193,7 +193,7 @@ "labelWidth": 90, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -232,7 +232,7 @@ "labelWidth": 150, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -271,7 +271,7 @@ "labelWidth": 293, "labelHeight": 42, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 }, { @@ -310,7 +310,7 @@ "labelWidth": 441, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 2 } ], @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> c)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(c -> b)[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -469,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -508,7 +508,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(c -- )[0]", @@ -547,7 +547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(d -- )[0]", @@ -586,7 +586,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json index afb7e2f65..b674a70ba 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json @@ -349,7 +349,7 @@ "labelWidth": 218, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 3 }, { @@ -426,7 +426,7 @@ "underline": false, "labelWidth": 50, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -542,7 +542,7 @@ "underline": false, "labelWidth": 52, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 } ], @@ -584,7 +584,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2ast -> CLI)[0]", @@ -623,7 +623,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(CLI -> d2compiler)[0]", @@ -662,7 +662,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2compiler -> CLI)[0]", @@ -701,7 +701,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(CLI -> d2layout.layout)[0]", @@ -740,7 +740,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout.layout -> d2sequencelayout)[0]", @@ -779,7 +779,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout.layout -> d2dagrelayout)[0]", @@ -818,7 +818,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout.layout <- d2sequencelayout)[0]", @@ -857,7 +857,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout -> CLI)[0]", @@ -896,7 +896,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(CLI -> d2exporter)[0]", @@ -935,7 +935,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2exporter.export -> d2themes)[0]", @@ -974,7 +974,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2exporter.export -> d2renderer)[0]", @@ -1013,7 +1013,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2exporter.export -> CLI)[0]", @@ -1052,7 +1052,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(How this is rendered.CLI -- )[0]", @@ -1091,7 +1091,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2ast -- )[0]", @@ -1130,7 +1130,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2compiler -- )[0]", @@ -1169,7 +1169,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2layout -- )[0]", @@ -1208,7 +1208,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2exporter -- )[0]", @@ -1247,7 +1247,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2themes -- )[0]", @@ -1286,7 +1286,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2renderer -- )[0]", @@ -1325,7 +1325,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2sequencelayout -- )[0]", @@ -1364,7 +1364,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2dagrelayout -- )[0]", @@ -1403,7 +1403,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index fc095c06a..a08f96df1 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="2393" height="2511" viewBox="-100 -100 2393 2511">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 ab96624a8..5fc4fb630 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -349,7 +349,7 @@ "labelWidth": 218, "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", - "zIndex": 4, + "zIndex": 5, "level": 3 }, { @@ -425,7 +425,7 @@ "underline": false, "labelWidth": 50, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -541,7 +541,7 @@ "underline": false, "labelWidth": 52, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 } ], @@ -583,7 +583,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2ast -> CLI)[0]", @@ -622,7 +622,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(CLI -> d2compiler)[0]", @@ -661,7 +661,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2compiler -> CLI)[0]", @@ -700,7 +700,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(CLI -> d2layout.layout)[0]", @@ -739,7 +739,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout.layout -> d2sequencelayout)[0]", @@ -778,7 +778,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout.layout -> d2dagrelayout)[0]", @@ -817,7 +817,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout.layout <- d2sequencelayout)[0]", @@ -856,7 +856,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2layout -> CLI)[0]", @@ -895,7 +895,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(CLI -> d2exporter)[0]", @@ -934,7 +934,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2exporter.export -> d2themes)[0]", @@ -973,7 +973,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2exporter.export -> d2renderer)[0]", @@ -1012,7 +1012,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "How this is rendered.(d2exporter.export -> CLI)[0]", @@ -1051,7 +1051,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(How this is rendered.CLI -- )[0]", @@ -1090,7 +1090,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2ast -- )[0]", @@ -1129,7 +1129,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2compiler -- )[0]", @@ -1168,7 +1168,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2layout -- )[0]", @@ -1207,7 +1207,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2exporter -- )[0]", @@ -1246,7 +1246,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2themes -- )[0]", @@ -1285,7 +1285,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2renderer -- )[0]", @@ -1324,7 +1324,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2sequencelayout -- )[0]", @@ -1363,7 +1363,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(How this is rendered.d2dagrelayout -- )[0]", @@ -1402,7 +1402,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } 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 6c2bc8c4c..bc50587c6 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="2393" height="2511" viewBox="-88 -88 2393 2511">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_self_edges/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json index 4ea28acaa..e34ff0b04 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json @@ -114,7 +114,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -190,7 +190,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -228,7 +228,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -266,7 +266,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 } ], @@ -316,7 +316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -> b)[0]", @@ -355,7 +355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> b.1)[0]", @@ -402,7 +402,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "b.(1 -> 1.2)[0]", @@ -449,7 +449,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b.1.2 -> b)[0]", @@ -496,7 +496,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> a.1.2)[0]", @@ -535,7 +535,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a.1 -> b.3)[0]", @@ -574,7 +574,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -613,7 +613,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -652,7 +652,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json index 4ea28acaa..e34ff0b04 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json @@ -114,7 +114,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -190,7 +190,7 @@ "underline": false, "labelWidth": 15, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -228,7 +228,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -266,7 +266,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 } ], @@ -316,7 +316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -> b)[0]", @@ -355,7 +355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> b.1)[0]", @@ -402,7 +402,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "b.(1 -> 1.2)[0]", @@ -449,7 +449,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b.1.2 -> b)[0]", @@ -496,7 +496,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(b -> a.1.2)[0]", @@ -535,7 +535,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a.1 -> b.3)[0]", @@ -574,7 +574,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a -- )[0]", @@ -613,7 +613,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(b -- )[0]", @@ -652,7 +652,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json index 228fd12c1..a444d77d8 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json @@ -235,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> service)[0]", @@ -274,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(service -> db)[0]", @@ -313,7 +313,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(db -> service)[0]", @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(service -> bob)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> alice)[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(alice -> bob)[1]", @@ -469,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> queue)[0]", @@ -508,7 +508,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(queue -> bob)[0]", @@ -547,7 +547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> alice)[1]", @@ -586,7 +586,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(alice -- )[0]", @@ -625,7 +625,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(bob -- )[0]", @@ -664,7 +664,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(db -- )[0]", @@ -703,7 +703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(queue -- )[0]", @@ -742,7 +742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(service -- )[0]", @@ -781,7 +781,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } 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 228fd12c1..a444d77d8 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json @@ -235,7 +235,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> service)[0]", @@ -274,7 +274,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(service -> db)[0]", @@ -313,7 +313,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(db -> service)[0]", @@ -352,7 +352,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(service -> bob)[0]", @@ -391,7 +391,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> alice)[0]", @@ -430,7 +430,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(alice -> bob)[1]", @@ -469,7 +469,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> queue)[0]", @@ -508,7 +508,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(queue -> bob)[0]", @@ -547,7 +547,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(bob -> alice)[1]", @@ -586,7 +586,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(alice -- )[0]", @@ -625,7 +625,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(bob -- )[0]", @@ -664,7 +664,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(db -- )[0]", @@ -703,7 +703,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(queue -- )[0]", @@ -742,7 +742,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(service -- )[0]", @@ -781,7 +781,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } 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 378ff4752..a8d1c897c 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -306,7 +306,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -421,7 +421,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -574,7 +574,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -612,7 +612,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -650,7 +650,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 } ], @@ -692,7 +692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t <- itemResponse.t)[0]", @@ -731,7 +731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> item.t1)[0]", @@ -770,7 +770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t <- item.t1)[0]", @@ -809,7 +809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> essayRubric.t)[0]", @@ -848,7 +848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(itemResponse -> essayRubric.t.c)[0]", @@ -887,7 +887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(essayRubric.t.c -> concept.t)[0]", @@ -926,7 +926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer <- essayRubric.t)[0]", @@ -965,7 +965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> itemOutcome.t1)[0]", @@ -1004,7 +1004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> item.t2)[0]", @@ -1043,7 +1043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> item.t3)[0]", @@ -1082,7 +1082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> itemOutcome.t2)[0]", @@ -1121,7 +1121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> itemOutcome.t3)[0]", @@ -1160,7 +1160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer -- )[0]", @@ -1199,7 +1199,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemResponse -- )[0]", @@ -1238,7 +1238,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(item -- )[0]", @@ -1277,7 +1277,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(essayRubric -- )[0]", @@ -1316,7 +1316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(concept -- )[0]", @@ -1355,7 +1355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemOutcome -- )[0]", @@ -1394,7 +1394,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json index 378ff4752..a8d1c897c 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json @@ -75,7 +75,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -152,7 +152,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -229,7 +229,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -306,7 +306,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 36, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -344,7 +344,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -421,7 +421,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -498,7 +498,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -536,7 +536,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -574,7 +574,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -612,7 +612,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 }, { @@ -650,7 +650,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 2 } ], @@ -692,7 +692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t <- itemResponse.t)[0]", @@ -731,7 +731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> item.t1)[0]", @@ -770,7 +770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t <- item.t1)[0]", @@ -809,7 +809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> essayRubric.t)[0]", @@ -848,7 +848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(itemResponse -> essayRubric.t.c)[0]", @@ -887,7 +887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(essayRubric.t.c -> concept.t)[0]", @@ -926,7 +926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer <- essayRubric.t)[0]", @@ -965,7 +965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> itemOutcome.t1)[0]", @@ -1004,7 +1004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> item.t2)[0]", @@ -1043,7 +1043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> item.t3)[0]", @@ -1082,7 +1082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> itemOutcome.t2)[0]", @@ -1121,7 +1121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer.t -> itemOutcome.t3)[0]", @@ -1160,7 +1160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(scorer -- )[0]", @@ -1199,7 +1199,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemResponse -- )[0]", @@ -1238,7 +1238,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(item -- )[0]", @@ -1277,7 +1277,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(essayRubric -- )[0]", @@ -1316,7 +1316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(concept -- )[0]", @@ -1355,7 +1355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(itemOutcome -- )[0]", @@ -1394,7 +1394,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index 1f98a41e0..806c4d020 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -543,7 +543,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -620,7 +620,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -697,7 +697,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -774,7 +774,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -812,7 +812,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -889,7 +889,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -966,7 +966,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1004,7 +1004,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1042,7 +1042,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1080,7 +1080,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1118,7 +1118,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1195,7 +1195,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1272,7 +1272,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1349,7 +1349,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1426,7 +1426,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1464,7 +1464,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -1541,7 +1541,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1618,7 +1618,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1656,7 +1656,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1694,7 +1694,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1732,7 +1732,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1770,7 +1770,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1847,7 +1847,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1885,7 +1885,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1923,7 +1923,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -1961,7 +1961,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1999,7 +1999,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -2037,7 +2037,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -2075,7 +2075,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -2113,7 +2113,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -2151,7 +2151,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -2189,7 +2189,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 7 }, { @@ -2227,7 +2227,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -2265,7 +2265,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -2303,7 +2303,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -2341,7 +2341,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 7 }, { @@ -2379,7 +2379,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 8 }, { @@ -2417,7 +2417,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -2455,7 +2455,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 } ], @@ -2497,7 +2497,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <- itemResponse.t)[0]", @@ -2536,7 +2536,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -> item.t1)[0]", @@ -2575,7 +2575,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <- item.t1)[0]", @@ -2614,7 +2614,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -> essayRubric.t)[0]", @@ -2653,7 +2653,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -2692,7 +2692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(essayRubric.t.c -> concept.t)[0]", @@ -2731,7 +2731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer <- essayRubric.t)[0]", @@ -2770,7 +2770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <-> itemOutcome.t1)[0]", @@ -2809,7 +2809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <-> item.t2)[0]", @@ -2848,7 +2848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -> item.t3)[0]", @@ -2887,7 +2887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t2)[0]", @@ -2926,7 +2926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t3)[0]", @@ -2965,7 +2965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemResponse.t)[0]", @@ -3004,7 +3004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t <- itemResponse.t)[0]", @@ -3043,7 +3043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> item.t1)[0]", @@ -3082,7 +3082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t <- item.t1)[0]", @@ -3121,7 +3121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> essayRubric.t)[0]", @@ -3160,7 +3160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -3199,7 +3199,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(essayRubric.t.c -> concept.t)[0]", @@ -3238,7 +3238,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer <- essayRubric.t)[0]", @@ -3277,7 +3277,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t1)[0]", @@ -3316,7 +3316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t <-> item.t2)[0]", @@ -3355,7 +3355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> item.t3)[0]", @@ -3394,7 +3394,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t2)[0]", @@ -3433,7 +3433,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t3)[0]", @@ -3472,7 +3472,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a_shape -> a_sequence)[0]", @@ -3811,7 +3811,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(item.a.b -> essayRubric.a.b.c)[0]", @@ -3850,7 +3850,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -3889,7 +3889,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(item.a -> essayRubric.a.b)[0]", @@ -3928,7 +3928,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -3967,7 +3967,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(scorer.abc -> item.a)[0]", @@ -4006,7 +4006,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -4045,7 +4045,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(scorer -> itemResponse.c)[0]", @@ -4084,7 +4084,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a_sequence.scorer -- )[0]", @@ -4123,7 +4123,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.itemResponse -- )[0]", @@ -4162,7 +4162,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.item -- )[0]", @@ -4201,7 +4201,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.essayRubric -- )[0]", @@ -4240,7 +4240,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.concept -- )[0]", @@ -4279,7 +4279,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.itemOutcome -- )[0]", @@ -4318,7 +4318,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.scorer -- )[0]", @@ -4357,7 +4357,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.itemResponse -- )[0]", @@ -4396,7 +4396,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.item -- )[0]", @@ -4435,7 +4435,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.essayRubric -- )[0]", @@ -4474,7 +4474,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.concept -- )[0]", @@ -4513,7 +4513,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.itemOutcome -- )[0]", @@ -4552,7 +4552,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.scorer -- )[0]", @@ -4591,7 +4591,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.concept -- )[0]", @@ -4630,7 +4630,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.essayRubric -- )[0]", @@ -4669,7 +4669,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.item -- )[0]", @@ -4708,7 +4708,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.itemOutcome -- )[0]", @@ -4747,7 +4747,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.itemResponse -- )[0]", @@ -4786,7 +4786,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index e028a3dd1..21faa0ac2 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -543,7 +543,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -620,7 +620,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -697,7 +697,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -774,7 +774,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 31, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -812,7 +812,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -889,7 +889,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -966,7 +966,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1004,7 +1004,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1042,7 +1042,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1080,7 +1080,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1118,7 +1118,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 3 }, { @@ -1195,7 +1195,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1272,7 +1272,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1349,7 +1349,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1426,7 +1426,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1464,7 +1464,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -1541,7 +1541,7 @@ "underline": false, "labelWidth": 11, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1618,7 +1618,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1656,7 +1656,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1694,7 +1694,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1732,7 +1732,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1770,7 +1770,7 @@ "underline": false, "labelWidth": 20, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1847,7 +1847,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1885,7 +1885,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1923,7 +1923,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -1961,7 +1961,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -1999,7 +1999,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -2037,7 +2037,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -2075,7 +2075,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -2113,7 +2113,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -2151,7 +2151,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -2189,7 +2189,7 @@ "underline": false, "labelWidth": 14, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 7 }, { @@ -2227,7 +2227,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -2265,7 +2265,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 5 }, { @@ -2303,7 +2303,7 @@ "underline": false, "labelWidth": 12, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 6 }, { @@ -2341,7 +2341,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 7 }, { @@ -2379,7 +2379,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 8 }, { @@ -2417,7 +2417,7 @@ "underline": false, "labelWidth": 31, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 }, { @@ -2455,7 +2455,7 @@ "underline": false, "labelWidth": 13, "labelHeight": 26, - "zIndex": 2, + "zIndex": 3, "level": 4 } ], @@ -2497,7 +2497,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <- itemResponse.t)[0]", @@ -2536,7 +2536,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -> item.t1)[0]", @@ -2575,7 +2575,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <- item.t1)[0]", @@ -2614,7 +2614,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -> essayRubric.t)[0]", @@ -2653,7 +2653,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -2692,7 +2692,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(essayRubric.t.c -> concept.t)[0]", @@ -2731,7 +2731,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer <- essayRubric.t)[0]", @@ -2770,7 +2770,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <-> itemOutcome.t1)[0]", @@ -2809,7 +2809,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t <-> item.t2)[0]", @@ -2848,7 +2848,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -> item.t3)[0]", @@ -2887,7 +2887,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t2)[0]", @@ -2926,7 +2926,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "a_sequence.(scorer.t -- itemOutcome.t3)[0]", @@ -2965,7 +2965,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemResponse.t)[0]", @@ -3004,7 +3004,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t <- itemResponse.t)[0]", @@ -3043,7 +3043,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> item.t1)[0]", @@ -3082,7 +3082,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t <- item.t1)[0]", @@ -3121,7 +3121,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> essayRubric.t)[0]", @@ -3160,7 +3160,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(itemResponse -> essayRubric.t.c)[0]", @@ -3199,7 +3199,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(essayRubric.t.c -> concept.t)[0]", @@ -3238,7 +3238,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer <- essayRubric.t)[0]", @@ -3277,7 +3277,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t1)[0]", @@ -3316,7 +3316,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t <-> item.t2)[0]", @@ -3355,7 +3355,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> item.t3)[0]", @@ -3394,7 +3394,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t2)[0]", @@ -3433,7 +3433,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "another.sequence.(scorer.t -> itemOutcome.t3)[0]", @@ -3472,7 +3472,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a_shape -> a_sequence)[0]", @@ -3730,7 +3730,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(item.a.b -> essayRubric.a.b.c)[0]", @@ -3769,7 +3769,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(essayRubric.a.b.c -> concept.a.b.c.d)[0]", @@ -3808,7 +3808,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(item.a -> essayRubric.a.b)[0]", @@ -3847,7 +3847,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(concept.a.b.c.d -> itemOutcome.a.b.c.d.e)[0]", @@ -3886,7 +3886,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(scorer.abc -> item.a)[0]", @@ -3925,7 +3925,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(itemOutcome.a.b.c.d.e -> scorer)[0]", @@ -3964,7 +3964,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "finally.sequence.(scorer -> itemResponse.c)[0]", @@ -4003,7 +4003,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 3 + "zIndex": 4 }, { "id": "(a_sequence.scorer -- )[0]", @@ -4042,7 +4042,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.itemResponse -- )[0]", @@ -4081,7 +4081,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.item -- )[0]", @@ -4120,7 +4120,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.essayRubric -- )[0]", @@ -4159,7 +4159,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.concept -- )[0]", @@ -4198,7 +4198,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(a_sequence.itemOutcome -- )[0]", @@ -4237,7 +4237,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.scorer -- )[0]", @@ -4276,7 +4276,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.itemResponse -- )[0]", @@ -4315,7 +4315,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.item -- )[0]", @@ -4354,7 +4354,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.essayRubric -- )[0]", @@ -4393,7 +4393,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.concept -- )[0]", @@ -4432,7 +4432,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(another.sequence.itemOutcome -- )[0]", @@ -4471,7 +4471,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.scorer -- )[0]", @@ -4510,7 +4510,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.concept -- )[0]", @@ -4549,7 +4549,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.essayRubric -- )[0]", @@ -4588,7 +4588,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.item -- )[0]", @@ -4627,7 +4627,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.itemOutcome -- )[0]", @@ -4666,7 +4666,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 }, { "id": "(finally.sequence.itemResponse -- )[0]", @@ -4705,7 +4705,7 @@ "animated": false, "tooltip": "", "icon": null, - "zIndex": 0 + "zIndex": 2 } ] } From c765298e396ca9aa2aa81c30f6a7b791a9adcfe8 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 21:57:59 -0800 Subject: [PATCH 08/18] nested group styling --- d2graph/d2graph.go | 10 +++++++++- d2graph/seqdiagram.go | 12 +++++++----- d2layouts/d2sequence/sequence_diagram.go | 3 +-- d2themes/d2themes.go | 3 +++ .../sequence_diagram_groups/dagre/board.exp.json | 2 +- .../sequence_diagram_groups/dagre/sketch.exp.svg | 2 +- .../sequence_diagram_groups/elk/board.exp.json | 2 +- .../sequence_diagram_groups/elk/sketch.exp.svg | 2 +- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 7c320856b..d9a96d83a 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -330,13 +330,21 @@ func (l ContainerLevel) LabelSize() int { } func (obj *Object) GetFill(theme *d2themes.Theme) string { + level := int(obj.Level()) if obj.Parent.IsSequenceDiagram() { return theme.Colors.B5 } else if obj.IsSequenceDiagramNote() { return theme.Colors.Neutrals.N7 + } else if obj.IsSequenceDiagramGroup() { + sd := obj.outerSequenceDiagram() + // Alternate + if (level-int(sd.Level()))%2 == 0 { + return theme.Colors.Neutrals.N7 + } else { + return theme.Colors.Neutrals.N6 + } } - level := int(obj.Level()) shape := obj.Attributes.Shape.Value if shape == "" || strings.EqualFold(shape, d2target.ShapeSquare) || strings.EqualFold(shape, d2target.ShapeCircle) || strings.EqualFold(shape, d2target.ShapeOval) || strings.EqualFold(shape, d2target.ShapeRectangle) { diff --git a/d2graph/seqdiagram.go b/d2graph/seqdiagram.go index bf89b0f70..fbd4d4bb6 100644 --- a/d2graph/seqdiagram.go +++ b/d2graph/seqdiagram.go @@ -18,15 +18,18 @@ func (obj *Object) outerSequenceDiagram() *Object { // groups are objects in sequence diagrams that have no messages connected // and does not have a note as a child (a note can appear within a group, but it's a child of an actor) -func (obj *Object) IsSequenceDiagramGroup(edges []*Edge) bool { - for _, e := range edges { +func (obj *Object) IsSequenceDiagramGroup() bool { + if obj.outerSequenceDiagram() == nil { + return false + } + for _, e := range obj.Graph.Edges { if e.Src == obj || e.Dst == obj { return false } } for _, ch := range obj.ChildrenArray { // if the child contains a message, it's a span, not a note - if !ch.ContainsAnyEdge(edges) { + if !ch.ContainsAnyEdge(obj.Graph.Edges) { return false } } @@ -35,8 +38,7 @@ func (obj *Object) IsSequenceDiagramGroup(edges []*Edge) bool { // notes are descendant of actors with no edges and no children func (obj *Object) IsSequenceDiagramNote() bool { - sd := obj.outerSequenceDiagram() - if sd == nil { + if obj.outerSequenceDiagram() == nil { return false } return !obj.hasEdgeRef() && !obj.ContainsAnyEdge(obj.Graph.Edges) && len(obj.ChildrenArray) == 0 diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 8a4385103..9edcf2d72 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -65,7 +65,7 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se var groups []*d2graph.Object for _, obj := range objects { - if obj.IsSequenceDiagramGroup(messages) { + if obj.IsSequenceDiagramGroup() { queue := []*d2graph.Object{obj} // Groups may have more nested groups for len(queue) > 0 { @@ -175,7 +175,6 @@ func (sd *sequenceDiagram) layout() error { func (sd *sequenceDiagram) placeGroups() { for _, group := range sd.groups { group.ZIndex = GROUP_Z_INDEX - // group.Attributes.Style.Opacity = &d2graph.Scalar{Value: "0.5"} sd.placeGroup(group) } } diff --git a/d2themes/d2themes.go b/d2themes/d2themes.go index c5217c592..64510eb2f 100644 --- a/d2themes/d2themes.go +++ b/d2themes/d2themes.go @@ -14,6 +14,7 @@ type Neutral struct { N3 string `json:"n3"` N4 string `json:"n4"` N5 string `json:"n5"` + N6 string `json:"n6"` N7 string `json:"n7"` } @@ -44,6 +45,7 @@ var CoolNeutral = Neutral{ N3: "#9499AB", N4: "#CFD2DD", N5: "#F0F3F9", + N6: "#EEF1F8", N7: "#FFFFFF", } @@ -53,5 +55,6 @@ var WarmNeutral = Neutral{ N3: "#787777", N4: "#CCCACA", N5: "#DFDCDC", + N6: "#ECEBEB", N7: "#FFFFFF", } 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 1eada8b3a..9a6740045 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -246,7 +246,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": 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 5b76838f8..b569a7a6e 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2311" viewBox="-100 -50 1069 2311">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +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 1eada8b3a..9a6740045 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -246,7 +246,7 @@ "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, - "fill": "#EDF0FD", + "fill": "#FFFFFF", "stroke": "#0D32B2", "shadow": false, "3d": false, 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 5b76838f8..b569a7a6e 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2311" viewBox="-100 -50 1069 2311">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note From df81a5aeaa039666b397d52f811d39df8554c999 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 22:31:37 -0800 Subject: [PATCH 09/18] fix span width --- d2layouts/d2sequence/sequence_diagram.go | 4 +- .../dagre/board.exp.json | 26 +- .../dagre/sketch.exp.svg | 16 +- .../sequence_diagram_real/elk/board.exp.json | 26 +- .../sequence_diagram_real/elk/sketch.exp.svg | 16 +- .../sequence_diagrams/dagre/board.exp.json | 280 +++++++++--------- .../sequence_diagrams/dagre/sketch.exp.svg | 6 +- .../sequence_diagrams/elk/board.exp.json | 280 +++++++++--------- .../sequence_diagrams/elk/sketch.exp.svg | 6 +- 9 files changed, 330 insertions(+), 330 deletions(-) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 9edcf2d72..33ea2fc40 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -389,8 +389,8 @@ func (sd *sequenceDiagram) placeSpans() { } height := math.Max(maxY-minY, MIN_SPAN_HEIGHT) - // -2 because the actors count as level 1 making the first level span getting 2*SPAN_DEPTH_GROW_FACTOR - width := SPAN_BASE_WIDTH + (float64(span.Level()-2) * SPAN_DEPTH_GROWTH_FACTOR) + // -1 because the actors count as 1 level + width := SPAN_BASE_WIDTH + (float64(span.Level()-sd.root.Level()-2) * SPAN_DEPTH_GROWTH_FACTOR) x := rankToX[sd.objectRank[span]] - (width / 2.) span.Box = geo.NewBox(geo.NewPoint(x, minY), width, height) span.ZIndex = SPAN_Z_INDEX diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json index b674a70ba..8103cdff0 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json @@ -8,7 +8,7 @@ "x": 0, "y": 0 }, - "width": 1504, + "width": 1508, "height": 180, "opacity": 1, "strokeDash": 0, @@ -359,7 +359,7 @@ "x": 50, "y": 50 }, - "width": 1404, + "width": 1408, "height": 80, "opacity": 1, "strokeDash": 0, @@ -395,10 +395,10 @@ "id": "How this is rendered.d2layout.layout", "type": "rectangle", "pos": { - "x": 764, + "x": 768, "y": 1125 }, - "width": 20, + "width": 12, "height": 422, "opacity": 1, "strokeDash": 0, @@ -511,10 +511,10 @@ "id": "How this is rendered.d2exporter.export", "type": "rectangle", "pos": { - "x": 1007, + "x": 1011, "y": 1905 }, - "width": 20, + "width": 12, "height": 292, "opacity": 1, "strokeDash": 0, @@ -733,7 +733,7 @@ "y": 1141 }, { - "x": 764.5, + "x": 768.5, "y": 1141 } ], @@ -768,7 +768,7 @@ "labelPercentage": 0, "route": [ { - "x": 784.5, + "x": 780.5, "y": 1271 }, { @@ -807,7 +807,7 @@ "labelPercentage": 0, "route": [ { - "x": 784.5, + "x": 780.5, "y": 1401 }, { @@ -846,7 +846,7 @@ "labelPercentage": 0, "route": [ { - "x": 784.5, + "x": 780.5, "y": 1531 }, { @@ -963,7 +963,7 @@ "labelPercentage": 0, "route": [ { - "x": 1027, + "x": 1023, "y": 1921 }, { @@ -1002,7 +1002,7 @@ "labelPercentage": 0, "route": [ { - "x": 1027, + "x": 1023, "y": 2051 }, { @@ -1041,7 +1041,7 @@ "labelPercentage": 0, "route": [ { - "x": 1007, + "x": 1011, "y": 2181 }, { diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index a08f96df1..670f54329 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -14,21 +14,21 @@ width="2393" height="2511" viewBox="-100 -100 2393 2511">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 - - - - + + + + - - - + + + 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) @@ -22,7 +22,7 @@ width="3244" height="4201" viewBox="-100 -100 3244 4201">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) @@ -22,7 +22,7 @@ width="3166" height="4321" viewBox="-88 -88 3166 4321">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 + + - - - + + + 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 f06d31ed2..73b2fad99 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": 84 + "y": 87 }, "width": 150, - "height": 150, + "height": 147, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,10 +212,10 @@ "type": "cylinder", "pos": { "x": 1269, - "y": 84 + "y": 108 }, "width": 150, - "height": 150, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -251,10 +251,10 @@ "type": "diamond", "pos": { "x": 1489, - "y": 85 + "y": 108 }, "width": 150, - "height": 149, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -290,10 +290,10 @@ "type": "document", "pos": { "x": 1709, - "y": 97 + "y": 108 }, "width": 150, - "height": 137, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -368,10 +368,10 @@ "type": "image", "pos": { "x": 2181, - "y": 63 + "y": 85 }, "width": 150, - "height": 150, + "height": 128, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,10 +418,10 @@ "type": "oval", "pos": { "x": 2401, - "y": 97 + "y": 108 }, "width": 150, - "height": 137, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -457,10 +457,10 @@ "type": "package", "pos": { "x": 2621, - "y": 98 + "y": 108 }, "width": 150, - "height": 136, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -730,10 +730,10 @@ "type": "stored_data", "pos": { "x": 4312, - "y": 96 + "y": 108 }, "width": 150, - "height": 138, + "height": 126, "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 8cf3cf52b..7e13b2b3a 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 9a6740045..251a8aed9 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": 52 + "y": 50 }, "width": 150, - "height": 167, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -45,10 +45,10 @@ "type": "", "pos": { "x": 220, - "y": 52 + "y": 50 }, "width": 150, - "height": 167, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -87,7 +87,7 @@ "y": 50 }, "width": 150, - "height": 169, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -123,10 +123,10 @@ "type": "", "pos": { "x": 660, - "y": 52 + "y": 50 }, "width": 150, - "height": 167, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -162,7 +162,7 @@ "type": "", "pos": { "x": 25, - "y": 439 + "y": 396 }, "width": 320, "height": 80, @@ -200,7 +200,7 @@ "type": "", "pos": { "x": 245, - "y": 569 + "y": 526 }, "width": 320, "height": 730, @@ -238,7 +238,7 @@ "type": "", "pos": { "x": 245, - "y": 829 + "y": 786 }, "width": 320, "height": 80, @@ -276,7 +276,7 @@ "type": "", "pos": { "x": 245, - "y": 1349 + "y": 1306 }, "width": 453, "height": 466, @@ -314,7 +314,7 @@ "type": "rectangle", "pos": { "x": 382, - "y": 1519 + "y": 1476 }, "width": 266, "height": 126, @@ -353,7 +353,7 @@ "type": "", "pos": { "x": 601, - "y": 1865 + "y": 1822 }, "width": 268, "height": 206, @@ -391,7 +391,7 @@ "type": "rectangle", "pos": { "x": 651, - "y": 1905 + "y": 1862 }, "width": 168, "height": 126, @@ -430,7 +430,7 @@ "type": "rectangle", "pos": { "x": 289, - "y": 983 + "y": 940 }, "width": 12, "height": 292, @@ -468,7 +468,7 @@ "type": "rectangle", "pos": { "x": 509, - "y": 983 + "y": 940 }, "width": 12, "height": 292, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 1113 + "y": 1070 }, "width": 20, "height": 80, @@ -568,11 +568,11 @@ "route": [ { "x": 75, - "y": 349 + "y": 306 }, { "x": 295, - "y": 349 + "y": 306 } ], "animated": false, @@ -607,11 +607,11 @@ "route": [ { "x": 75, - "y": 479 + "y": 436 }, { "x": 295, - "y": 479 + "y": 436 } ], "animated": false, @@ -646,11 +646,11 @@ "route": [ { "x": 295, - "y": 609 + "y": 566 }, { "x": 515, - "y": 609 + "y": 566 } ], "animated": false, @@ -685,11 +685,11 @@ "route": [ { "x": 515, - "y": 739 + "y": 696 }, { "x": 295, - "y": 739 + "y": 696 } ], "animated": false, @@ -724,11 +724,11 @@ "route": [ { "x": 515, - "y": 869 + "y": 826 }, { "x": 295, - "y": 869 + "y": 826 } ], "animated": false, @@ -763,11 +763,11 @@ "route": [ { "x": 301, - "y": 999 + "y": 956 }, { "x": 509, - "y": 999 + "y": 956 } ], "animated": false, @@ -802,11 +802,11 @@ "route": [ { "x": 305, - "y": 1129 + "y": 1086 }, { "x": 509, - "y": 1129 + "y": 1086 } ], "animated": false, @@ -841,11 +841,11 @@ "route": [ { "x": 509, - "y": 1259 + "y": 1216 }, { "x": 301, - "y": 1259 + "y": 1216 } ], "animated": false, @@ -880,11 +880,11 @@ "route": [ { "x": 295, - "y": 1389 + "y": 1346 }, { "x": 515, - "y": 1389 + "y": 1346 } ], "animated": false, @@ -919,11 +919,11 @@ "route": [ { "x": 515, - "y": 1775 + "y": 1732 }, { "x": 295, - "y": 1775 + "y": 1732 } ], "animated": false, @@ -958,11 +958,11 @@ "route": [ { "x": 75, - "y": 219 + "y": 176 }, { "x": 75, - "y": 2161 + "y": 2118 } ], "animated": false, @@ -997,11 +997,11 @@ "route": [ { "x": 295, - "y": 219 + "y": 176 }, { "x": 295, - "y": 2161 + "y": 2118 } ], "animated": false, @@ -1036,11 +1036,11 @@ "route": [ { "x": 515, - "y": 219 + "y": 176 }, { "x": 515, - "y": 2161 + "y": 2118 } ], "animated": false, @@ -1075,11 +1075,11 @@ "route": [ { "x": 735, - "y": 219 + "y": 176 }, { "x": 735, - "y": 2161 + "y": 2118 } ], "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 b569a7a6e..507bae4f8 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 a444d77d8..185e1d749 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": 124 + "y": 141 }, "width": 150, - "height": 143, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 5, @@ -84,10 +84,10 @@ "type": "cylinder", "pos": { "x": 453, - "y": 136 + "y": 162 }, "width": 150, - "height": 152, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -123,10 +123,10 @@ "type": "queue", "pos": { "x": 673, - "y": 161 + "y": 162 }, "width": 150, - "height": 127, + "height": 126, "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 2d06dbcbd..4385b15c0 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 a8d1c897c..7508fc49c 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": 62 + "y": 50 }, "width": 150, - "height": 128, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -45,7 +45,7 @@ "type": "rectangle", "pos": { "x": 69, - "y": 304 + "y": 290 }, "width": 12, "height": 1592, @@ -83,7 +83,7 @@ "type": "", "pos": { "x": 220, - "y": 64 + "y": 50 }, "width": 200, "height": 126, @@ -122,7 +122,7 @@ "type": "rectangle", "pos": { "x": 314, - "y": 304 + "y": 290 }, "width": 12, "height": 162, @@ -163,7 +163,7 @@ "y": 50 }, "width": 150, - "height": 140, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -199,7 +199,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 564 + "y": 550 }, "width": 12, "height": 162, @@ -237,7 +237,7 @@ "type": "", "pos": { "x": 710, - "y": 64 + "y": 50 }, "width": 186, "height": 126, @@ -276,7 +276,7 @@ "type": "rectangle", "pos": { "x": 797, - "y": 824 + "y": 810 }, "width": 12, "height": 422, @@ -314,7 +314,7 @@ "type": "rectangle", "pos": { "x": 793, - "y": 954 + "y": 940 }, "width": 20, "height": 162, @@ -352,7 +352,7 @@ "type": "", "pos": { "x": 966, - "y": 64 + "y": 50 }, "width": 160, "height": 126, @@ -391,7 +391,7 @@ "type": "rectangle", "pos": { "x": 1040, - "y": 1084 + "y": 1070 }, "width": 12, "height": 80, @@ -429,7 +429,7 @@ "type": "", "pos": { "x": 1196, - "y": 64 + "y": 50 }, "width": 197, "height": 126, @@ -468,7 +468,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1344 + "y": 1330 }, "width": 12, "height": 80, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 1474 + "y": 1460 }, "width": 12, "height": 80, @@ -544,7 +544,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 1604 + "y": 1590 }, "width": 12, "height": 80, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1734 + "y": 1720 }, "width": 12, "height": 80, @@ -620,7 +620,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1864 + "y": 1850 }, "width": 12, "height": 80, @@ -682,11 +682,11 @@ "route": [ { "x": 81, - "y": 320 + "y": 306 }, { "x": 314, - "y": 320 + "y": 306 } ], "animated": false, @@ -721,11 +721,11 @@ "route": [ { "x": 81, - "y": 450 + "y": 436 }, { "x": 314, - "y": 450 + "y": 436 } ], "animated": false, @@ -760,11 +760,11 @@ "route": [ { "x": 81, - "y": 580 + "y": 566 }, { "x": 559, - "y": 580 + "y": 566 } ], "animated": false, @@ -799,11 +799,11 @@ "route": [ { "x": 81, - "y": 710 + "y": 696 }, { "x": 559, - "y": 710 + "y": 696 } ], "animated": false, @@ -838,11 +838,11 @@ "route": [ { "x": 81, - "y": 840 + "y": 826 }, { "x": 797, - "y": 840 + "y": 826 } ], "animated": false, @@ -877,11 +877,11 @@ "route": [ { "x": 320, - "y": 970 + "y": 956 }, { "x": 793, - "y": 970 + "y": 956 } ], "animated": false, @@ -916,11 +916,11 @@ "route": [ { "x": 813, - "y": 1100 + "y": 1086 }, { "x": 1040, - "y": 1100 + "y": 1086 } ], "animated": false, @@ -955,11 +955,11 @@ "route": [ { "x": 75, - "y": 1230 + "y": 1216 }, { "x": 797, - "y": 1230 + "y": 1216 } ], "animated": false, @@ -994,11 +994,11 @@ "route": [ { "x": 81, - "y": 1360 + "y": 1346 }, { "x": 1288.5, - "y": 1360 + "y": 1346 } ], "animated": false, @@ -1033,11 +1033,11 @@ "route": [ { "x": 81, - "y": 1490 + "y": 1476 }, { "x": 559, - "y": 1490 + "y": 1476 } ], "animated": false, @@ -1072,11 +1072,11 @@ "route": [ { "x": 81, - "y": 1620 + "y": 1606 }, { "x": 559, - "y": 1620 + "y": 1606 } ], "animated": false, @@ -1111,11 +1111,11 @@ "route": [ { "x": 81, - "y": 1750 + "y": 1736 }, { "x": 1288.5, - "y": 1750 + "y": 1736 } ], "animated": false, @@ -1150,11 +1150,11 @@ "route": [ { "x": 81, - "y": 1880 + "y": 1866 }, { "x": 1288.5, - "y": 1880 + "y": 1866 } ], "animated": false, @@ -1189,11 +1189,11 @@ "route": [ { "x": 75, - "y": 190 + "y": 176 }, { "x": 75, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1228,11 +1228,11 @@ "route": [ { "x": 320, - "y": 190 + "y": 176 }, { "x": 320, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1267,11 +1267,11 @@ "route": [ { "x": 565, - "y": 190 + "y": 176 }, { "x": 565, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1306,11 +1306,11 @@ "route": [ { "x": 803, - "y": 190 + "y": 176 }, { "x": 803, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1345,11 +1345,11 @@ "route": [ { "x": 1046, - "y": 190 + "y": 176 }, { "x": 1046, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1384,11 +1384,11 @@ "route": [ { "x": 1294.5, - "y": 190 + "y": 176 }, { "x": 1294.5, - "y": 2010 + "y": 1996 } ], "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 bf69f8d48..e74474a1b 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) + + + + + + + + + + + + + + + + + + + + + + + + + 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) + + + + + + + + + + + + + + + + + + + + + + + + + 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 f06d31ed2..73b2fad99 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": 84 + "y": 87 }, "width": 150, - "height": 150, + "height": 147, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -212,10 +212,10 @@ "type": "cylinder", "pos": { "x": 1269, - "y": 84 + "y": 108 }, "width": 150, - "height": 150, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -251,10 +251,10 @@ "type": "diamond", "pos": { "x": 1489, - "y": 85 + "y": 108 }, "width": 150, - "height": 149, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -290,10 +290,10 @@ "type": "document", "pos": { "x": 1709, - "y": 97 + "y": 108 }, "width": 150, - "height": 137, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -368,10 +368,10 @@ "type": "image", "pos": { "x": 2181, - "y": 63 + "y": 85 }, "width": 150, - "height": 150, + "height": 128, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -418,10 +418,10 @@ "type": "oval", "pos": { "x": 2401, - "y": 97 + "y": 108 }, "width": 150, - "height": 137, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -457,10 +457,10 @@ "type": "package", "pos": { "x": 2621, - "y": 98 + "y": 108 }, "width": 150, - "height": 136, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -730,10 +730,10 @@ "type": "stored_data", "pos": { "x": 4312, - "y": 96 + "y": 108 }, "width": 150, - "height": 138, + "height": 126, "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 8cf3cf52b..7e13b2b3a 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 9a6740045..251a8aed9 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": 52 + "y": 50 }, "width": 150, - "height": 167, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -45,10 +45,10 @@ "type": "", "pos": { "x": 220, - "y": 52 + "y": 50 }, "width": 150, - "height": 167, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -87,7 +87,7 @@ "y": 50 }, "width": 150, - "height": 169, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -123,10 +123,10 @@ "type": "", "pos": { "x": 660, - "y": 52 + "y": 50 }, "width": 150, - "height": 167, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -162,7 +162,7 @@ "type": "", "pos": { "x": 25, - "y": 439 + "y": 396 }, "width": 320, "height": 80, @@ -200,7 +200,7 @@ "type": "", "pos": { "x": 245, - "y": 569 + "y": 526 }, "width": 320, "height": 730, @@ -238,7 +238,7 @@ "type": "", "pos": { "x": 245, - "y": 829 + "y": 786 }, "width": 320, "height": 80, @@ -276,7 +276,7 @@ "type": "", "pos": { "x": 245, - "y": 1349 + "y": 1306 }, "width": 453, "height": 466, @@ -314,7 +314,7 @@ "type": "rectangle", "pos": { "x": 382, - "y": 1519 + "y": 1476 }, "width": 266, "height": 126, @@ -353,7 +353,7 @@ "type": "", "pos": { "x": 601, - "y": 1865 + "y": 1822 }, "width": 268, "height": 206, @@ -391,7 +391,7 @@ "type": "rectangle", "pos": { "x": 651, - "y": 1905 + "y": 1862 }, "width": 168, "height": 126, @@ -430,7 +430,7 @@ "type": "rectangle", "pos": { "x": 289, - "y": 983 + "y": 940 }, "width": 12, "height": 292, @@ -468,7 +468,7 @@ "type": "rectangle", "pos": { "x": 509, - "y": 983 + "y": 940 }, "width": 12, "height": 292, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 285, - "y": 1113 + "y": 1070 }, "width": 20, "height": 80, @@ -568,11 +568,11 @@ "route": [ { "x": 75, - "y": 349 + "y": 306 }, { "x": 295, - "y": 349 + "y": 306 } ], "animated": false, @@ -607,11 +607,11 @@ "route": [ { "x": 75, - "y": 479 + "y": 436 }, { "x": 295, - "y": 479 + "y": 436 } ], "animated": false, @@ -646,11 +646,11 @@ "route": [ { "x": 295, - "y": 609 + "y": 566 }, { "x": 515, - "y": 609 + "y": 566 } ], "animated": false, @@ -685,11 +685,11 @@ "route": [ { "x": 515, - "y": 739 + "y": 696 }, { "x": 295, - "y": 739 + "y": 696 } ], "animated": false, @@ -724,11 +724,11 @@ "route": [ { "x": 515, - "y": 869 + "y": 826 }, { "x": 295, - "y": 869 + "y": 826 } ], "animated": false, @@ -763,11 +763,11 @@ "route": [ { "x": 301, - "y": 999 + "y": 956 }, { "x": 509, - "y": 999 + "y": 956 } ], "animated": false, @@ -802,11 +802,11 @@ "route": [ { "x": 305, - "y": 1129 + "y": 1086 }, { "x": 509, - "y": 1129 + "y": 1086 } ], "animated": false, @@ -841,11 +841,11 @@ "route": [ { "x": 509, - "y": 1259 + "y": 1216 }, { "x": 301, - "y": 1259 + "y": 1216 } ], "animated": false, @@ -880,11 +880,11 @@ "route": [ { "x": 295, - "y": 1389 + "y": 1346 }, { "x": 515, - "y": 1389 + "y": 1346 } ], "animated": false, @@ -919,11 +919,11 @@ "route": [ { "x": 515, - "y": 1775 + "y": 1732 }, { "x": 295, - "y": 1775 + "y": 1732 } ], "animated": false, @@ -958,11 +958,11 @@ "route": [ { "x": 75, - "y": 219 + "y": 176 }, { "x": 75, - "y": 2161 + "y": 2118 } ], "animated": false, @@ -997,11 +997,11 @@ "route": [ { "x": 295, - "y": 219 + "y": 176 }, { "x": 295, - "y": 2161 + "y": 2118 } ], "animated": false, @@ -1036,11 +1036,11 @@ "route": [ { "x": 515, - "y": 219 + "y": 176 }, { "x": 515, - "y": 2161 + "y": 2118 } ], "animated": false, @@ -1075,11 +1075,11 @@ "route": [ { "x": 735, - "y": 219 + "y": 176 }, { "x": 735, - "y": 2161 + "y": 2118 } ], "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 b569a7a6e..507bae4f8 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 a444d77d8..185e1d749 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": 124 + "y": 141 }, "width": 150, - "height": 143, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 5, @@ -84,10 +84,10 @@ "type": "cylinder", "pos": { "x": 453, - "y": 136 + "y": 162 }, "width": 150, - "height": 152, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -123,10 +123,10 @@ "type": "queue", "pos": { "x": 673, - "y": 161 + "y": 162 }, "width": 150, - "height": 127, + "height": 126, "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 2d06dbcbd..4385b15c0 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 a8d1c897c..7508fc49c 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": 62 + "y": 50 }, "width": 150, - "height": 128, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -45,7 +45,7 @@ "type": "rectangle", "pos": { "x": 69, - "y": 304 + "y": 290 }, "width": 12, "height": 1592, @@ -83,7 +83,7 @@ "type": "", "pos": { "x": 220, - "y": 64 + "y": 50 }, "width": 200, "height": 126, @@ -122,7 +122,7 @@ "type": "rectangle", "pos": { "x": 314, - "y": 304 + "y": 290 }, "width": 12, "height": 162, @@ -163,7 +163,7 @@ "y": 50 }, "width": 150, - "height": 140, + "height": 126, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -199,7 +199,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 564 + "y": 550 }, "width": 12, "height": 162, @@ -237,7 +237,7 @@ "type": "", "pos": { "x": 710, - "y": 64 + "y": 50 }, "width": 186, "height": 126, @@ -276,7 +276,7 @@ "type": "rectangle", "pos": { "x": 797, - "y": 824 + "y": 810 }, "width": 12, "height": 422, @@ -314,7 +314,7 @@ "type": "rectangle", "pos": { "x": 793, - "y": 954 + "y": 940 }, "width": 20, "height": 162, @@ -352,7 +352,7 @@ "type": "", "pos": { "x": 966, - "y": 64 + "y": 50 }, "width": 160, "height": 126, @@ -391,7 +391,7 @@ "type": "rectangle", "pos": { "x": 1040, - "y": 1084 + "y": 1070 }, "width": 12, "height": 80, @@ -429,7 +429,7 @@ "type": "", "pos": { "x": 1196, - "y": 64 + "y": 50 }, "width": 197, "height": 126, @@ -468,7 +468,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1344 + "y": 1330 }, "width": 12, "height": 80, @@ -506,7 +506,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 1474 + "y": 1460 }, "width": 12, "height": 80, @@ -544,7 +544,7 @@ "type": "rectangle", "pos": { "x": 559, - "y": 1604 + "y": 1590 }, "width": 12, "height": 80, @@ -582,7 +582,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1734 + "y": 1720 }, "width": 12, "height": 80, @@ -620,7 +620,7 @@ "type": "rectangle", "pos": { "x": 1288, - "y": 1864 + "y": 1850 }, "width": 12, "height": 80, @@ -682,11 +682,11 @@ "route": [ { "x": 81, - "y": 320 + "y": 306 }, { "x": 314, - "y": 320 + "y": 306 } ], "animated": false, @@ -721,11 +721,11 @@ "route": [ { "x": 81, - "y": 450 + "y": 436 }, { "x": 314, - "y": 450 + "y": 436 } ], "animated": false, @@ -760,11 +760,11 @@ "route": [ { "x": 81, - "y": 580 + "y": 566 }, { "x": 559, - "y": 580 + "y": 566 } ], "animated": false, @@ -799,11 +799,11 @@ "route": [ { "x": 81, - "y": 710 + "y": 696 }, { "x": 559, - "y": 710 + "y": 696 } ], "animated": false, @@ -838,11 +838,11 @@ "route": [ { "x": 81, - "y": 840 + "y": 826 }, { "x": 797, - "y": 840 + "y": 826 } ], "animated": false, @@ -877,11 +877,11 @@ "route": [ { "x": 320, - "y": 970 + "y": 956 }, { "x": 793, - "y": 970 + "y": 956 } ], "animated": false, @@ -916,11 +916,11 @@ "route": [ { "x": 813, - "y": 1100 + "y": 1086 }, { "x": 1040, - "y": 1100 + "y": 1086 } ], "animated": false, @@ -955,11 +955,11 @@ "route": [ { "x": 75, - "y": 1230 + "y": 1216 }, { "x": 797, - "y": 1230 + "y": 1216 } ], "animated": false, @@ -994,11 +994,11 @@ "route": [ { "x": 81, - "y": 1360 + "y": 1346 }, { "x": 1288.5, - "y": 1360 + "y": 1346 } ], "animated": false, @@ -1033,11 +1033,11 @@ "route": [ { "x": 81, - "y": 1490 + "y": 1476 }, { "x": 559, - "y": 1490 + "y": 1476 } ], "animated": false, @@ -1072,11 +1072,11 @@ "route": [ { "x": 81, - "y": 1620 + "y": 1606 }, { "x": 559, - "y": 1620 + "y": 1606 } ], "animated": false, @@ -1111,11 +1111,11 @@ "route": [ { "x": 81, - "y": 1750 + "y": 1736 }, { "x": 1288.5, - "y": 1750 + "y": 1736 } ], "animated": false, @@ -1150,11 +1150,11 @@ "route": [ { "x": 81, - "y": 1880 + "y": 1866 }, { "x": 1288.5, - "y": 1880 + "y": 1866 } ], "animated": false, @@ -1189,11 +1189,11 @@ "route": [ { "x": 75, - "y": 190 + "y": 176 }, { "x": 75, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1228,11 +1228,11 @@ "route": [ { "x": 320, - "y": 190 + "y": 176 }, { "x": 320, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1267,11 +1267,11 @@ "route": [ { "x": 565, - "y": 190 + "y": 176 }, { "x": 565, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1306,11 +1306,11 @@ "route": [ { "x": 803, - "y": 190 + "y": 176 }, { "x": 803, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1345,11 +1345,11 @@ "route": [ { "x": 1046, - "y": 190 + "y": 176 }, { "x": 1046, - "y": 2010 + "y": 1996 } ], "animated": false, @@ -1384,11 +1384,11 @@ "route": [ { "x": 1294.5, - "y": 190 + "y": 176 }, { "x": 1294.5, - "y": 2010 + "y": 1996 } ], "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 bf69f8d48..e74474a1b 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) + + + + + + + + + + + + + + + + + + + + + + + + + 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 From de3c0518f51a737e02bfdfe4cb3d0c5fdbadf32f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 23:38:47 -0800 Subject: [PATCH 15/18] group nesting padding --- d2layouts/d2sequence/constants.go | 2 ++ d2layouts/d2sequence/sequence_diagram.go | 31 ++++++++++++++++--- .../dagre/board.exp.json | 8 ++--- .../dagre/sketch.exp.svg | 2 +- .../elk/board.exp.json | 8 ++--- .../elk/sketch.exp.svg | 2 +- 6 files changed, 39 insertions(+), 14 deletions(-) diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index 993ebffc8..78ff0ce16 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -12,6 +12,8 @@ const MIN_ACTOR_WIDTH = 150. const SELF_MESSAGE_HORIZONTAL_TRAVEL = 100. +const GROUP_CONTAINER_PADDING = 24. + // min vertical distance between messages const MIN_MESSAGE_DISTANCE = 80. diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 0876d8568..a3f85366a 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -171,6 +171,9 @@ func (sd *sequenceDiagram) layout() error { } func (sd *sequenceDiagram) placeGroups() { + sort.SliceStable(sd.groups, func(i, j int) bool { + return sd.groups[i].Level() > sd.groups[j].Level() + }) for _, group := range sd.groups { group.ZIndex = GROUP_Z_INDEX sd.placeGroup(group) @@ -217,13 +220,33 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) { } } + hasNested := false + for _, ch := range group.ChildrenArray { + for _, g := range sd.groups { + if ch == g { + hasNested = true + minX = math.Min(minX, ch.TopLeft.X-GROUP_CONTAINER_PADDING) + minY = math.Min(minY, ch.TopLeft.Y-GROUP_CONTAINER_PADDING) + maxX = math.Max(maxX, ch.TopLeft.X+ch.Width+GROUP_CONTAINER_PADDING) + maxY = math.Max(maxY, ch.TopLeft.Y+ch.Height+GROUP_CONTAINER_PADDING) + break + } + } + } + if !hasNested { + minX -= HORIZONTAL_PAD + minY -= MIN_MESSAGE_DISTANCE / 2. + maxX += HORIZONTAL_PAD + maxY += MIN_MESSAGE_DISTANCE / 2. + } + group.Box = geo.NewBox( geo.NewPoint( - minX-HORIZONTAL_PAD, - minY-(MIN_MESSAGE_DISTANCE/2.), + minX, + minY, ), - maxX-minX+HORIZONTAL_PAD*2, - maxY-minY+MIN_MESSAGE_DISTANCE, + maxX-minX, + maxY-minY, ) } 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..b4de79b7d 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -199,11 +199,11 @@ "id": "group 1", "type": "", "pos": { - "x": 245, - "y": 526 + "x": 221, + "y": 566 }, - "width": 320, - "height": 730, + "width": 368, + "height": 650, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, 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..31bbcafd3 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2268" viewBox="-100 -50 1069 2268">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +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 251a8aed9..b4de79b7d 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -199,11 +199,11 @@ "id": "group 1", "type": "", "pos": { - "x": 245, - "y": 526 + "x": 221, + "y": 566 }, - "width": 320, - "height": 730, + "width": 368, + "height": 650, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, 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 507bae4f8..31bbcafd3 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -14,7 +14,7 @@ width="1069" height="2268" viewBox="-100 -50 1069 2268">abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note +abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note From fff6637a03711f966d53743ab0f88470e126aed2 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 09:48:38 -0800 Subject: [PATCH 16/18] fix empty file --- d2lib/d2.go | 18 ++++++++++-------- e2etests/e2e_test.go | 4 ++++ .../testdata/sanity/empty/dagre/board.exp.json | 5 +++++ .../testdata/sanity/empty/dagre/sketch.exp.svg | 17 +++++++++++++++++ .../testdata/sanity/empty/elk/board.exp.json | 5 +++++ .../testdata/sanity/empty/elk/sketch.exp.svg | 17 +++++++++++++++++ 6 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 e2etests/testdata/sanity/empty/dagre/board.exp.json create mode 100644 e2etests/testdata/sanity/empty/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/sanity/empty/elk/board.exp.json create mode 100644 e2etests/testdata/sanity/empty/elk/sketch.exp.svg diff --git a/d2lib/d2.go b/d2lib/d2.go index 182dd0ae3..6ab141d95 100644 --- a/d2lib/d2.go +++ b/d2lib/d2.go @@ -35,15 +35,17 @@ func Compile(ctx context.Context, input string, opts *CompileOptions) (*d2target return nil, nil, err } - err = g.SetDimensions(opts.MeasuredTexts, opts.Ruler) - if err != nil { - return nil, nil, err - } + if len(g.Objects) > 0 { + err = g.SetDimensions(opts.MeasuredTexts, opts.Ruler) + if err != nil { + return nil, nil, err + } - if layout, err := getLayout(opts); err != nil { - return nil, nil, err - } else if err := d2sequence.Layout(ctx, g, layout); err != nil { - return nil, nil, err + if layout, err := getLayout(opts); err != nil { + return nil, nil, err + } else if err := d2sequence.Layout(ctx, g, layout); err != nil { + return nil, nil, err + } } diagram, err := d2exporter.Export(ctx, g, opts.ThemeID) diff --git a/e2etests/e2e_test.go b/e2etests/e2e_test.go index fa3e07ba8..b77a4cc59 100644 --- a/e2etests/e2e_test.go +++ b/e2etests/e2e_test.go @@ -38,6 +38,10 @@ func TestE2E(t *testing.T) { func testSanity(t *testing.T) { tcs := []testCase{ + { + name: "empty", + script: ``, + }, { name: "basic", script: `a -> b diff --git a/e2etests/testdata/sanity/empty/dagre/board.exp.json b/e2etests/testdata/sanity/empty/dagre/board.exp.json new file mode 100644 index 000000000..8591adc9e --- /dev/null +++ b/e2etests/testdata/sanity/empty/dagre/board.exp.json @@ -0,0 +1,5 @@ +{ + "name": "", + "shapes": [], + "connections": [] +} diff --git a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg new file mode 100644 index 000000000..5c521366b --- /dev/null +++ b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg @@ -0,0 +1,17 @@ + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/elk/board.exp.json b/e2etests/testdata/sanity/empty/elk/board.exp.json new file mode 100644 index 000000000..8591adc9e --- /dev/null +++ b/e2etests/testdata/sanity/empty/elk/board.exp.json @@ -0,0 +1,5 @@ +{ + "name": "", + "shapes": [], + "connections": [] +} diff --git a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg new file mode 100644 index 000000000..5c521366b --- /dev/null +++ b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg @@ -0,0 +1,17 @@ + + \ No newline at end of file From d7a2e1ac4565d19c84becd38d5fe3e41b1ecc118 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 09:54:45 -0800 Subject: [PATCH 17/18] fix group padding --- d2layouts/d2sequence/sequence_diagram.go | 24 +++++++------------ .../dagre/board.exp.json | 10 ++++---- .../dagre/sketch.exp.svg | 6 ++--- .../elk/board.exp.json | 10 ++++---- .../elk/sketch.exp.svg | 6 ++--- 5 files changed, 24 insertions(+), 32 deletions(-) diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index a3f85366a..277474be5 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -189,10 +189,10 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) { for _, m := range sd.messages { if m.ContainedBy(group) { for _, p := range m.Route { - minX = math.Min(minX, p.X) - minY = math.Min(minY, p.Y) - maxX = math.Max(maxX, p.X) - maxY = math.Max(maxY, p.Y) + minX = math.Min(minX, p.X-HORIZONTAL_PAD) + minY = math.Min(minY, p.Y-MIN_MESSAGE_DISTANCE/2.) + maxX = math.Max(maxX, p.X+HORIZONTAL_PAD) + maxY = math.Max(maxY, p.Y+MIN_MESSAGE_DISTANCE/2.) } } } @@ -213,18 +213,16 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) { } } if inGroup { - minY = math.Min(minY, n.TopLeft.Y) - maxY = math.Max(maxY, n.TopLeft.Y+n.Height) - minX = math.Min(minX, n.TopLeft.X) - maxX = math.Max(maxX, n.TopLeft.X+n.Width) + minX = math.Min(minX, n.TopLeft.X-HORIZONTAL_PAD) + minY = math.Min(minY, n.TopLeft.Y-MIN_MESSAGE_DISTANCE/2.) + maxY = math.Max(maxY, n.TopLeft.Y+n.Height+HORIZONTAL_PAD) + maxX = math.Max(maxX, n.TopLeft.X+n.Width+MIN_MESSAGE_DISTANCE/2.) } } - hasNested := false for _, ch := range group.ChildrenArray { for _, g := range sd.groups { if ch == g { - hasNested = true minX = math.Min(minX, ch.TopLeft.X-GROUP_CONTAINER_PADDING) minY = math.Min(minY, ch.TopLeft.Y-GROUP_CONTAINER_PADDING) maxX = math.Max(maxX, ch.TopLeft.X+ch.Width+GROUP_CONTAINER_PADDING) @@ -233,12 +231,6 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) { } } } - if !hasNested { - minX -= HORIZONTAL_PAD - minY -= MIN_MESSAGE_DISTANCE / 2. - maxX += HORIZONTAL_PAD - maxY += MIN_MESSAGE_DISTANCE / 2. - } group.Box = geo.NewBox( geo.NewPoint( 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 b4de79b7d..5112d0c4e 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -200,10 +200,10 @@ "type": "", "pos": { "x": 221, - "y": 566 + "y": 526 }, "width": 368, - "height": 650, + "height": 730, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -278,7 +278,7 @@ "x": 245, "y": 1306 }, - "width": 453, + "width": 443, "height": 466, "opacity": 1, "strokeDash": 0, @@ -355,8 +355,8 @@ "x": 601, "y": 1822 }, - "width": 268, - "height": 206, + "width": 258, + "height": 216, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, 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 31bbcafd3..7ba310439 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 b4de79b7d..5112d0c4e 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -200,10 +200,10 @@ "type": "", "pos": { "x": 221, - "y": 566 + "y": 526 }, "width": 368, - "height": 650, + "height": 730, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, @@ -278,7 +278,7 @@ "x": 245, "y": 1306 }, - "width": 453, + "width": 443, "height": 466, "opacity": 1, "strokeDash": 0, @@ -355,8 +355,8 @@ "x": 601, "y": 1822 }, - "width": 268, - "height": 206, + "width": 258, + "height": 216, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, 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 31bbcafd3..7ba310439 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 + From 6aaa9903907909fd129f4b3a83e9f0f2585ff4da Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 5 Dec 2022 10:11:12 -0800 Subject: [PATCH 18/18] fix test --- d2layouts/d2sequence/layout_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/d2layouts/d2sequence/layout_test.go b/d2layouts/d2sequence/layout_test.go index 5f2368c9b..1e3dbfd60 100644 --- a/d2layouts/d2sequence/layout_test.go +++ b/d2layouts/d2sequence/layout_test.go @@ -231,8 +231,8 @@ b -> a.t2` } for _, span := range []*d2graph.Object{a_t1, a_t2, b_t1} { - if span.ZIndex != 1 { - t.Fatalf("expected span ZIndex=1, got %d", span.ZIndex) + if span.ZIndex != d2sequence.SPAN_Z_INDEX { + t.Fatalf("expected span ZIndex=%d, got %d", d2sequence.SPAN_Z_INDEX, span.ZIndex) } } @@ -393,7 +393,7 @@ func TestSelfEdges(t *testing.T) { } ctx := log.WithTB(context.Background(), t, nil) - Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { + d2sequence.Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { return nil }) @@ -406,8 +406,8 @@ func TestSelfEdges(t *testing.T) { t.Fatalf("route does not end at the same actor, start at %.5f, end at %.5f", route[0].X, route[3].X) } - if route[3].Y-route[0].Y != MIN_MESSAGE_DISTANCE { - t.Fatalf("expected route height to be %.f5, got %.5f", MIN_MESSAGE_DISTANCE, route[3].Y-route[0].Y) + if route[3].Y-route[0].Y != d2sequence.MIN_MESSAGE_DISTANCE { + t.Fatalf("expected route height to be %.f5, got %.5f", d2sequence.MIN_MESSAGE_DISTANCE, route[3].Y-route[0].Y) } } @@ -435,7 +435,7 @@ func TestSequenceToDescendant(t *testing.T) { } ctx := log.WithTB(context.Background(), t, nil) - Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { + d2sequence.Layout(ctx, g, func(ctx context.Context, g *d2graph.Graph) error { return nil })