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

fix extracting near subgraphs

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-21 16:18:39 -07:00
parent 1c8df051b9
commit 0fbc921248
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
d2layouts/d2layouts.go
View file

@ -36,7 +36,7 @@ func (gi GraphInfo) isDefault() bool {
func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, coreLayout d2graph.LayoutGraph) geo.Spacing { func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, coreLayout d2graph.LayoutGraph) geo.Spacing {
g.Root.Box = &geo.Box{} g.Root.Box = &geo.Box{}
log.Warn(ctx, "ln info", slog.F("gi", graphInfo)) log.Warn(ctx, "ln info", slog.F("gi", graphInfo), slog.F("root level", g.RootLevel))
// Before we can layout these nodes, we need to handle all nested diagrams first. // Before we can layout these nodes, we need to handle all nested diagrams first.
extracted := make(map[*d2graph.Object]*d2graph.Graph) extracted := make(map[*d2graph.Object]*d2graph.Graph)
extractedInfo := make(map[*d2graph.Object]GraphInfo) extractedInfo := make(map[*d2graph.Object]GraphInfo)
@ -54,12 +54,6 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
// if we are in a grid diagram, and our children have descendants // if we are in a grid diagram, and our children have descendants
// we need to run layout on them first, even if they are not special diagram types // we need to run layout on them first, even if they are not special diagram types
// !!
// when we have a constant near or a grid cell that is a container,
// we want to extract it as nested graph, not just its descendants,
// run layout, then re-inject it
// !!
if isGridCellContainer { if isGridCellContainer {
nestedGraph := ExtractSubgraph(curr, true) nestedGraph := ExtractSubgraph(curr, true)
LayoutNested(ctx, nestedGraph, GraphInfo{}, coreLayout) LayoutNested(ctx, nestedGraph, GraphInfo{}, coreLayout)
@ -78,26 +72,33 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
extractedInfo[curr] = gi extractedInfo[curr] = gi
// There is a nested diagram here, so extract its contents and process in the same way // There is a nested diagram here, so extract its contents and process in the same way
log.Warn(ctx, "extract descendants", slog.F("child", curr.AbsID())) nestedGraph := ExtractSubgraph(curr, gi.IsConstantNear)
nestedGraph := ExtractSubgraph(curr, false)
// Layout of nestedGraph is completed
log.Info(ctx, "layout nested", slog.F("level", curr.Level()), slog.F("child", curr.AbsID())) log.Info(ctx, "layout nested", slog.F("level", curr.Level()), slog.F("child", curr.AbsID()))
spacing := LayoutNested(ctx, nestedGraph, gi, coreLayout) nestedInfo := gi
log.Warn(ctx, "fitting child", slog.F("child", curr.AbsID())) nearKey := curr.NearKey
// Fit child to size of nested layout
FitToGraph(curr, nestedGraph, spacing)
// for constant nears, we also extract the child after extracting descendants
// main layout is run, then near positions child, then descendants are injected with all others
if gi.IsConstantNear { if gi.IsConstantNear {
nearGraph := ExtractSubgraph(curr, true) // layout nested as a non-near
constantNears = append(constantNears, nearGraph) nestedInfo = GraphInfo{}
curr.NearKey = nil
} }
curr.TopLeft = geo.NewPoint(0, 0)
spacing := LayoutNested(ctx, nestedGraph, nestedInfo, coreLayout)
if gi.IsConstantNear {
curr.NearKey = nearKey
} else {
FitToGraph(curr, nestedGraph, spacing)
curr.TopLeft = geo.NewPoint(0, 0)
}
if gi.IsConstantNear {
// near layout will inject these nestedGraphs
constantNears = append(constantNears, nestedGraph)
} else {
// We will restore the contents after running layout with child as the placeholder // We will restore the contents after running layout with child as the placeholder
extracted[curr] = nestedGraph extracted[curr] = nestedGraph
}
} else if len(curr.Children) > 0 { } else if len(curr.Children) > 0 {
queue = append(queue, curr.ChildrenArray...) queue = append(queue, curr.ChildrenArray...)
} }
@ -150,19 +151,10 @@ func LayoutNested(ctx context.Context, g *d2graph.Graph, graphInfo GraphInfo, co
return spacing return spacing
} }
// TODO multiple types at same (e.g. constant nears with grid at root level)
// e.g. constant nears with sequence diagram at root level
func NestedGraphInfo(obj *d2graph.Object) (gi GraphInfo) { func NestedGraphInfo(obj *d2graph.Object) (gi GraphInfo) {
if obj.Graph.RootLevel == 0 && obj.IsConstantNear() { if obj.Graph.RootLevel == 0 && obj.IsConstantNear() {
gi.IsConstantNear = true gi.IsConstantNear = true
} }
// if obj.Graph.RootLevel == -1 {
// for _, obj := range obj.Graph.Root.ChildrenArray {
// if obj.IsConstantNear() {
// return ConstantNearGraph
// }
// }
// }
if obj.IsSequenceDiagram() { if obj.IsSequenceDiagram() {
gi.DiagramType = SequenceDiagram gi.DiagramType = SequenceDiagram
} else if obj.IsGridDiagram() { } else if obj.IsGridDiagram() {
@ -172,6 +164,8 @@ func NestedGraphInfo(obj *d2graph.Object) (gi GraphInfo) {
} }
func ExtractSubgraph(container *d2graph.Object, includeSelf bool) *d2graph.Graph { func ExtractSubgraph(container *d2graph.Object, includeSelf bool) *d2graph.Graph {
// includeSelf: when we have a constant near or a grid cell that is a container,
// we want to include itself in the nested graph, not just its descendants,
nestedGraph := d2graph.NewGraph() nestedGraph := d2graph.NewGraph()
nestedGraph.RootLevel = int(container.Level()) nestedGraph.RootLevel = int(container.Level())
if includeSelf { if includeSelf {