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

fix: cr

Browse source
This commit is contained in:
donglixiaoche 2023-04-04 18:33:23 +08:00
parent 05a9498c99
commit c77590e5bf
No known key found for this signature in database
GPG key ID: 3190E65EBAD6D6E2
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
d2layouts/d2near/layout.go
View file

@ -27,12 +27,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNearGraphs []*d2graph
for _, tempGraph := range constantNearGraphs { for _, tempGraph := range constantNearGraphs {
obj := tempGraph.Root.ChildrenArray[0] obj := tempGraph.Root.ChildrenArray[0]
if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "-center") { if processCenters == strings.Contains(d2graph.Key(obj.Attributes.NearKey)[0], "-center") {
preX, preY := obj.TopLeft.X, obj.TopLeft.Y prevX, prevY := obj.TopLeft.X, obj.TopLeft.Y
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-prevX, obj.TopLeft.Y-prevY
subObjects, subEdges := tempGraph.Objects, tempGraph.Edges for _, subObject := range tempGraph.Objects {
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 {
continue continue
@ -40,14 +39,14 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNearGraphs []*d2graph
subObject.TopLeft.X += dx subObject.TopLeft.X += dx
subObject.TopLeft.Y += dy subObject.TopLeft.Y += dy
} }
for _, subEdge := range subEdges { for _, subEdge := range tempGraph.Edges {
for _, point := range subEdge.Route { for _, point := range subEdge.Route {
point.X += dx point.X += dx
point.Y += dy point.Y += dy
} }
} }
g.Edges = append(g.Edges, subEdges...) g.Edges = append(g.Edges, tempGraph.Edges...)
} }
} }
for _, tempGraph := range constantNearGraphs { for _, tempGraph := range constantNearGraphs {
@ -66,11 +65,9 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNearGraphs []*d2graph
} }
func attachChildren(g *d2graph.Graph, obj *d2graph.Object) { func attachChildren(g *d2graph.Graph, obj *d2graph.Object) {
if obj.ChildrenArray != nil && len(obj.ChildrenArray) != 0 { for _, child := range obj.ChildrenArray {
for _, child := range obj.ChildrenArray { g.Objects = append(g.Objects, child)
g.Objects = append(g.Objects, child) attachChildren(g, child)
attachChildren(g, child)
}
} }
} }
@ -150,7 +147,7 @@ func WithoutConstantNears(ctx context.Context, g *d2graph.Graph) (constantNearGr
} }
_, 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 := pluckObjAndEdges(g, obj)
tempGraph := d2graph.NewGraph() tempGraph := d2graph.NewGraph()
tempGraph.Root.ChildrenArray = []*d2graph.Object{obj} tempGraph.Root.ChildrenArray = []*d2graph.Object{obj}
@ -172,12 +169,14 @@ func WithoutConstantNears(ctx context.Context, g *d2graph.Graph) (constantNearGr
break break
} }
} }
obj.Parent = tempGraph.Root
} }
} }
return constantNearGraphs return constantNearGraphs
} }
func pluckOutNearObjectAndEdges(g *d2graph.Graph, obj *d2graph.Object) (descendantsObjects []*d2graph.Object, edges []*d2graph.Edge) { func pluckObjAndEdges(g *d2graph.Graph, obj *d2graph.Object) (descendantsObjects []*d2graph.Object, edges []*d2graph.Edge) {
for i := 0; i < len(g.Edges); i++ { for i := 0; i < len(g.Edges); i++ {
edge := g.Edges[i] edge := g.Edges[i]
if edge.Src == obj || edge.Dst == obj { if edge.Src == obj || edge.Dst == obj {
@ -193,7 +192,7 @@ func pluckOutNearObjectAndEdges(g *d2graph.Graph, obj *d2graph.Object) (descenda
descendantsObjects = append(descendantsObjects, obj) descendantsObjects = append(descendantsObjects, obj)
g.Objects = append(g.Objects[:i], g.Objects[i+1:]...) g.Objects = append(g.Objects[:i], g.Objects[i+1:]...)
for _, child := range obj.ChildrenArray { for _, child := range obj.ChildrenArray {
subObjects, subEdges := pluckOutNearObjectAndEdges(g, child) subObjects, subEdges := pluckObjAndEdges(g, child)
descendantsObjects = append(descendantsObjects, subObjects...) descendantsObjects = append(descendantsObjects, subObjects...)
edges = append(edges, subEdges...) edges = append(edges, subEdges...)
} }

4
d2lib/d2.go
View file

@ -72,12 +72,10 @@ func compile(ctx context.Context, g *d2graph.Graph, opts *CompileOptions) (*d2ta
// run core layout for constantNears // run core layout for constantNears
for _, tempGraph := range constantNearGraphs { for _, tempGraph := range constantNearGraphs {
nearObject := tempGraph.Root.ChildrenArray[0]
nearObject.Parent = tempGraph.Root
if err = coreLayout(ctx, tempGraph); err != nil { if err = coreLayout(ctx, tempGraph); err != nil {
return nil, err return nil, err
} }
nearObject.Parent = g.Root tempGraph.Root.ChildrenArray[0].Parent = g.Root
for _, obj := range tempGraph.Objects { for _, obj := range tempGraph.Objects {
obj.Graph = g obj.Graph = g
} }