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

Use user define object order

Browse source
This commit is contained in:
Júlio César Batista 2022-11-28 11:32:56 -08:00
parent 7bf32ff33b
commit b415c6c858
No known key found for this signature in database
GPG key ID: 10C4B861BF314878
1 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
d2layouts/d2sequence/layout.go
View file

@ -17,36 +17,24 @@ func Layout(ctx context.Context, g *d2graph.Graph) (err error) {
actorXStep := 200. actorXStep := 200.
maxActorHeight := 0. maxActorHeight := 0.
var actorsInOrder []*d2graph.Object
seen := make(map[*d2graph.Object]struct{})
for _, edge := range g.Edges { for _, edge := range g.Edges {
if _, exists := seen[edge.Src]; !exists {
seen[edge.Src] = struct{}{}
actorsInOrder = append(actorsInOrder, edge.Src)
}
if _, exists := seen[edge.Dst]; !exists {
seen[edge.Dst] = struct{}{}
actorsInOrder = append(actorsInOrder, edge.Dst)
}
edgeYStep = math.Max(edgeYStep, float64(edge.LabelDimensions.Height)+pad) edgeYStep = math.Max(edgeYStep, float64(edge.LabelDimensions.Height)+pad)
actorXStep = math.Max(actorXStep, float64(edge.LabelDimensions.Width)+pad) actorXStep = math.Max(actorXStep, float64(edge.LabelDimensions.Width)+pad)
maxActorHeight = math.Max(maxActorHeight, edge.Src.Height+pad) maxActorHeight = math.Max(maxActorHeight, edge.Src.Height+pad)
maxActorHeight = math.Max(maxActorHeight, edge.Dst.Height+pad) maxActorHeight = math.Max(maxActorHeight, edge.Dst.Height+pad)
} }
placeActors(actorsInOrder, maxActorHeight, actorXStep) placeActors(g.Objects, maxActorHeight, actorXStep)
// edges are placed in the order users define them
routeEdges(g.Edges, maxActorHeight, edgeYStep) routeEdges(g.Edges, maxActorHeight, edgeYStep)
addLifelineEdges(g, actorsInOrder, edgeYStep) addLifelineEdges(g, g.Objects, edgeYStep)
return nil return nil
} }
// placeActors places actors bottom aligned, side by side // placeActors places actors bottom aligned, side by side
func placeActors(actorsInOrder []*d2graph.Object, maxHeight, xStep float64) { func placeActors(actors []*d2graph.Object, maxHeight, xStep float64) {
x := 0. x := 0.
for _, actors := range actorsInOrder { for _, actors := range actors {
yOffset := maxHeight - actors.Height yOffset := maxHeight - actors.Height
actors.TopLeft = geo.NewPoint(x, yOffset) actors.TopLeft = geo.NewPoint(x, yOffset)
x += actors.Width + xStep x += actors.Width + xStep
@ -66,8 +54,12 @@ func routeEdges(edgesInOrder []*d2graph.Edge, startY, yStep float64) {
edgeY += yStep edgeY += yStep
if edge.Attributes.Label.Value != "" { if edge.Attributes.Label.Value != "" {
// TODO: consider label right-to-left isLeftToRight := edge.Src.TopLeft.X < edge.Dst.TopLeft.X
if isLeftToRight {
edge.LabelPosition = go2.Pointer(string(label.OutsideTopCenter)) edge.LabelPosition = go2.Pointer(string(label.OutsideTopCenter))
} else {
edge.LabelPosition = go2.Pointer(string(label.OutsideBottomCenter))
}
} }
} }
} }
@ -81,9 +73,9 @@ func routeEdges(edgesInOrder []*d2graph.Edge, startY, yStep float64) {
// │ lifeline // │ lifeline
// │ // │
// │ // │
func addLifelineEdges(g *d2graph.Graph, actorsInOrder []*d2graph.Object, yStep float64) { func addLifelineEdges(g *d2graph.Graph, actors []*d2graph.Object, yStep float64) {
endY := g.Edges[len(g.Edges)-1].Route[0].Y + yStep endY := g.Edges[len(g.Edges)-1].Route[0].Y + yStep
for _, actor := range actorsInOrder { for _, actor := range actors {
actorBottom := actor.Center() actorBottom := actor.Center()
actorBottom.Y = actor.TopLeft.Y + actor.Height actorBottom.Y = actor.TopLeft.Y + actor.Height
actorLifelineEnd := actor.Center() actorLifelineEnd := actor.Center()
@ -91,9 +83,7 @@ func addLifelineEdges(g *d2graph.Graph, actorsInOrder []*d2graph.Object, yStep f
g.Edges = append(g.Edges, &d2graph.Edge{ g.Edges = append(g.Edges, &d2graph.Edge{
Attributes: d2graph.Attributes{ Attributes: d2graph.Attributes{
Style: d2graph.Style{ Style: d2graph.Style{
StrokeDash: &d2graph.Scalar{ StrokeDash: &d2graph.Scalar{Value: "10"},
Value: "10",
},
Stroke: actor.Attributes.Style.Stroke, Stroke: actor.Attributes.Style.Stroke,
StrokeWidth: actor.Attributes.Style.StrokeWidth, StrokeWidth: actor.Attributes.Style.StrokeWidth,
}, },