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

rename lastGroup to prevGroup

Browse source
This commit is contained in:
Gavin Nishizawa 2023-01-27 10:09:28 -08:00
parent c4efe2812f
commit fd72e10dbc
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
d2layouts/d2sequence/sequence_diagram.go
View file

@ -445,8 +445,8 @@ func (sd *sequenceDiagram) placeSpans() {
// routeMessages routes horizontal edges (messages) from Src to Dst lifeline (actor/span center) // routeMessages routes horizontal edges (messages) from Src to Dst lifeline (actor/span center)
// in another step, routes are adjusted to spans borders when necessary // in another step, routes are adjusted to spans borders when necessary
func (sd *sequenceDiagram) routeMessages() error { func (sd *sequenceDiagram) routeMessages() error {
var lastIsLoop bool var prevIsLoop bool
var lastGroup *d2graph.Object var prevGroup *d2graph.Object
messageOffset := sd.maxActorHeight + sd.yStep messageOffset := sd.maxActorHeight + sd.yStep
for _, message := range sd.messages { for _, message := range sd.messages {
message.ZIndex = MESSAGE_Z_INDEX message.ZIndex = MESSAGE_Z_INDEX
@ -457,12 +457,12 @@ func (sd *sequenceDiagram) routeMessages() error {
} }
} }
// we need extra space if the last message was a loop in a different group // we need extra space if the previous message is a loop in a different group
group := message.GetGroup() group := message.GetGroup()
if lastIsLoop && lastGroup != group { if prevIsLoop && prevGroup != group {
messageOffset += MIN_MESSAGE_DISTANCE messageOffset += MIN_MESSAGE_DISTANCE
} }
lastGroup = group prevGroup = group
startY := messageOffset + noteOffset startY := messageOffset + noteOffset
@ -500,13 +500,13 @@ func (sd *sequenceDiagram) routeMessages() error {
geo.NewPoint(midX, endY), geo.NewPoint(midX, endY),
geo.NewPoint(endX, endY), geo.NewPoint(endX, endY),
} }
lastIsLoop = true prevIsLoop = true
} else { } else {
message.Route = []*geo.Point{ message.Route = []*geo.Point{
geo.NewPoint(startX, startY), geo.NewPoint(startX, startY),
geo.NewPoint(endX, startY), geo.NewPoint(endX, startY),
} }
lastIsLoop = false prevIsLoop = false
} }
messageOffset += sd.yStep messageOffset += sd.yStep