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

fix: cr, integrate logic of construct sub graph inside WithoutConstantNears

Browse source
This commit is contained in:
donglixiaoche 2023-03-22 15:14:30 +08:00
parent b9a94ca11f
commit 69532df6aa
No known key found for this signature in database
GPG key ID: 3190E65EBAD6D6E2
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
d2layouts/d2near/layout.go
View file

@ -15,7 +15,7 @@ import (
const pad = 20 const pad = 20
// Layout finds the shapes which are assigned constant near keywords and places them. // Layout finds the shapes which are assigned constant near keywords and places them.
func Layout(ctx context.Context, g *d2graph.Graph, constantNears []*d2graph.Object, descendantObjectMap map[*d2graph.Object][]*d2graph.Object, descendantEdgeMap map[*d2graph.Object][]*d2graph.Edge) error { func Layout(ctx context.Context, g *d2graph.Graph, constantNears []*d2graph.Object, constantNearGraphs map[*d2graph.Object]*d2graph.Graph) error {
if len(constantNears) == 0 { if len(constantNears) == 0 {
return nil return nil
} }
@ -30,7 +30,12 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNears []*d2graph.Obje
obj.TopLeft = geo.NewPoint(place(obj)) obj.TopLeft = geo.NewPoint(place(obj))
dx, dy := obj.TopLeft.X-preX, obj.TopLeft.Y-preY dx, dy := obj.TopLeft.X-preX, obj.TopLeft.Y-preY
subObjects, subEdges := descendantObjectMap[obj], descendantEdgeMap[obj] tempGraph := constantNearGraphs[obj]
if tempGraph == nil {
continue
}
subObjects, subEdges := tempGraph.Objects, tempGraph.Edges
for _, subObject := range subObjects { for _, subObject := range subObjects {
// `obj` already been replaced above by `place(obj)` // `obj` already been replaced above by `place(obj)`
if subObject == obj { if subObject == obj {
@ -111,9 +116,8 @@ func place(obj *d2graph.Object) (float64, float64) {
// WithoutConstantNears plucks out the graph objects which have "near" set to a constant value // WithoutConstantNears plucks out the graph objects which have "near" set to a constant value
// This is to be called before layout engines so they don't take part in regular positioning // This is to be called before layout engines so they don't take part in regular positioning
func WithoutConstantNears(ctx context.Context, g *d2graph.Graph) (nears []*d2graph.Object, descendantObjectMap map[*d2graph.Object][]*d2graph.Object, descendantEdgeMap map[*d2graph.Object][]*d2graph.Edge) { func WithoutConstantNears(ctx context.Context, g *d2graph.Graph) (nears []*d2graph.Object, constantNearGraphs map[*d2graph.Object]*d2graph.Graph) {
descendantObjectMap = make(map[*d2graph.Object][]*d2graph.Object) constantNearGraphs = make(map[*d2graph.Object]*d2graph.Graph)
descendantEdgeMap = make(map[*d2graph.Object][]*d2graph.Edge)
for i := 0; i < len(g.Objects); i++ { for i := 0; i < len(g.Objects); i++ {
obj := g.Objects[i] obj := g.Objects[i]
@ -127,8 +131,14 @@ func WithoutConstantNears(ctx context.Context, g *d2graph.Graph) (nears []*d2gra
_, isConst := d2graph.NearConstants[d2graph.Key(obj.Attributes.NearKey)[0]] _, isConst := d2graph.NearConstants[d2graph.Key(obj.Attributes.NearKey)[0]]
if isConst { if isConst {
descendantObjects, edges := pluckOutNearObjectAndEdges(g, obj) descendantObjects, edges := pluckOutNearObjectAndEdges(g, obj)
descendantObjectMap[obj] = descendantObjects
descendantEdgeMap[obj] = edges tempGraph := d2graph.NewGraph()
tempGraph.Root.ChildrenArray = []*d2graph.Object{obj}
tempGraph.Root.Children[obj.ID] = obj
tempGraph.Objects = descendantObjects
tempGraph.Edges = edges
constantNearGraphs[obj] = tempGraph
nears = append(nears, obj) nears = append(nears, obj)
i-- i--
@ -141,7 +151,7 @@ func WithoutConstantNears(ctx context.Context, g *d2graph.Graph) (nears []*d2gra
} }
} }
} }
return nears, descendantObjectMap, descendantEdgeMap return nears, constantNearGraphs
} }
func pluckOutNearObjectAndEdges(g *d2graph.Graph, obj *d2graph.Object) (descendantsObjects []*d2graph.Object, edges []*d2graph.Edge) { func pluckOutNearObjectAndEdges(g *d2graph.Graph, obj *d2graph.Object) (descendantsObjects []*d2graph.Object, edges []*d2graph.Edge) {

14
d2lib/d2.go
View file

@ -68,15 +68,13 @@ func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2ta
return nil, err return nil, err
} }
constantNears, descendantObjectMap, descendantEdgeMap := d2near.WithoutConstantNears(ctx, g) constantNears, constantNearGraphs := d2near.WithoutConstantNears(ctx, g)
// run core layout for constantNears // run core layout for constantNears
for _, nearObject := range constantNears { for nearObject, tempGraph := range constantNearGraphs {
tempGraph := d2graph.NewGraph() if tempGraph == nil {
tempGraph.Root.ChildrenArray = []*d2graph.Object{nearObject} continue
tempGraph.Root.Children[nearObject.ID] = nearObject }
tempGraph.Objects = descendantObjectMap[nearObject]
tempGraph.Edges = descendantEdgeMap[nearObject]
nearObject.Parent = tempGraph.Root nearObject.Parent = tempGraph.Root
if err = coreLayout(ctx, tempGraph); err != nil { if err = coreLayout(ctx, tempGraph); err != nil {
@ -90,7 +88,7 @@ func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2ta
return nil, err return nil, err
} }
err = d2near.Layout(ctx, g, constantNears, descendantObjectMap, descendantEdgeMap) err = d2near.Layout(ctx, g, constantNears, constantNearGraphs)
if err != nil { if err != nil {
return nil, err return nil, err
} }