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

fix

Browse source
This commit is contained in:
Alexander Wang 2023-03-14 17:37:19 -07:00
parent f35be526c6
commit 27870fc7d6
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 43 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
d2layouts/d2elklayout/layout.go
View file

@ -478,7 +478,7 @@ func deleteBends(g *d2graph.Graph) {
endpoint = e.Dst endpoint = e.Dst
} }
isHorizontal := start.Y == corner.Y isHorizontal := math.Round(start.Y) == math.Round(corner.Y)
// Make sure it's still attached // Make sure it's still attached
if isHorizontal { if isHorizontal {
@ -512,15 +512,15 @@ func deleteBends(g *d2graph.Graph) {
oldSegment := geo.NewSegment(start, corner) oldSegment := geo.NewSegment(start, corner)
newSegment := geo.NewSegment(newStart, end) newSegment := geo.NewSegment(newStart, end)
oldIntersects := countObjectIntersects(g, *oldSegment) oldIntersects := countObjectIntersects(g, e.Src, e.Dst, *oldSegment)
newIntersects := countObjectIntersects(g, *newSegment) newIntersects := countObjectIntersects(g, e.Src, e.Dst, *newSegment)
if newIntersects > oldIntersects { if newIntersects > oldIntersects {
continue continue
} }
oldCrossingsCount, oldOverlapsCount, oldCloseOverlapsCount := countEdgeIntersects(g, g.Edges[ei], *oldSegment) oldCrossingsCount, oldOverlapsCount, oldCloseOverlapsCount, oldTouchingCount := countEdgeIntersects(g, g.Edges[ei], *oldSegment)
newCrossingsCount, newOverlapsCount, newCloseOverlapsCount := countEdgeIntersects(g, g.Edges[ei], *newSegment) newCrossingsCount, newOverlapsCount, newCloseOverlapsCount, newTouchingCount := countEdgeIntersects(g, g.Edges[ei], *newSegment)
if newCrossingsCount > oldCrossingsCount { if newCrossingsCount > oldCrossingsCount {
continue continue
@ -532,6 +532,9 @@ func deleteBends(g *d2graph.Graph) {
if newCloseOverlapsCount > oldCloseOverlapsCount { if newCloseOverlapsCount > oldCloseOverlapsCount {
continue continue
} }
if newTouchingCount > oldTouchingCount {
continue
}
// commit // commit
if isSource { if isSource {
@ -572,21 +575,21 @@ func deleteBends(g *d2graph.Graph) {
// These concern two segments // These concern two segments
var newCorner *geo.Point var newCorner *geo.Point
if start.X == corner.X { if math.Round(start.X) == math.Round(corner.X) {
newCorner = geo.NewPoint(end.X, start.Y) newCorner = geo.NewPoint(end.X, start.Y)
// not ladder // not ladder
if (end.Y > start.Y) != (before.Y > start.Y) { if (end.X > start.X) != (start.X > before.X) {
continue continue
} }
if (end.Y > start.Y) != (end.Y > start.Y) { if (end.Y > start.Y) != (after.Y > end.Y) {
continue continue
} }
} else { } else {
newCorner = geo.NewPoint(start.X, end.Y) newCorner = geo.NewPoint(start.X, end.Y)
if (end.X > start.X) != (before.X > start.X) { if (end.Y > start.Y) != (start.Y > before.Y) {
continue continue
} }
if (end.X > start.X) != (after.X > start.X) { if (end.X > start.X) != (after.X > end.X) {
continue continue
} }
} }
@ -598,24 +601,26 @@ func deleteBends(g *d2graph.Graph) {
newS2 := geo.NewSegment(newCorner, end) newS2 := geo.NewSegment(newCorner, end)
// Check that the new segments doesn't collide with anything new // Check that the new segments doesn't collide with anything new
oldIntersects := countObjectIntersects(g, *oldS1) + countObjectIntersects(g, *oldS2) oldIntersects := countObjectIntersects(g, e.Src, e.Dst, *oldS1) + countObjectIntersects(g, e.Src, e.Dst, *oldS2)
newIntersects := countObjectIntersects(g, *newS1) + countObjectIntersects(g, *newS2) newIntersects := countObjectIntersects(g, e.Src, e.Dst, *newS1) + countObjectIntersects(g, e.Src, e.Dst, *newS2)
if newIntersects > oldIntersects { if newIntersects > oldIntersects {
continue continue
} }
oldCrossingsCount1, oldOverlapsCount1, oldCloseOverlapsCount1 := countEdgeIntersects(g, g.Edges[ei], *oldS1) oldCrossingsCount1, oldOverlapsCount1, oldCloseOverlapsCount1, oldTouchingCount1 := countEdgeIntersects(g, g.Edges[ei], *oldS1)
oldCrossingsCount2, oldOverlapsCount2, oldCloseOverlapsCount2 := countEdgeIntersects(g, g.Edges[ei], *oldS2) oldCrossingsCount2, oldOverlapsCount2, oldCloseOverlapsCount2, oldTouchingCount2 := countEdgeIntersects(g, g.Edges[ei], *oldS2)
oldCrossingsCount := oldCrossingsCount1 + oldCrossingsCount2 oldCrossingsCount := oldCrossingsCount1 + oldCrossingsCount2
oldOverlapsCount := oldOverlapsCount1 + oldOverlapsCount2 oldOverlapsCount := oldOverlapsCount1 + oldOverlapsCount2
oldCloseOverlapsCount := oldCloseOverlapsCount1 + oldCloseOverlapsCount2 oldCloseOverlapsCount := oldCloseOverlapsCount1 + oldCloseOverlapsCount2
oldTouchingCount := oldTouchingCount1 + oldTouchingCount2
newCrossingsCount1, newOverlapsCount1, newCloseOverlapsCount1 := countEdgeIntersects(g, g.Edges[ei], *newS1) newCrossingsCount1, newOverlapsCount1, newCloseOverlapsCount1, newTouchingCount1 := countEdgeIntersects(g, g.Edges[ei], *newS1)
newCrossingsCount2, newOverlapsCount2, newCloseOverlapsCount2 := countEdgeIntersects(g, g.Edges[ei], *newS1) newCrossingsCount2, newOverlapsCount2, newCloseOverlapsCount2, newTouchingCount2 := countEdgeIntersects(g, g.Edges[ei], *newS2)
newCrossingsCount := newCrossingsCount1 + newCrossingsCount2 newCrossingsCount := newCrossingsCount1 + newCrossingsCount2
newOverlapsCount := newOverlapsCount1 + newOverlapsCount2 newOverlapsCount := newOverlapsCount1 + newOverlapsCount2
newCloseOverlapsCount := newCloseOverlapsCount1 + newCloseOverlapsCount2 newCloseOverlapsCount := newCloseOverlapsCount1 + newCloseOverlapsCount2
newTouchingCount := newTouchingCount1 + newTouchingCount2
if newCrossingsCount > oldCrossingsCount { if newCrossingsCount > oldCrossingsCount {
continue continue
@ -627,6 +632,9 @@ func deleteBends(g *d2graph.Graph) {
if newCloseOverlapsCount > oldCloseOverlapsCount { if newCloseOverlapsCount > oldCloseOverlapsCount {
continue continue
} }
if newTouchingCount > oldTouchingCount {
continue
}
// commit // commit
g.Edges[ei].Route = append(append( g.Edges[ei].Route = append(append(
@ -640,10 +648,13 @@ func deleteBends(g *d2graph.Graph) {
} }
} }
func countObjectIntersects(g *d2graph.Graph, s geo.Segment) int { func countObjectIntersects(g *d2graph.Graph, src, dst *d2graph.Object, s geo.Segment) int {
count := 0 count := 0
for _, o := range g.Objects { for i, o := range g.Objects {
if o.Intersects(s, float64(edge_node_spacing)) { if g.Objects[i] == src || g.Objects[i] == dst {
continue
}
if o.Intersects(s, float64(edge_node_spacing)-1) {
count++ count++
} }
} }
@ -651,19 +662,20 @@ func countObjectIntersects(g *d2graph.Graph, s geo.Segment) int {
} }
// countEdgeIntersects counts both crossings AND getting too close to a parallel segment // countEdgeIntersects counts both crossings AND getting too close to a parallel segment
func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) (int, int, int) { func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) (int, int, int, int) {
isHorizontal := s.Start.Y == s.End.Y isHorizontal := math.Round(s.Start.Y) == math.Round(s.End.Y)
crossingsCount := 0 crossingsCount := 0
overlapsCount := 0 overlapsCount := 0
closeOverlapsCount := 0 closeOverlapsCount := 0
for _, e := range g.Edges { touchingCount := 0
if e == sEdge { for i, e := range g.Edges {
if g.Edges[i] == sEdge {
continue continue
} }
for i := 0; i < len(e.Route)-1; i++ { for i := 0; i < len(e.Route)-1; i++ {
otherS := geo.NewSegment(e.Route[i], e.Route[i+1]) otherS := geo.NewSegment(e.Route[i], e.Route[i+1])
otherIsHorizontal := otherS.Start.Y == otherS.End.Y otherIsHorizontal := math.Round(otherS.Start.Y) == math.Round(otherS.End.Y)
if isHorizontal == otherIsHorizontal { if isHorizontal == otherIsHorizontal {
if s.Overlaps(*otherS, !isHorizontal, 0.) { if s.Overlaps(*otherS, !isHorizontal, 0.) {
if isHorizontal { if isHorizontal {
@ -671,6 +683,9 @@ func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) (
overlapsCount++ overlapsCount++
if math.Abs(s.Start.Y-otherS.Start.Y) < float64(edge_node_spacing)/4. { if math.Abs(s.Start.Y-otherS.Start.Y) < float64(edge_node_spacing)/4. {
closeOverlapsCount++ closeOverlapsCount++
if math.Abs(s.Start.Y-otherS.Start.Y) < 1. {
touchingCount++
}
} }
} }
} else { } else {
@ -678,6 +693,9 @@ func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) (
overlapsCount++ overlapsCount++
if math.Abs(s.Start.X-otherS.Start.X) < float64(edge_node_spacing)/4. { if math.Abs(s.Start.X-otherS.Start.X) < float64(edge_node_spacing)/4. {
closeOverlapsCount++ closeOverlapsCount++
if math.Abs(s.Start.Y-otherS.Start.Y) < 1. {
touchingCount++
}
} }
} }
} }
@ -690,5 +708,5 @@ func countEdgeIntersects(g *d2graph.Graph, sEdge *d2graph.Edge, s geo.Segment) (
} }
} }
return crossingsCount, overlapsCount, closeOverlapsCount return crossingsCount, overlapsCount, closeOverlapsCount, touchingCount
} }