From 04825458a8a4a211a110e616ea4ed3ba7840fd13 Mon Sep 17 00:00:00 2001 From: Mayank77maruti Date: Fri, 21 Feb 2025 17:38:14 +0000 Subject: [PATCH] iteration 6 --- d2layouts/d2cycle/layout.go | 257 ++++++++++++++++++++++++++++++------ 1 file changed, 218 insertions(+), 39 deletions(-) diff --git a/d2layouts/d2cycle/layout.go b/d2layouts/d2cycle/layout.go index 559bd0b3a..89d9602ec 100644 --- a/d2layouts/d2cycle/layout.go +++ b/d2layouts/d2cycle/layout.go @@ -1,3 +1,199 @@ +// package d2cycle + +// import ( +// "context" +// "math" + +// "oss.terrastruct.com/d2/d2graph" +// "oss.terrastruct.com/d2/lib/geo" +// "oss.terrastruct.com/d2/lib/label" +// "oss.terrastruct.com/util-go/go2" +// ) + +// const ( +// MIN_RADIUS = 200 +// PADDING = 20 +// MIN_SEGMENT_LEN = 10 +// ARC_STEPS = 30 +// ) + +// func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) error { +// objects := g.Root.ChildrenArray +// if len(objects) == 0 { +// return nil +// } + +// for _, obj := range g.Objects { +// positionLabelsIcons(obj) +// } + +// radius := calculateRadius(objects) +// positionObjects(objects, radius) + +// for _, edge := range g.Edges { +// createCircularArc(edge) +// } + +// return nil +// } + +// func calculateRadius(objects []*d2graph.Object) float64 { +// numObjects := float64(len(objects)) +// maxSize := 0.0 +// for _, obj := range objects { +// size := math.Max(obj.Box.Width, obj.Box.Height) +// maxSize = math.Max(maxSize, size) +// } +// minRadius := (maxSize/2.0 + PADDING) / math.Sin(math.Pi/numObjects) +// return math.Max(minRadius, MIN_RADIUS) +// } + +// func positionObjects(objects []*d2graph.Object, radius float64) { +// numObjects := float64(len(objects)) +// angleOffset := -math.Pi / 2 + +// for i, obj := range objects { +// angle := angleOffset + (2*math.Pi*float64(i)/numObjects) +// x := radius * math.Cos(angle) +// y := radius * math.Sin(angle) + +// obj.TopLeft = geo.NewPoint( +// x-obj.Box.Width/2, +// y-obj.Box.Height/2, +// ) +// } +// } + +// func createCircularArc(edge *d2graph.Edge) { +// if edge.Src == nil || edge.Dst == nil { +// return +// } + +// srcCenter := edge.Src.Center() +// dstCenter := edge.Dst.Center() + +// srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) +// dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) +// if dstAngle < srcAngle { +// dstAngle += 2 * math.Pi +// } + +// arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) + +// path := make([]*geo.Point, 0, ARC_STEPS+1) +// for i := 0; i <= ARC_STEPS; i++ { +// t := float64(i) / float64(ARC_STEPS) +// angle := srcAngle + t*(dstAngle-srcAngle) +// x := arcRadius * math.Cos(angle) +// y := arcRadius * math.Sin(angle) +// path = append(path, geo.NewPoint(x, y)) +// } +// path[0] = srcCenter +// path[len(path)-1] = dstCenter + +// startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) +// endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) + +// path[0] = newSrc +// path[len(path)-1] = newDst + +// edge.Route = path[startIndex : endIndex+1] +// edge.IsCurve = true +// } + +// func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, *geo.Point) { +// if startIdx >= len(path)-1 { +// return startIdx, path[startIdx] +// } +// if !boxContains(box, path[startIdx]) { +// return startIdx, path[startIdx] +// } + +// for i := startIdx + 1; i < len(path); i++ { +// if boxContains(box, path[i]) { +// continue +// } +// seg := geo.NewSegment(path[i-1], path[i]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return i, inters[0] +// } +// return i, path[i] +// } +// last := len(path) - 1 +// return last, path[last] +// } + +// func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (int, *geo.Point) { +// if endIdx <= 0 { +// return endIdx, path[endIdx] +// } +// if !boxContains(box, path[endIdx]) { +// return endIdx, path[endIdx] +// } + +// for j := endIdx - 1; j >= 0; j-- { +// if boxContains(box, path[j]) { +// continue +// } +// seg := geo.NewSegment(path[j], path[j+1]) +// inters := boxIntersections(box, *seg) +// if len(inters) > 0 { +// return j, inters[0] +// } +// return j, path[j] +// } +// return 0, path[0] +// } + +// func boxContains(b *geo.Box, p *geo.Point) bool { +// return p.X >= b.TopLeft.X && +// p.X <= b.TopLeft.X+b.Width && +// p.Y >= b.TopLeft.Y && +// p.Y <= b.TopLeft.Y+b.Height +// } + +// func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { +// return b.Intersections(seg) +// } + +// func positionLabelsIcons(obj *d2graph.Object) { +// if obj.Icon != nil && obj.IconPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// if obj.LabelPosition == nil { +// obj.LabelPosition = go2.Pointer(label.OutsideTopRight.String()) +// return +// } +// } else if obj.SQLTable != nil || obj.Class != nil || obj.Language != "" { +// obj.IconPosition = go2.Pointer(label.OutsideTopLeft.String()) +// } else { +// obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } +// } + +// if obj.HasLabel() && obj.LabelPosition == nil { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else if obj.HasOutsideBottomLabel() { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } else if obj.Icon != nil { +// obj.LabelPosition = go2.Pointer(label.InsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) +// } + +// if float64(obj.LabelDimensions.Width) > obj.Width || +// float64(obj.LabelDimensions.Height) > obj.Height { +// if len(obj.ChildrenArray) > 0 { +// obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) +// } else { +// obj.LabelPosition = go2.Pointer(label.OutsideBottomCenter.String()) +// } +// } +// } +// } + package d2cycle import ( @@ -22,18 +218,14 @@ func Layout(ctx context.Context, g *d2graph.Graph, layout d2graph.LayoutGraph) e if len(objects) == 0 { return nil } - for _, obj := range g.Objects { positionLabelsIcons(obj) } - radius := calculateRadius(objects) positionObjects(objects, radius) - for _, edge := range g.Edges { createCircularArc(edge) } - return nil } @@ -51,16 +243,11 @@ func calculateRadius(objects []*d2graph.Object) float64 { func positionObjects(objects []*d2graph.Object, radius float64) { numObjects := float64(len(objects)) angleOffset := -math.Pi / 2 - for i, obj := range objects { angle := angleOffset + (2*math.Pi*float64(i)/numObjects) x := radius * math.Cos(angle) y := radius * math.Sin(angle) - - obj.TopLeft = geo.NewPoint( - x-obj.Box.Width/2, - y-obj.Box.Height/2, - ) + obj.TopLeft = geo.NewPoint(x-obj.Box.Width/2, y-obj.Box.Height/2) } } @@ -68,18 +255,14 @@ func createCircularArc(edge *d2graph.Edge) { if edge.Src == nil || edge.Dst == nil { return } - srcCenter := edge.Src.Center() dstCenter := edge.Dst.Center() - srcAngle := math.Atan2(srcCenter.Y, srcCenter.X) dstAngle := math.Atan2(dstCenter.Y, dstCenter.X) if dstAngle < srcAngle { dstAngle += 2 * math.Pi } - arcRadius := math.Hypot(srcCenter.X, srcCenter.Y) - path := make([]*geo.Point, 0, ARC_STEPS+1) for i := 0; i <= ARC_STEPS; i++ { t := float64(i) / float64(ARC_STEPS) @@ -90,13 +273,10 @@ func createCircularArc(edge *d2graph.Edge) { } path[0] = srcCenter path[len(path)-1] = dstCenter - startIndex, newSrc := clampPointOutsideBox(edge.Src.Box, path, 0) endIndex, newDst := clampPointOutsideBoxReverse(edge.Dst.Box, path, len(path)-1) - path[0] = newSrc path[len(path)-1] = newDst - edge.Route = path[startIndex : endIndex+1] edge.IsCurve = true } @@ -108,17 +288,12 @@ func clampPointOutsideBox(box *geo.Box, path []*geo.Point, startIdx int) (int, * if !boxContains(box, path[startIdx]) { return startIdx, path[startIdx] } - for i := startIdx + 1; i < len(path); i++ { if boxContains(box, path[i]) { continue } - seg := geo.NewSegment(path[i-1], path[i]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return i, inters[0] - } - return i, path[i] + intersection := refineIntersection(box, path[i-1], path[i]) + return i, intersection } last := len(path) - 1 return last, path[last] @@ -131,26 +306,33 @@ func clampPointOutsideBoxReverse(box *geo.Box, path []*geo.Point, endIdx int) (i if !boxContains(box, path[endIdx]) { return endIdx, path[endIdx] } - for j := endIdx - 1; j >= 0; j-- { if boxContains(box, path[j]) { continue } - seg := geo.NewSegment(path[j], path[j+1]) - inters := boxIntersections(box, *seg) - if len(inters) > 0 { - return j, inters[0] - } - return j, path[j] + intersection := refineIntersection(box, path[j], path[j+1]) + return j, intersection } return 0, path[0] } +func refineIntersection(box *geo.Box, pInside, pOutside *geo.Point) *geo.Point { + const epsilon = 0.001 + a := pInside + b := pOutside + for math.Hypot(b.X-a.X, b.Y-a.Y) > epsilon { + mid := geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) + if boxContains(box, mid) { + a = mid + } else { + b = mid + } + } + return geo.NewPoint((a.X+b.X)/2, (a.Y+b.Y)/2) +} + func boxContains(b *geo.Box, p *geo.Point) bool { - return p.X >= b.TopLeft.X && - p.X <= b.TopLeft.X+b.Width && - p.Y >= b.TopLeft.Y && - p.Y <= b.TopLeft.Y+b.Height + return p.X >= b.TopLeft.X && p.X <= b.TopLeft.X+b.Width && p.Y >= b.TopLeft.Y && p.Y <= b.TopLeft.Y+b.Height } func boxIntersections(b *geo.Box, seg geo.Segment) []*geo.Point { @@ -171,7 +353,6 @@ func positionLabelsIcons(obj *d2graph.Object) { obj.IconPosition = go2.Pointer(label.InsideMiddleCenter.String()) } } - if obj.HasLabel() && obj.LabelPosition == nil { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) @@ -182,9 +363,7 @@ func positionLabelsIcons(obj *d2graph.Object) { } else { obj.LabelPosition = go2.Pointer(label.InsideMiddleCenter.String()) } - - if float64(obj.LabelDimensions.Width) > obj.Width || - float64(obj.LabelDimensions.Height) > obj.Height { + if float64(obj.LabelDimensions.Width) > obj.Width || float64(obj.LabelDimensions.Height) > obj.Height { if len(obj.ChildrenArray) > 0 { obj.LabelPosition = go2.Pointer(label.OutsideTopCenter.String()) } else {