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

don't pass node/edge labels to dagre

Browse source
This commit is contained in:
Gavin Nishizawa 2022-11-07 11:14:16 -08:00
parent 7a55e9c5f1
commit 155e4d40ea
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
d2layouts/d2dagrelayout/layout.go
View file

@ -73,7 +73,7 @@ func Layout(ctx context.Context, d2graph *d2graph.Graph) (err error) {
loadScript := "" loadScript := ""
for _, obj := range d2graph.Objects { for _, obj := range d2graph.Objects {
id := obj.AbsID() id := obj.AbsID()
loadScript += generateAddNodeLine(id, obj.Attributes.Label.Value, int(obj.Width), int(obj.Height)) loadScript += generateAddNodeLine(id, int(obj.Width), int(obj.Height))
if obj.Parent != d2graph.Root { if obj.Parent != d2graph.Root {
loadScript += generateAddParentLine(id, obj.Parent.AbsID()) loadScript += generateAddParentLine(id, obj.Parent.AbsID())
} }
@ -93,7 +93,7 @@ func Layout(ctx context.Context, d2graph *d2graph.Graph) (err error) {
// for `b <- a`, edge.Edge is `a -> b` and we expect this routing result // for `b <- a`, edge.Edge is `a -> b` and we expect this routing result
src, dst = dst, src src, dst = dst, src
} }
loadScript += generateAddEdgeLine(src.AbsID(), dst.AbsID(), edge.AbsID(), edge.Attributes.Label.Value) loadScript += generateAddEdgeLine(src.AbsID(), dst.AbsID(), edge.AbsID())
} }
if debugJS { if debugJS {
@ -234,15 +234,15 @@ func setGraphAttrs(attrs dagreGraphAttrs) string {
) )
} }
func generateAddNodeLine(id, label string, width, height int) string { func generateAddNodeLine(id string, width, height int) string {
return fmt.Sprintf("g.setNode(`%s`, { label: `%s`, width: %d, height: %d });\n", id, label, width, height) return fmt.Sprintf("g.setNode(`%s`, { width: %d, height: %d });\n", id, width, height)
} }
func generateAddParentLine(childID, parentID string) string { func generateAddParentLine(childID, parentID string) string {
return fmt.Sprintf("g.setParent(`%s`, `%s`);\n", childID, parentID) return fmt.Sprintf("g.setParent(`%s`, `%s`);\n", childID, parentID)
} }
func generateAddEdgeLine(fromID, toID, edgeID, label string) string { func generateAddEdgeLine(fromID, toID, edgeID string) string {
// in dagre v is from, w is to, name is to uniquely identify // in dagre v is from, w is to, name is to uniquely identify
return fmt.Sprintf("g.setEdge({v:`%s`, w:`%s`, name:`%s`, label:`%s`});\n", fromID, toID, edgeID, label) return fmt.Sprintf("g.setEdge({v:`%s`, w:`%s`, name:`%s` });\n", fromID, toID, edgeID)
} }