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

fix scenario with only center nears

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

34
d2layouts/d2near/layout.go
View file

@ -14,12 +14,22 @@ import (
const pad = 20 const pad = 20
var CenterNearConstants = map[string]struct{}{ type set map[string]struct{}
var HorizontalCenterNears = set{
"center-left": {},
"center-right": {},
}
var VerticalCenterNears = set{
"top-center": {}, "top-center": {},
"center-left": {},
"center-right": {},
"bottom-center": {}, "bottom-center": {},
} }
var NonCenterNears = set{
"top-left": {},
"top-right": {},
"bottom-left": {},
"bottom-right": {},
}
// 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, constantNearGraphs []*d2graph.Graph) error { func Layout(ctx context.Context, g *d2graph.Graph, constantNearGraphs []*d2graph.Graph) error {
@ -37,11 +47,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, constantNearGraphs []*d2graph
// Imagine the graph has two long texts, one at top center and one at top left. // Imagine the graph has two long texts, one at top center and one at top left.
// Top left should go left enough to not collide with center. // Top left should go left enough to not collide with center.
// So place the center ones first, then the later ones will consider them for bounding box // So place the center ones first, then the later ones will consider them for bounding box
for _, processCenters := range []bool{true, false} { for _, currentSet := range []set{VerticalCenterNears, HorizontalCenterNears, NonCenterNears} {
for _, tempGraph := range constantNearGraphs { for _, tempGraph := range constantNearGraphs {
obj := tempGraph.Root.ChildrenArray[0] obj := tempGraph.Root.ChildrenArray[0]
_, isCenterConstant := CenterNearConstants[d2graph.Key(obj.NearKey)[0]] _, in := currentSet[d2graph.Key(obj.NearKey)[0]]
if processCenters == isCenterConstant { if in {
prevX, prevY := 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-prevX, obj.TopLeft.Y-prevY dx, dy := obj.TopLeft.X-prevX, obj.TopLeft.Y-prevY
@ -64,8 +74,8 @@ 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]
_, isCenterConstant := CenterNearConstants[d2graph.Key(obj.NearKey)[0]] _, in := currentSet[d2graph.Key(obj.NearKey)[0]]
if processCenters == isCenterConstant { if in {
// The z-index for constant nears does not matter, as it will not collide // The z-index for constant nears does not matter, as it will not collide
g.Objects = append(g.Objects, tempGraph.Objects...) g.Objects = append(g.Objects, tempGraph.Objects...)
if obj.Parent.Children == nil { if obj.Parent.Children == nil {
@ -92,28 +102,20 @@ func place(obj *d2graph.Object) (float64, float64) {
switch nearKeyStr { switch nearKeyStr {
case "top-left": case "top-left":
x, y = tl.X-obj.Width-pad, tl.Y-obj.Height-pad x, y = tl.X-obj.Width-pad, tl.Y-obj.Height-pad
break
case "top-center": case "top-center":
x, y = tl.X+w/2-obj.Width/2, tl.Y-obj.Height-pad x, y = tl.X+w/2-obj.Width/2, tl.Y-obj.Height-pad
break
case "top-right": case "top-right":
x, y = br.X+pad, tl.Y-obj.Height-pad x, y = br.X+pad, tl.Y-obj.Height-pad
break
case "center-left": case "center-left":
x, y = tl.X-obj.Width-pad, tl.Y+h/2-obj.Height/2 x, y = tl.X-obj.Width-pad, tl.Y+h/2-obj.Height/2
break
case "center-right": case "center-right":
x, y = br.X+pad, tl.Y+h/2-obj.Height/2 x, y = br.X+pad, tl.Y+h/2-obj.Height/2
break
case "bottom-left": case "bottom-left":
x, y = tl.X-obj.Width-pad, br.Y+pad x, y = tl.X-obj.Width-pad, br.Y+pad
break
case "bottom-center": case "bottom-center":
x, y = br.X-w/2-obj.Width/2, br.Y+pad x, y = br.X-w/2-obj.Width/2, br.Y+pad
break
case "bottom-right": case "bottom-right":
x, y = br.X+pad, br.Y+pad x, y = br.X+pad, br.Y+pad
break
} }
if obj.LabelPosition != nil && !strings.Contains(*obj.LabelPosition, "INSIDE") { if obj.LabelPosition != nil && !strings.Contains(*obj.LabelPosition, "INSIDE") {