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

messageYStep -> yStep

Browse source
This commit is contained in:
Alexander Wang 2022-12-04 00:11:38 -08:00
parent 105e9ad083
commit a86de8694c
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
d2layouts/d2sequence/sequence_diagram.go
View file

@ -28,11 +28,10 @@ type sequenceDiagram struct {
// keep track of the first and last message of a given actor/span // keep track of the first and last message of a given actor/span
// the message rank is the order in which it appears from top to bottom // the message rank is the order in which it appears from top to bottom
// TODO rank is used for y coordinate here and x coordinate above??
minMessageRank map[*d2graph.Object]int minMessageRank map[*d2graph.Object]int
maxMessageRank map[*d2graph.Object]int maxMessageRank map[*d2graph.Object]int
messageYStep float64 yStep float64
actorXStep float64 actorXStep float64
maxActorHeight float64 maxActorHeight float64
@ -81,7 +80,7 @@ func newSequenceDiagram(actors []*d2graph.Object, messages []*d2graph.Edge) *seq
objectRank: make(map[*d2graph.Object]int), objectRank: make(map[*d2graph.Object]int),
minMessageRank: make(map[*d2graph.Object]int), minMessageRank: make(map[*d2graph.Object]int),
maxMessageRank: make(map[*d2graph.Object]int), maxMessageRank: make(map[*d2graph.Object]int),
messageYStep: MIN_MESSAGE_DISTANCE, yStep: MIN_MESSAGE_DISTANCE,
actorXStep: MIN_ACTOR_DISTANCE, actorXStep: MIN_ACTOR_DISTANCE,
maxActorHeight: 0., maxActorHeight: 0.,
verticalIndices: make(map[string]int), verticalIndices: make(map[string]int),
@ -128,7 +127,7 @@ func newSequenceDiagram(actors []*d2graph.Object, messages []*d2graph.Edge) *seq
for rank, message := range sd.messages { for rank, message := range sd.messages {
sd.verticalIndices[message.AbsID()] = getEdgeEarliestLineNum(message) sd.verticalIndices[message.AbsID()] = getEdgeEarliestLineNum(message)
sd.messageYStep = math.Max(sd.messageYStep, float64(message.LabelDimensions.Height)) sd.yStep = math.Max(sd.yStep, float64(message.LabelDimensions.Height))
sd.setMinMaxMessageRank(message.Src, rank) sd.setMinMaxMessageRank(message.Src, rank)
sd.setMinMaxMessageRank(message.Dst, rank) sd.setMinMaxMessageRank(message.Dst, rank)
@ -140,7 +139,7 @@ func newSequenceDiagram(actors []*d2graph.Object, messages []*d2graph.Edge) *seq
sd.actorXStep = math.Max(sd.actorXStep, distributedLabelWidth+HORIZONTAL_PAD) sd.actorXStep = math.Max(sd.actorXStep, distributedLabelWidth+HORIZONTAL_PAD)
} }
sd.messageYStep += VERTICAL_PAD sd.yStep += VERTICAL_PAD
sd.maxActorHeight += VERTICAL_PAD sd.maxActorHeight += VERTICAL_PAD
if sd.root.LabelHeight != nil { if sd.root.LabelHeight != nil {
sd.maxActorHeight += float64(*sd.root.LabelHeight) sd.maxActorHeight += float64(*sd.root.LabelHeight)
@ -194,11 +193,16 @@ func (sd *sequenceDiagram) placeActors() {
// │ // │
// │ // │
func (sd *sequenceDiagram) addLifelineEdges() { func (sd *sequenceDiagram) addLifelineEdges() {
endY := sd.getMessageY(len(sd.messages)) endY := 0.
for _, m := range sd.messages {
for _, note := range sd.notes { for _, p := range m.Route {
endY += note.Height + sd.messageYStep endY = math.Max(endY, p.Y)
}
} }
for _, note := range sd.notes {
endY = math.Max(endY, note.TopLeft.Y+note.Height)
}
endY += sd.yStep
for _, actor := range sd.actors { for _, actor := range sd.actors {
actorBottom := actor.Center() actorBottom := actor.Center()
@ -232,23 +236,20 @@ func (sd *sequenceDiagram) placeNotes() {
rankToX[sd.objectRank[actor]] = actor.Center().X rankToX[sd.objectRank[actor]] = actor.Center().X
} }
for _, note := range sd.notes { for i, note := range sd.notes {
verticalIndex := sd.verticalIndices[note.AbsID()] verticalIndex := sd.verticalIndices[note.AbsID()]
y := sd.maxActorHeight + sd.messageYStep y := sd.maxActorHeight + sd.yStep
for _, msg := range sd.messages { for _, msg := range sd.messages {
if sd.verticalIndices[msg.AbsID()] < verticalIndex { if sd.verticalIndices[msg.AbsID()] < verticalIndex {
y += sd.messageYStep y += sd.yStep
} }
} }
for _, otherNote := range sd.notes { for _, otherNote := range sd.notes[:i] {
if sd.verticalIndices[otherNote.AbsID()] < verticalIndex { y += otherNote.Height + sd.yStep
y += otherNote.Height + sd.messageYStep
}
} }
x := rankToX[sd.objectRank[note]] - (note.Width / 2.) x := rankToX[sd.objectRank[note]] - (note.Width / 2.)
// note.Box = geo.NewBox(geo.NewPoint(x, y), width, height)
note.Box.TopLeft = geo.NewPoint(x, y) note.Box.TopLeft = geo.NewPoint(x, y)
note.ZIndex = 1 note.ZIndex = 1
} }
@ -349,7 +350,7 @@ func (sd *sequenceDiagram) routeMessages() {
for _, note := range sd.notes { for _, note := range sd.notes {
if sd.verticalIndices[note.AbsID()] < sd.verticalIndices[message.AbsID()] { if sd.verticalIndices[note.AbsID()] < sd.verticalIndices[message.AbsID()] {
messageY += note.Height + sd.messageYStep messageY += note.Height + sd.yStep
} }
} }
@ -366,7 +367,7 @@ func (sd *sequenceDiagram) routeMessages() {
func (sd *sequenceDiagram) getMessageY(rank int) float64 { func (sd *sequenceDiagram) getMessageY(rank int) float64 {
// +1 so that the first message has the top padding for its label // +1 so that the first message has the top padding for its label
return ((float64(rank) + 1.) * sd.messageYStep) + sd.maxActorHeight return ((float64(rank) + 1.) * sd.yStep) + sd.maxActorHeight
} }
func (sd *sequenceDiagram) isActor(obj *d2graph.Object) bool { func (sd *sequenceDiagram) isActor(obj *d2graph.Object) bool {