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

refactor pluck

Browse source
This commit is contained in:
Gavin Nishizawa 2023-09-13 14:55:50 -07:00
parent fc06b09df6
commit dbf4a86134
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
d2graph/layout.go
View file

@ -60,7 +60,7 @@ func (g *Graph) ExtractAsNestedGraph(obj *Object) *Graph {
func pluckObjAndEdges(g *Graph, obj *Object) (descendantsObjects []*Object, edges []*Edge) { func pluckObjAndEdges(g *Graph, obj *Object) (descendantsObjects []*Object, edges []*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.IsDescendantOf(obj) || edge.Dst.IsDescendantOf(obj) {
edges = append(edges, edge) edges = append(edges, edge)
g.Edges = append(g.Edges[:i], g.Edges[i+1:]...) g.Edges = append(g.Edges[:i], g.Edges[i+1:]...)
i-- i--
@ -69,15 +69,10 @@ func pluckObjAndEdges(g *Graph, obj *Object) (descendantsObjects []*Object, edge
for i := 0; i < len(g.Objects); i++ { for i := 0; i < len(g.Objects); i++ {
temp := g.Objects[i] temp := g.Objects[i]
if temp.AbsID() == obj.AbsID() { if temp.IsDescendantOf(obj) {
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 { i--
subObjects, subEdges := pluckObjAndEdges(g, child)
descendantsObjects = append(descendantsObjects, subObjects...)
edges = append(edges, subEdges...)
}
break
} }
} }