From dab9865ae32016f43043fc32d4d11d196fe8022b Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sun, 4 Dec 2022 22:34:38 -0800 Subject: [PATCH] increase self connection width --- d2layouts/d2sequence/constants.go | 2 ++ d2layouts/d2sequence/sequence_diagram.go | 2 +- .../dagre/board.exp.json | 16 ++++++++-------- .../dagre/sketch.exp.svg | 14 +++++++------- .../elk/board.exp.json | 16 ++++++++-------- .../elk/sketch.exp.svg | 14 +++++++------- 6 files changed, 33 insertions(+), 31 deletions(-) diff --git a/d2layouts/d2sequence/constants.go b/d2layouts/d2sequence/constants.go index 67bd7b306..993ebffc8 100644 --- a/d2layouts/d2sequence/constants.go +++ b/d2layouts/d2sequence/constants.go @@ -10,6 +10,8 @@ const MIN_ACTOR_DISTANCE = 70. const MIN_ACTOR_WIDTH = 150. +const SELF_MESSAGE_HORIZONTAL_TRAVEL = 100. + // 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 33ea2fc40..a6a704cc2 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -427,7 +427,7 @@ func (sd *sequenceDiagram) routeMessages() error { isSelfMessage := message.Src == message.Dst if isSelfMessage || isToDescendant || isFromDescendant { - midX := startX + MIN_MESSAGE_DISTANCE + midX := startX + SELF_MESSAGE_HORIZONTAL_TRAVEL endY := startY + MIN_MESSAGE_DISTANCE message.Route = []*geo.Point{ geo.NewPoint(startX, startY), 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 e34ff0b04..6d354385a 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 @@ -301,11 +301,11 @@ "y": 349 }, { - "x": 155, + "x": 175, "y": 349 }, { - "x": 155, + "x": 175, "y": 429 }, { @@ -387,11 +387,11 @@ "y": 609 }, { - "x": 375, + "x": 395, "y": 609 }, { - "x": 375, + "x": 395, "y": 689 }, { @@ -434,11 +434,11 @@ "y": 739 }, { - "x": 375, + "x": 395, "y": 739 }, { - "x": 375, + "x": 395, "y": 819 }, { @@ -481,11 +481,11 @@ "y": 869 }, { - "x": 375, + "x": 395, "y": 869 }, { - "x": 375, + "x": 395, "y": 949 }, { diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index 404055205..8756bfaa5 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -2,7 +2,7 @@ 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 + + - - - + + +