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

save

Browse source
This commit is contained in:
Alexander Wang 2023-02-09 12:19:33 -08:00
parent cadaf0c830
commit 50281293e7
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
2 changed files with 6 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
d2layouts/d2sequence/constants.go
View file

@ -12,7 +12,7 @@ const SELF_MESSAGE_HORIZONTAL_TRAVEL = 74
const GROUP_CONTAINER_PADDING = 24. const GROUP_CONTAINER_PADDING = 24.
const GROUP_LABEL_PADDING = 20 const GROUP_LABEL_PADDING = 30
// min vertical distance between messages // min vertical distance between messages
const MIN_MESSAGE_DISTANCE = 40. const MIN_MESSAGE_DISTANCE = 40.

65
d2layouts/d2sequence/sequence_diagram.go
View file

@ -217,57 +217,13 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) {
maxX := math.Inf(-1) maxX := math.Inf(-1)
maxY := math.Inf(-1) maxY := math.Inf(-1)
labelHeight := 0
if group.LabelHeight != nil {
labelHeight = *group.LabelHeight
}
padBelow := float64(labelHeight + GROUP_LABEL_PADDING)
// Make sure the label height fits
line := getObjEarliestLineNum(group)
for _, m := range sd.messages {
if getEdgeEarliestLineNum(m) > line {
for _, p := range m.Route {
p.Y += padBelow
}
for _, s := range sd.spans {
if getObjEarliestLineNum(s) >= line {
continue
}
if m.Src == s || m.Dst == s {
s.Height += padBelow
break
}
}
}
}
for _, n := range sd.notes {
if getObjEarliestLineNum(n) > line {
n.TopLeft.Y += padBelow
}
}
for _, s := range sd.spans {
if getObjEarliestLineNum(s) > line {
s.TopLeft.Y += padBelow
}
}
for _, g := range sd.groups {
if g.Box == nil || g.Box.TopLeft == nil {
continue
}
if getObjEarliestLineNum(g) > line {
g.TopLeft.Y += padBelow
}
}
for _, m := range sd.messages { for _, m := range sd.messages {
if m.ContainedBy(group) { if m.ContainedBy(group) {
for _, p := range m.Route { for _, p := range m.Route {
minX = math.Min(minX, p.X-HORIZONTAL_PAD) minX = math.Min(minX, p.X-HORIZONTAL_PAD)
minY = math.Min(minY, p.Y-math.Max(MIN_MESSAGE_DISTANCE/2., float64(labelHeight+GROUP_LABEL_PADDING))) minY = math.Min(minY, p.Y-GROUP_LABEL_PADDING)
maxX = math.Max(maxX, p.X+HORIZONTAL_PAD) maxX = math.Max(maxX, p.X+HORIZONTAL_PAD)
maxY = math.Max(maxY, p.Y+MIN_MESSAGE_DISTANCE/2.) maxY = math.Max(maxY, p.Y+GROUP_LABEL_PADDING)
} }
} }
} }
@ -289,9 +245,9 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) {
} }
if inGroup { if inGroup {
minX = math.Min(minX, n.TopLeft.X-HORIZONTAL_PAD) minX = math.Min(minX, n.TopLeft.X-HORIZONTAL_PAD)
minY = math.Min(minY, n.TopLeft.Y-math.Max(MIN_MESSAGE_DISTANCE/2., float64(labelHeight+GROUP_LABEL_PADDING))) minY = math.Min(minY, n.TopLeft.Y-GROUP_LABEL_PADDING)
maxX = math.Max(maxX, n.TopLeft.X+n.Width+HORIZONTAL_PAD) maxX = math.Max(maxX, n.TopLeft.X+n.Width+HORIZONTAL_PAD)
maxY = math.Max(maxY, n.TopLeft.Y+n.Height+MIN_MESSAGE_DISTANCE/2.) maxY = math.Max(maxY, n.TopLeft.Y+n.Height+GROUP_LABEL_PADDING)
} }
} }
@ -299,7 +255,7 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) {
for _, g := range sd.groups { for _, g := range sd.groups {
if ch == g { if ch == g {
minX = math.Min(minX, ch.TopLeft.X-GROUP_CONTAINER_PADDING) minX = math.Min(minX, ch.TopLeft.X-GROUP_CONTAINER_PADDING)
minY = math.Min(minY, ch.TopLeft.Y-math.Max(GROUP_CONTAINER_PADDING, float64(labelHeight+GROUP_LABEL_PADDING))) minY = math.Min(minY, ch.TopLeft.Y-GROUP_CONTAINER_PADDING)
maxX = math.Max(maxX, ch.TopLeft.X+ch.Width+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) maxY = math.Max(maxY, ch.TopLeft.Y+ch.Height+GROUP_CONTAINER_PADDING)
break break
@ -307,17 +263,6 @@ func (sd *sequenceDiagram) placeGroup(group *d2graph.Object) {
} }
} }
// for _, g := range sd.groups {
// if g.Box == nil || g.TopLeft == nil {
// continue
// }
//
// if g.Parent != group.Parent {
// continue
// }
// minY = math.Max(minY, g.TopLeft.Y+g.Height+GROUP_CONTAINER_PADDING)
// }
group.Box = geo.NewBox( group.Box = geo.NewBox(
geo.NewPoint( geo.NewPoint(
minX, minX,