luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle different actor distances

Browse source
This commit is contained in:
Júlio César Batista 2022-12-05 10:27:55 -08:00
parent edb6b857b3
commit 04ba174fe5
No known key found for this signature in database
GPG key ID: 10C4B861BF314878
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
d2layouts/d2sequence/sequence_diagram.go
View file

@ -32,8 +32,11 @@ type sequenceDiagram struct {
firstMessage map[*d2graph.Object]*d2graph.Edge firstMessage map[*d2graph.Object]*d2graph.Edge
lastMessage map[*d2graph.Object]*d2graph.Edge lastMessage map[*d2graph.Object]*d2graph.Edge
// the distance from actor[i] center to actor[i+1] center
// every neighbor actors need different distances depending on the message labels between them
actorXStep []float64
yStep float64 yStep float64
actorXStep float64
maxActorHeight float64 maxActorHeight float64
verticalIndices map[string]int verticalIndices map[string]int
@ -139,8 +142,8 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se
objectRank: make(map[*d2graph.Object]int), objectRank: make(map[*d2graph.Object]int),
firstMessage: make(map[*d2graph.Object]*d2graph.Edge), firstMessage: make(map[*d2graph.Object]*d2graph.Edge),
lastMessage: make(map[*d2graph.Object]*d2graph.Edge), lastMessage: make(map[*d2graph.Object]*d2graph.Edge),
actorXStep: make([]float64, len(actors)-1),
yStep: MIN_MESSAGE_DISTANCE, yStep: MIN_MESSAGE_DISTANCE,
actorXStep: MIN_ACTOR_DISTANCE,
maxActorHeight: 0., maxActorHeight: 0.,
verticalIndices: make(map[string]int), verticalIndices: make(map[string]int),
} }
@ -183,6 +186,10 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se
queue = append(queue, child.ChildrenArray...) queue = append(queue, child.ChildrenArray...)
} }
if rank != len(actors)-1 {
sd.actorXStep[rank] = math.Max(actor.Width/2., MIN_ACTOR_DISTANCE)
}
} }
for _, message := range sd.messages { for _, message := range sd.messages {
@ -195,7 +202,9 @@ func newSequenceDiagram(objects []*d2graph.Object, messages []*d2graph.Edge) *se
if rankDiff != 0 { if rankDiff != 0 {
// rankDiff = 0 for self edges // rankDiff = 0 for self edges
distributedLabelWidth := float64(message.LabelDimensions.Width) / rankDiff distributedLabelWidth := float64(message.LabelDimensions.Width) / rankDiff
sd.actorXStep = math.Max(sd.actorXStep, distributedLabelWidth+HORIZONTAL_PAD) for rank := sd.objectRank[message.Src]; rank <= sd.objectRank[message.Dst]-1; rank++ {
sd.actorXStep[rank] = math.Max(sd.actorXStep[rank], distributedLabelWidth+HORIZONTAL_PAD)
}
} }
sd.lastMessage[message.Src] = message sd.lastMessage[message.Src] = message
if _, exists := sd.firstMessage[message.Src]; !exists { if _, exists := sd.firstMessage[message.Src]; !exists {
@ -289,7 +298,7 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) {
// placeActors places actors bottom aligned, side by side with centers spaced by sd.actorXStep // placeActors places actors bottom aligned, side by side with centers spaced by sd.actorXStep
func (sd *sequenceDiagram) placeActors() { func (sd *sequenceDiagram) placeActors() {
centerX := sd.actors[0].Width / 2. centerX := sd.actors[0].Width / 2.
for _, actor := range sd.actors { for rank, actor := range sd.actors {
shape := actor.Attributes.Shape.Value shape := actor.Attributes.Shape.Value
var yOffset float64 var yOffset float64
if shape == d2target.ShapeImage || shape == d2target.ShapePerson { if shape == d2target.ShapeImage || shape == d2target.ShapePerson {
@ -304,7 +313,9 @@ func (sd *sequenceDiagram) placeActors() {
} }
halfWidth := actor.Width / 2. halfWidth := actor.Width / 2.
actor.TopLeft = geo.NewPoint(math.Round(centerX-halfWidth), yOffset) actor.TopLeft = geo.NewPoint(math.Round(centerX-halfWidth), yOffset)
centerX += sd.actorXStep if rank != len(sd.actors)-1 {
centerX += sd.actorXStep[rank]
}
} }
} }